X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e2357191ca21631bcb6d8cf7a640d456a1a6cfa..bbaaeabfc2d28c8a24f106b81e6677832cd68b3d:/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 995b1c3e64..7c6e5f01ba 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -22,7 +22,12 @@ module PipelineInstancesHelper
     pj
   end
 
+  # Merge (started_at, finished_at) time range into the list of time ranges in
+  # timestamps (timestamps must be sorted and non-overlapping).  
+  # return the updated timestamps list.
   def merge_range timestamps, started_at, finished_at
+    # in the comments below, 'i' is the entry in the timestamps array and 'j'
+    # is the started_at, finished_at range which is passed in.
     timestamps.each_index do |i|
       if started_at
         if started_at >= timestamps[i][0] and finished_at <= timestamps[i][1]
@@ -57,9 +62,11 @@ module PipelineInstancesHelper
 
     timestamps << [started_at, finished_at]
   end
-
+  
+  # Accept a list of objects with [:started_at] and [:finshed_at] keys and
+  # merge overlapping ranges to compute the time spent running after periods of
+  # overlapping execution are factored out.
   def determine_wallclock_runtime jobs
-    puts "Begin #{jobs}"
     timestamps = []
     jobs.each do |j|
       insert_at = 0
@@ -95,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
@@ -153,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
@@ -207,33 +222,70 @@ module PipelineInstancesHelper
     ret
   end
 
-  def runtime duration, long
+  MINUTE = 60
+  HOUR = 60 * MINUTE
+  DAY = 24 * HOUR
+
+  def render_runtime duration, use_words, round_to_min=true
+    days = 0
     hours = 0
     minutes = 0
     seconds = 0
-    if duration >= 3600
-      hours = (duration / 3600).floor
-      duration -= hours * 3600
+
+    if duration >= DAY
+      days = (duration / DAY).floor
+      duration -= days * DAY
     end
-    if duration >= 60
-      minutes = (duration / 60).floor
-      duration -= minutes * 60
+
+    if duration >= HOUR
+      hours = (duration / HOUR).floor
+      duration -= hours * HOUR
     end
-    duration = duration.floor
 
-    if long
-      s = ""
+    if duration >= MINUTE
+      minutes = (duration / MINUTE).floor
+      duration -= minutes * MINUTE
+    end
+
+    seconds = duration.floor
+
+    if round_to_min and seconds >= 30
+      minutes += 1
+    end    
+
+    if use_words
+      s = []
+      if days > 0 then
+        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 not round_to_min or s.size == 0
+        s << "#{seconds} second#{'s' if seconds != 1}"
       end
-      s += "#{duration} second#{'s' if duration != 1}"
+      s = s * " "
     else
-      s = "#{hours}:#{minutes.to_s.rjust(2, '0')}:#{duration.to_s.rjust(2, '0')}"
+      s = ""
+      if days > 0
+        s += "#{days}<span class='time-label-divider'>d</span> "
+      end
+
+      if (hours > 0)
+        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}<span class='time-label-divider'>s</span>"
+      end
     end
-    s
+
+    raw(s)
   end
 
 end