X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c86a3350fe212e35a7d745d5607fbc27bc1fd3c8..023858a629bedfccdb5d17602643aaaa0a223e1a:/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 5213c2ae77..60d4c2abc2 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
@@ -1,3 +1,7 @@
+<%# Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: AGPL-3.0 %>
+
<%# Summary %>
@@ -30,6 +34,8 @@
completed in
<% elsif @object.state == 'Failed' %>
failed after
+ <% elsif @object.state == 'Cancelled' %>
+ was cancelled after
<% else %>
has been active for
<% end %>
@@ -41,9 +47,9 @@
end %>
<%= if walltime > runningtime
- render_runtime_compact(walltime)
+ render_runtime(walltime, false)
else
- render_runtime_compact(runningtime)
+ render_runtime(runningtime, 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 %>.
@@ -66,15 +72,15 @@
<%
cputime = pipeline_jobs.map { |j|
if j[:job][:started_at]
- (j[:job][:runtime_constraints].andand[:min_nodes] || 1) * ((j[:job][:finished_at] || Time.now()) - j[:job][:started_at])
+ (j[:job][:runtime_constraints].andand[:min_nodes] || 1).to_i * ((j[:job][:finished_at] || Time.now()) - j[:job][:started_at])
else
0
end
}.reduce(:+) || 0 %>
- <%= render_runtime_compact(runningtime) %><% if (walltime - runningtime) > 0 %>
- (<%= render_runtime_compact(walltime - runningtime) %> queued)<% end %><% if cputime == 0 %>.<% else %>
+ <%= render_runtime(runningtime, false) %><% if (walltime - runningtime) > 0 %>
+ (<%= render_runtime(walltime - runningtime, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
and used
- <%= render_runtime_compact(cputime) %>
+ <%= render_runtime(cputime, false) %>
of node allocation time (<%= (cputime/runningtime).round(1) %>⨯ scaling).
<% end %>
@@ -97,5 +103,5 @@
%>
<% pipeline_jobs.each_with_index do |pj, i| %>
- <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false} %>
+ <%= render partial: 'running_component', locals: {pj: pj, i: i, expanded: false, pipeline_display: true} %>
<% end %>