3901: allow job to be either Hash or Job

[arvados.git] / 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 9d1a0c3e6c2fd6ddcc1a326734e7f87c172e02b4..7c6e5f01baaf4bd1f63b7f848fd572c96b10459e 100644 (file)
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -102,8 +102,16 @@ module PipelineInstancesHelper
       end
       if c[:job] and c[:job][:uuid] and job[c[:job][:uuid]]
         pj[:job] = job[c[:job][:uuid]]
+      elsif c[:job].is_a?(Hash)
+        pj[:job] = c[:job]
+        if pj[:job][:started_at].is_a? String
+          pj[:job][:started_at] = Time.parse(pj[:job][:started_at])
+        end
+        if pj[:job][:finished_at].is_a? String
+          pj[:job][:finished_at] = Time.parse(pj[:job][:finished_at])
+        end
       else
-        pj[:job] = c[:job].is_a?(Hash) ? c[:job] : {}
+        pj[:job] = {}
       end
       pj[:percent_done] = 0
       pj[:percent_running] = 0
@@ -160,7 +168,7 @@ module PipelineInstancesHelper
       pj[:nondeterministic] = pj[:job][:nondeterministic] || c[:nondeterministic]
       pj[:output] = pj[:job][:output]
       pj[:output_uuid] = c[:output_uuid]
-      pj[:finished_at] = (Time.parse(pj[:job][:finished_at]) rescue nil)
+      pj[:finished_at] = pj[:job][:finished_at]
       ret << pj
     end
     ret
@@ -218,7 +226,6 @@ module PipelineInstancesHelper
   HOUR = 60 * MINUTE
   DAY = 24 * HOUR
 
-
   def render_runtime duration, use_words, round_to_min=true
     days = 0
     hours = 0
@@ -244,41 +251,41 @@ module PipelineInstancesHelper
 
     if round_to_min and seconds >= 30
       minutes += 1
-    end
+    end    
 
     if use_words
-      s = ""
+      s = []
       if days > 0 then
-        s += "#{day} 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
-        s += "#{days}d#{hours.to_s.rjust(2, '0')}h"
-      elsif (hours > 0)
-        s += "#{hours}h"
+        s += "#{days}<span class='time-label-divider'>d</span> "
       end
 
       if (hours > 0)
-        s += "#{minutes.to_s.rjust(2, '0')}m"
-      else
-        s += "#{minutes}m"
+        s += "#{hours}<span class='time-label-divider'>h</span>"
       end
+
+      s += "#{minutes}<span class='time-label-divider'>m</span>"
+
       if not round_to_min
-        s += "#{seconds.to_s.rjust(2, '0')}s"
+        s += "#{seconds}<span class='time-label-divider'>s</span>"
       end
     end
 
-    s
+    raw(s)
   end
 
 end