resolves #8: show execution time of the running job

ohwgiles · Nov 6, 2017 · 7d47bc4 · 7d47bc4
1 parent 576159d
commit 7d47bc4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/resources/index.html b/src/resources/index.html
@@ -148,13 +148,13 @@ <h3>{{$route.params.name}}</h3>
      <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 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>
      </tr>
      <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 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>
      </tr>
     </table>
@@ -180,7 +180,7 @@ <h3 style="float:left"><img class="spin" src="/progress.gif" v-show="job.result
       <dt>Queued for</dt><dd>{{job.queued}}s</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)">Duration</dt><dd v-show="runComplete(job)">{{job.duration}}s</dd>
+      <dt>Duration</dt><dd>{{formatDuration(job.started, job.completed)}}</dd>
      </dl>
     </div>
     <div class="col-sm-7 col-md-6 col-lg-5">

diff --git 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';
+    }
   }
 };