raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Put job status on a separate tab

Browse source 
Also, show the "last checked time" on the initial tab.
This commit is contained in:
Eelco Dolstra 2013-02-21 13:30:14 +01:00
parent 5099375549
commit dd5eb51a84
2 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Controller/Jobset.pm
View file

@ -49,7 +49,7 @@ sub jobsetIndex {
} }
} }
$c->stash->{evals} = getEvals($self, $c, 0, 5); $c->stash->{evals} = getEvals($self, $c, 0, 10);
$c->stash->{systems} = $c->stash->{systems} =
[ $c->stash->{jobset}->builds->search({ iscurrent => 1 }, { select => ["system"], distinct => 1, order_by => "system" }) ]; [ $c->stash->{jobset}->builds->search({ iscurrent => 1 }, { select => ["system"], distinct => 1, order_by => "system" }) ];

36
src/root/jobset.tt
View file

@ -41,23 +41,42 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tabs-information" data-toggle="tab">Jobset</a></li> <li class="active"><a href="#tabs-evaluations" data-toggle="tab">Evaluations</a></li>
[% IF jobset.errormsg %] [% IF jobset.errormsg %]
<li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li> <li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li>
[% END %] [% END %]
<li><a href="#tabs-status" data-toggle="tab">Job status</a></li>
<li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li> <li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li>
<li><a href="#tabs-setup" data-toggle="tab">Configuration</a></li> <li><a href="#tabs-setup" data-toggle="tab">Configuration</a></li>
</ul> </ul>
<div id="generic-tabs" class="tab-content"> <div id="generic-tabs" class="tab-content">
<div id="tabs-information" class="tab-pane active"> <div id="tabs-evaluations" class="tab-pane active">
<table class="layoutTable">
<tr>
<th>Last checked:</th>
<td>
[% IF jobset.lastcheckedtime %]
[% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %][% IF jobset.errormsg %]<em>, with evaluation errors!</em>[% ELSE %], <em>no evaluation errors</em>[% END %]
[% ELSE %]
<em>never</em>
[% END %]
</td>
</tr>
</table>
<br/>
[% IF evals.size() > 0 %] [% IF evals.size() > 0 %]
<h2>Most recent evaluations</h2>
[% INCLUDE renderEvals linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %] [% INCLUDE renderEvals linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]
[% END %] [% END %]
</div>
<div id="tabs-status" class="tab-pane">
[% IF activeJobsStatus %] [% IF activeJobsStatus %]
<h2>Status</h2> <h2>Status</h2>
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
@ -102,7 +121,6 @@
[% END %] [% END %]
<div id="tabs-setup" class="tab-pane"> <div id="tabs-setup" class="tab-pane">
<h2>Information</h2>
<table class="layoutTable"> <table class="layoutTable">
<tr> <tr>
@ -132,16 +150,6 @@
<th>Number of builds to keep:</th> <th>Number of builds to keep:</th>
<td>[% jobset.keepnr %]</td> <td>[% jobset.keepnr %]</td>
</tr> </tr>
<tr>
<th>Last checked:</th>
<td>
[% IF jobset.lastcheckedtime %]
[% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %][% IF jobset.errormsg %]<em>, with errors!</em>[% ELSE %], <em>no errors</em>[% END %]
[% ELSE %]
<em>never</em>
[% END %]
</td>
</tr>
</table> </table>
[% INCLUDE renderInputs %] [% INCLUDE renderInputs %]