diff --git a/runnow.php b/runnow.php index 82fdc00..0559098 100644 --- a/runnow.php +++ b/runnow.php @@ -69,7 +69,7 @@ if (filter_var($jobnameResult[0]["url"], FILTER_VALIDATE_URL)) { } } } -if($nosave !== true && $statuscode != $jobnameResult[0]["expected"]) { +if($nosave !== true) { $stmt = $db->prepare("INSERT INTO runs(job, statuscode, result, timestamp) VALUES(?, ?, ?, ?)"); $stmt->execute(array($jobID, $statuscode, $body, $timestamp)); } diff --git a/runs.php b/runs.php index edd1353..7885a89 100644 --- a/runs.php +++ b/runs.php @@ -35,7 +35,13 @@ if ($jobnameResult[0]["user"] != $_SESSION["userID"]) { } $jobName = $jobnameResult[0]['name']; -$runsForJob = $db->prepare("SELECT runs.*, jobs.name FROM runs, jobs WHERE runs.job = jobs.jobID AND runs.job = ?"); +$runsForJobQry = "SELECT runs.*, jobs.name FROM runs, jobs WHERE runs.job = jobs.jobID AND runs.job = ?"; +$allruns = true; +if(!(isset($_GET['allruns']) && $_GET['allruns'] == 1)) { + $runsForJobQry .= " AND runs.statuscode <> jobs.expected"; + $allruns = false; +} +$runsForJob = $db->prepare($runsForJobQry); $runsForJob->execute(array($_GET['jobID'])); $runsForJobResult = $runsForJob->fetchAll(PDO::FETCH_ASSOC); @@ -55,7 +61,7 @@ foreach($runsForJobResult as $key=>$value) { $count++; } -$twig_vars = array('runs' => $runsForJobRendered, "title" => $jobName); +$twig_vars = array('jobID' => $_GET['jobID'], 'runs' => $runsForJobRendered, 'allruns' => $allruns, "title" => $jobName); //echo $twig->render('overview.html.twig', array('the' => 'variables', 'go' => 'here')); echo $twig->render('runs.html.twig', $twig_vars); diff --git a/templates/runs.html.twig b/templates/runs.html.twig index 445e434..aa5ff70 100644 --- a/templates/runs.html.twig +++ b/templates/runs.html.twig @@ -2,6 +2,11 @@ {% block title %}Overview of run for {{ title }}{% endblock %} {% block content %}

Overview of runs for {{ title }}

+{% if allruns %} +

Only show failed runs

+{% elseif not allruns %} +

Show all runs

+{% endif %}
{% for run in runs %}
diff --git a/webcron.php b/webcron.php index 5b59874..fe368db 100644 --- a/webcron.php +++ b/webcron.php @@ -92,7 +92,7 @@ foreach ($results as $result) { } } - if($nosave !== true && $statuscode != $result["expected"]) { + if($nosave !== true) { $stmt = $db->prepare("INSERT INTO runs(job, statuscode, result, timestamp) VALUES(?, ?, ?, ?)"); $stmt->execute(array($result['jobID'], $statuscode, $body, time())); }