From f0cba925f0c10ab6f0bac67559ffea96b0454688 Mon Sep 17 00:00:00 2001
From: Brad Rydzewski <brad.rydzewski@gmail.com>
Date: Thu, 1 Oct 2015 13:39:25 -0700
Subject: [PATCH] fixed timestamp / label issues on build page

---
 static/scripts/build.js    | 30 +++++++++++++++++++++++++++++-
 template/amber/build.amber | 15 +++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/static/scripts/build.js b/static/scripts/build.js
index c5158da6..08a5c5a1 100644
--- a/static/scripts/build.js
+++ b/static/scripts/build.js
@@ -81,8 +81,36 @@ function JobViewModel(repo, build, job, status) {
 		// update the status for each job in the view
 		for (var i=0;i<data.jobs.length;i++) {
 			var job_ = data.jobs[i];
-			$("[data-job="+job_.number+"]").find(".status")
+			var el = $("[data-job="+job_.number+"]");
+
+			el.find(".status")
 				.attr("class", "status "+job_.status).text(job_.status);
+
+			switch (job_.status) {
+			case "running":
+				el.find(".msg-running").find("span").attr("data-livestamp", job_.started_at);
+
+				el.find(".msg-pending").hide();
+				el.find(".msg-running").show();
+				el.find(".msg-finished").hide();
+				el.find(".msg-exited").hide();
+				break;
+			case "pending":
+				el.find(".msg-pending").show();
+				el.find(".msg-running").hide();
+				el.find(".msg-finished").hide();
+				el.find(".msg-exited").hide();
+				break;
+			default:
+				el.find(".msg-finished").find("span").attr("data-livestamp", job_.finished_at);
+				el.find(".msg-exited").find("span").text(job_.exit_code);
+
+				el.find(".msg-pending").hide();
+				el.find(".msg-running").hide();
+				el.find(".msg-finished").show();
+				el.find(".msg-exited").show();
+				break;
+			}
 		}
 
 		var after = self.status;
diff --git a/template/amber/build.amber b/template/amber/build.amber
index 3f12a9dc..50622938 100644
--- a/template/amber/build.amber
+++ b/template/amber/build.amber
@@ -46,10 +46,21 @@ block content
                                     h3
                                         each $key, $val in $job.Environment
                                             div.env #{$key}=#{$val}
-                                div
+                                div[class="msg-pending"]
+                                    .hidden ? $job.Status != "pending"
+                                    | pending assignment to a worker
+                                div[class="msg-running"]
+                                    .hidden ? $job.Status != "running"
+                                    | started 
+                                    span[data-livestamp=$job.Started]
+                                div[class="msg-finished"]
+                                    .hidden ? $job.Finished == 0
                                     | finished 
                                     span[data-livestamp=$job.Finished]
-                                div with exit code #{$job.ExitCode}
+                                div[class="msg-exited"]
+                                    .hidden ? $job.Finished == 0
+                                    | with exit code
+                                    span #{$job.ExitCode}
 
                 div.build-btn-group
                     button.btn.btn-info.hidden#restart restart