From 116dfaa3d08e555ba045a4680cc86accb2fd00db Mon Sep 17 00:00:00 2001
From: Oliver Giles <ohw.giles@gmail.com>
Date: Mon, 6 Nov 2017 19:08:14 +0200
Subject: [PATCH] calculate all duration in the client

This cleans up some inconsistency where sometimes 'completed-started' happened
on the client side and sometimes on the server. Also should fix the 'cumulative
time' issue mentioned in #8
---
 src/laminar.cpp          | 6 ++----
 src/resources/index.html | 2 +-
 src/resources/js/app.js  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/laminar.cpp b/src/laminar.cpp
index 5b8de1a..e9804f3 100644
--- a/src/laminar.cpp
+++ b/src/laminar.cpp
@@ -177,7 +177,6 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.set("queued", started-queued);
             j.set("started", started);
             j.set("completed", completed);
-            j.set("duration", completed-started);
             j.set("result", to_string(RunState(result)));
             j.set("reason", reason);
         });
@@ -203,7 +202,7 @@ void Laminar::sendStatus(LaminarClient* client) {
         .fetch<int,time_t,time_t,int,str>([&](int build,time_t started,time_t completed,int result,str reason){
             j.StartObject();
             j.set("number", build)
-             .set("duration", completed - started)
+             .set("completed", completed)
              .set("started", started)
              .set("result", to_string(RunState(result)))
              .set("reason", reason)
@@ -268,8 +267,8 @@ void Laminar::sendStatus(LaminarClient* client) {
             j.set("name", name)
              .set("number", build)
              .set("node", node)
-             .set("duration", completed - started)
              .set("started", started)
+             .set("completed", completed)
              .set("result", to_string(RunState(result)))
              .EndObject();
         });
@@ -706,7 +705,6 @@ void Laminar::runFinished(Run * r) {
             .set("number", r->build)
             .set("queued", r->startedAt - r->queuedAt)
             .set("completed", completedAt)
-            .set("duration", completedAt - r->startedAt)
             .set("started", r->startedAt)
             .set("result", to_string(r->result))
             .set("reason", r->reason());
diff --git a/src/resources/index.html b/src/resources/index.html
index 5eb710e..4049f65 100644
--- a/src/resources/index.html
+++ b/src/resources/index.html
@@ -54,7 +54,7 @@
       </td>
      </tr>
      <tr v-for="job in jobsRecent">
-      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br><small>Took {{job.duration}}s at {{formatDate(job.started)}}</small></td>
+      <td><span v-html="runIcon(job.result)"></span> <router-link :to="'/jobs/'+job.name">{{job.name}}</router-link> <router-link :to="'/jobs/'+job.name+'/'+job.number">#{{job.number}}</router-link><br><small>Took {{formatDuration(job.started, job.completed)}} at {{formatDate(job.started)}}</small></td>
      </tr>
     </table>
    </div>
diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index f0a4b47..4bc03a6 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -330,7 +330,7 @@ var Job = function() {
             fillColor: "darkseagreen",
             strokeColor: "forestgreen",
             data: msg.recent.map(function(e) {
-              return e.duration;
+              return e.completed - e.started;
             }).reverse()
           }]
         }, {