diff --git a/src/resources/index.html b/src/resources/index.html
index a9c0d9d..5eb710e 100644
--- a/src/resources/index.html
+++ b/src/resources/index.html
@@ -148,13 +148,13 @@
#{{job.number}} |
{{formatDate(job.started)}} |
- -- |
+ {{formatDuration(job.started, job.completed)}} |
{{job.reason}} |
#{{job.number}} |
{{formatDate(job.started)}} |
- {{job.duration + " seconds"}} |
+ {{formatDuration(job.started, job.completed)}} |
{{job.reason}} |
@@ -180,7 +180,7 @@
Queued for{{job.queued}}s
Started{{formatDate(job.started)}}
Completed{{formatDate(job.completed)}}
- Duration{{job.duration}}s
+ Duration{{formatDuration(job.started, job.completed)}}
diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index f774763..5c55a0b 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -67,6 +67,16 @@ const Utils = {
][d.getMonth()] + ' ' +
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';
+ }
}
};