6602: display runtime using the formula (min_nodes * (finished_at - started_at))

[arvados.git] / 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 c4b0f4a924534215071c60bff73fa933850b5906..5213c2ae77f61d896f107f11fc33a7a92cba5a8c 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components_running.html.erb
@@ -41,9 +41,9 @@
                   end %>
 
     <%= if walltime > runningtime
-          render_runtime(walltime, true, false)
+          render_runtime_compact(walltime)
         else
-          render_runtime(runningtime, true, false)
+          render_runtime_compact(runningtime)
         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 %>.
@@ -71,11 +71,11 @@
           0
         end
        }.reduce(:+) || 0 %>
-    <%= render_runtime(runningtime, true, false) %><% if (walltime - runningtime) > 0 %>
-      (<%= render_runtime(walltime - runningtime, true, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
+    <%= render_runtime_compact(runningtime) %><% if (walltime - runningtime) > 0 %>
+      (<%= render_runtime_compact(walltime - runningtime) %> queued)<% end %><% if cputime == 0 %>.<% else %>
       and used
-    <%= render_runtime(cputime, true, false) %>
-    of total time on the nodes (<%= (cputime/runningtime).round(1) %>&Cross; scaling).
+    <%= render_runtime_compact(cputime) %>
+    of node allocation time (<%= (cputime/runningtime).round(1) %>&Cross; scaling).
     <% end %>
 </p>