X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d23d4ce9e4c52605cb23286b9e9b46a808f7437d..d3cb9460f0a30f9602508bed7507c906b8a6d91d:/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb

diff --git a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
index 9140780e7e..165a694e8b 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -7,13 +7,13 @@
   </p>
 <% end %>
 
-<% tasks = JobTask.filter([['job_uuid', 'in', render_pipeline_jobs.map { |j| j[:job].andand[:uuid] }]]).results %>
-<% runningtime = determine_wallclock_runtime(render_pipeline_jobs.map {|j| j[:job]}) %>
+<% tasks = JobTask.filter([['job_uuid', 'in', render_pipeline_jobs.map { |j| j[:job].andand[:uuid] }.compact]]).results %>
+<% runningtime = determine_wallclock_runtime(render_pipeline_jobs.map {|j| j[:job]}.compact) %>
 
 <p>
   <% if @object.started_at %>
-    This pipeline started at <span data-utc-date="<%= @object.started_at %>"><%= @object.started_at %></span>.
-    It 
+    This pipeline started at <%= render_localized_date(@object.started_at) %>.
+    It
     <% if @object.state == 'Complete' %>
       completed in
     <% elsif @object.state == 'Failed' %>
@@ -27,12 +27,12 @@
                   else
                     Time.now - @object.started_at
                   end %>
-    
-    <%= if walltime > runningtime 
-          render_runtime(walltime, true) 
-        else 
-          render_runtime(runningtime, true) 
-        end %><% if @object.finished_at %> at <span data-utc-date="<%= @object.finished_at %>"><%= @object.finished_at %></span><% end %>.
+
+    <%= if walltime > runningtime
+          render_runtime(walltime, true, false)
+        else
+          render_runtime(runningtime, true, false)
+        end %><% if @object.finished_at %> at <%= render_localized_date(@object.finished_at) %><% end %>.
     <% else %>
       This pipeline is <%= if @object.state.start_with? 'Running' then 'active' else @object.state.downcase end %>.
         <% walltime = 0%>
@@ -58,10 +58,10 @@
          0
        end
        }.reduce(:+) || 0 %>
-    <%= render_runtime(runningtime, true, false) %><% if walltime - runningtime > 0 %>
-      (<%= render_runtime(walltime - runningtime, true) %> queued)<% end %><% if cputime == 0 %>.<% else %>
+    <%= render_runtime(runningtime, true, false) %><% if (walltime - runningtime) > 0 %>
+      (<%= render_runtime(walltime - runningtime, true, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
       and used
-    <%= render_runtime(cputime, true) %>
+    <%= render_runtime(cputime, true, false) %>
     of CPU time (<%= (cputime/runningtime).round(1) %>&Cross; scaling).
     <% end %>
 </p>