webcron/webcron
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases 6 Wiki Activity

Updated runspage

Browse Source
This commit is contained in:
Jeroen De Meerleer 2018-09-06 16:35:13 +02:00
parent c2533f13c2
commit 260f13c554
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runs.php
View File

@ -26,7 +26,7 @@
require_once "include/initialize.inc.php";
$jobnameqry = $db->prepare("SELECT name, user FROM jobs WHERE jobID = ?");
$jobnameqry = $db->prepare("SELECT name, user, url FROM jobs WHERE jobID = ?");
$jobnameqry->execute(array($_GET['jobID']));
$jobnameResult = $jobnameqry->fetchAll(PDO::FETCH_ASSOC);
if ($jobnameResult[0]["user"] != $_SESSION["userID"]) {
@ -34,8 +34,9 @@ if ($jobnameResult[0]["user"] != $_SESSION["userID"]) {
exit;
}
$jobName = $jobnameResult[0]['name'];
$rebootjob = $jobnameResult[0]['name'] ? true : false;
$runsForJobQry = "SELECT runs.*, jobs.name FROM runs, jobs WHERE runs.job = jobs.jobID AND runs.job = ?";
$runsForJobQry = "SELECT runs.*, 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";
@ -61,7 +62,7 @@ foreach($runsForJobResult as $key=>$value) {
$count++;
}
$twig_vars = array('jobID' => $_GET['jobID'], 'runs' => $runsForJobRendered, 'allruns' => $allruns, "title" => $jobName);
$twig_vars = array('jobID' => $_GET['jobID'], 'rebootjob' => $rebootjob, '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);

5
templates/runs.html.twig
View File

@ -2,7 +2,8 @@
{% block title %}Overview of run for {{ title }}{% endblock %}
{% block content %}
<h2>Overview of runs for {{ title }}</h2>
{% if allruns %}
{% if rebootjob %}
{% elseif allruns %}
<p><a href="runs.php?jobID={{ jobID }}&allruns=0">Only show failed runs</a></p>
{% elseif not allruns %}
<p><a href="runs.php?jobID={{ jobID }}&allruns=1">Show all runs</a></p>
@ -12,7 +13,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{ loop.index }}">({{ run.statuscode }}) {{ run.timestamp }}</a>
<a data-toggle="collapse" data-parent="#accordion" href="#collapse{{ loop.index }}">{% if not rebootjob %}({{ run.statuscode }}){% endif %} {{ run.timestamp }}</a>
</h4>
</div>
<div id="collapse{{ loop.index }}" class="panel-collapse collapse">