X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/eec77d22e408fe3983cba666c6f5185ecf2d15ec..92d5df330b86fb4c279a6e030258b860bed37358:/apps/workbench/app/helpers/pipeline_instances_helper.rb

diff --git a/apps/workbench/app/helpers/pipeline_instances_helper.rb b/apps/workbench/app/helpers/pipeline_instances_helper.rb
index f0c4eb7288..ae8384eeea 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -104,6 +104,19 @@ module PipelineInstancesHelper
         pj[:job] = job[c[:job][:uuid]]
       else
         pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+
+        # If necessary, figure out the state based on the other fields.
+        pj[:job][:state] ||= if pj[:job][:cancelled_at]
+                               "Cancelled"
+                             elsif pj[:job][:success] == false
+                               "Failed"
+                             elsif pj[:job][:success] == true
+                               "Complete"
+                             elsif pj[:job][:running] == true
+                               "Running"
+                             else
+                               "Queued"
+                             end
       end
       pj[:percent_done] = 0
       pj[:percent_running] = 0
@@ -132,19 +145,25 @@ module PipelineInstancesHelper
           pj[:progress] = 0.0
         end
       end
-      if pj[:job][:success]
+
+      case pj[:job][:state]
+        when 'Complete'
         pj[:result] = 'complete'
         pj[:labeltype] = 'success'
         pj[:complete] = true
         pj[:progress] = 1.0
-      elsif pj[:job][:finished_at]
+      when 'Failed'
         pj[:result] = 'failed'
         pj[:labeltype] = 'danger'
         pj[:failed] = true
-      elsif pj[:job][:started_at]
+      when 'Cancelled'
+        pj[:result] = 'cancelled'
+        pj[:labeltype] = 'danger'
+        pj[:failed] = true
+      when 'Running'
         pj[:result] = 'running'
         pj[:labeltype] = 'primary'
-      elsif pj[:job][:uuid]
+      when 'Queued'
         pj[:result] = 'queued'
         pj[:labeltype] = 'default'
       else
@@ -246,19 +265,20 @@ module PipelineInstancesHelper
     end    
 
     if use_words
-      s = ""
+      s = []
       if days > 0 then
-        s += "#{days} day#{'s' if days != 1}"
+        s << "#{days} day#{'s' if days != 1}"
       end
       if hours > 0 then
-        s += " #{hours} hour#{'s' if hours != 1}"
+        s << "#{hours} hour#{'s' if hours != 1}"
       end
       if minutes > 0 then
-        s += " #{minutes} minute#{'s' if minutes != 1}"
+        s << "#{minutes} minute#{'s' if minutes != 1}"
       end
-      if seconds > 0 and not round_to_min 
-        s += " #{seconds} second#{'s' if seconds != 1}"
+      if not round_to_min or s.size == 0
+        s << "#{seconds} second#{'s' if seconds != 1}"
       end
+      s = s * " "
     else
       s = ""
       if days > 0