Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

resolves #8: show execution time of the running job

Browse Source
This commit is contained in:
Oliver Giles 2017-11-03 16:47:30 +02:00
parent 576159d8e9
commit 7d47bc4b89
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/resources/index.html
View File

@ -148,13 +148,13 @@
<tr v-for="job in jobsRunning" track-by="$index"> <tr v-for="job in jobsRunning" track-by="$index">
<td><img class="spin small" src="/progress.gif"> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td> <td><img class="spin small" src="/progress.gif"> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
<td class="text-center">{{formatDate(job.started)}}</td> <td class="text-center">{{formatDate(job.started)}}</td>
<td class="text-center">--</td> <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
<td class="text-center hidden-xs">{{job.reason}}</td> <td class="text-center hidden-xs">{{job.reason}}</td>
</tr> </tr>
<tr v-for="job in jobsRecent" track-by="$index"> <tr v-for="job in jobsRecent" track-by="$index">
<td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td> <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+$route.params.name+'/'+job.number">#{{job.number}}</router-link></td>
<td class="text-center">{{formatDate(job.started)}}</td> <td class="text-center">{{formatDate(job.started)}}</td>
<td class="text-center">{{job.duration + " seconds"}}</td> <td class="text-center">{{formatDuration(job.started, job.completed)}}</td>
<td class="text-center hidden-xs">{{job.reason}}</td> <td class="text-center hidden-xs">{{job.reason}}</td>
</tr> </tr>
</table> </table>
@ -180,7 +180,7 @@
<dt>Queued for</dt><dd>{{job.queued}}s</dd> <dt>Queued for</dt><dd>{{job.queued}}s</dd>
<dt>Started</dt><dd>{{formatDate(job.started)}}</dd> <dt>Started</dt><dd>{{formatDate(job.started)}}</dd>
<dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd> <dt v-show="runComplete(job)">Completed</dt><dd v-show="job.completed">{{formatDate(job.completed)}}</dd>
<dt v-show="runComplete(job)">Duration</dt><dd v-show="runComplete(job)">{{job.duration}}s</dd> <dt>Duration</dt><dd>{{formatDuration(job.started, job.completed)}}</dd>
</dl> </dl>
</div> </div>
<div class="col-sm-7 col-md-6 col-lg-5"> <div class="col-sm-7 col-md-6 col-lg-5">

10
src/resources/js/app.js
View File

@ -67,6 +67,16 @@ const Utils = {
][d.getMonth()] + ' ' + ][d.getMonth()] + ' ' +
d.getFullYear(); d.getFullYear();
}, },
formatDuration: function(start, end) {
if(!end)
end = Math.floor(Date.now()/1000);
if(end - start > 3600)
return Math.floor((end-start)/3600) + 'hours, ' + Math.floor(((end-start)%3600)/60) + ' minutes';
else if(end - start > 60)
return Math.floor((end-start)/60) + 'minutes, ' + ((end-start)%60) + ' seconds';
else
return (end-start) + ' seconds';
}
} }
}; };