3187: Lots of work on presentation of job details, calculating time and

[arvados.git] / apps / workbench / app / views / application / _job_status_label.html.erb

diff --git a/apps/workbench/app/views/application/_job_status_label.html.erb b/apps/workbench/app/views/application/_job_status_label.html.erb
index ae00e3a0addc6e1f6b07b85d09ec976e78501127..c6ab8e419a80db3c0d84f7430a2a2b683a4a1e53 100644 (file)
--- a/apps/workbench/app/views/application/_job_status_label.html.erb
+++ b/apps/workbench/app/views/application/_job_status_label.html.erb
@@ -1,13 +1,11 @@
-<% if j[:success] %>
-  <span class="label label-success"><%= if defined? title then title else 'success' end %></span>
-<% elsif j[:success] == false %>
-  <span class="label label-danger"><%= if defined? title then title else 'failed' end %></span>
-<% elsif j[:finished_at] %>
-  <span class="label label-default"><%= if defined? title then title else 'finished' end %></span>
-<% elsif j[:started_at] %>
-  <span class="label label-info"><%= if defined? title then title else 'running' end %></span>
-<% elsif not j.nil? %>
-  <span class="label label-default"><%= if defined? title then title else 'queued' end %></span>
-<% else %>
-  <span class="label label-default"><%= if defined? title then title else 'not ready' end %></span>
-<% end %>
+<% status = Job.state j %>
+<% to_label = {
+     "Canceled" => "danger",
+     "Completed" => "success",
+     "Running" => "info",
+     "Failed" => "danger",
+     "Queued" => "default",
+     nil => "default"
+   } %>
+
+  <span class="label label-<%= to_label[status] %>"><%= if defined? title then title else status.downcase end %></span>