X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f69d2824c997c53caa11d30ba816768bad52e12b..fd65e0be3f55d48b9d573921ca0757fc51a1dd81:/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 ba05f9e88c..1ed9e3ed6b 100644
--- a/apps/workbench/app/helpers/pipeline_instances_helper.rb
+++ b/apps/workbench/app/helpers/pipeline_instances_helper.rb
@@ -69,9 +69,8 @@ module PipelineInstancesHelper
def determine_wallclock_runtime jobs
timestamps = []
jobs.each do |j|
- insert_at = 0
- started_at = j[:started_at]
- finished_at = (if j[:finished_at] then j[:finished_at] else Time.now end)
+ started_at = (j.started_at if j.respond_to?(:started_at)) || (j[:started_at] if j.is_a?(Hash))
+ finished_at = (j.finished_at if j.respond_to?(:finished_at)) || (j[:finished_at] if j.is_a?(Hash)) || Time.now
if started_at
timestamps = merge_range timestamps, started_at, finished_at
end
@@ -289,7 +288,7 @@ module PipelineInstancesHelper
else
s = ""
if days > 0
- s += "#{days}d "
+ s += "#{days}d"
end
if (hours > 0)
@@ -298,7 +297,7 @@ module PipelineInstancesHelper
s += "#{minutes}m"
- if not round_to_min
+ if not round_to_min or (days == 0 and hours == 0 and minutes == 0)
s += "#{seconds}s"
end
end