X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/06d6b29b121b80cb975e5d9d29a9a6f9b3763c47..6d1c41d6fd83824669cd1a6d714ea6da1ae7ab4c:/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 566e3d771e..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 %> @@ -66,7 +72,7 @@ <% 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 @@ -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 %>