X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fd1c8009f521564eaec4dbb22cead032e3784023..0b187b107128a57c1f0c00057d39979ab53d4137:/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..4343f2e57b 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 @@ -41,9 +41,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 %>. @@ -71,10 +71,10 @@ 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 +97,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 %>