X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/908261de15c98553a4200f01aff1f26ef57c8fb8..bdbcc4024e4320e17634fdfbdeb48a6051b0fccd:/apps/workbench/app/views/pipeline_instances/_running_component.html.erb diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb index d4e0944b5c..06ed01ee6e 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -48,7 +48,7 @@
<% if current_job[:started_at] %> <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %> - <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1) * + <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1).to_i * ((current_job[:finished_at] || Time.now()) - current_job[:started_at]) %> <%= render_runtime(walltime, false) %> <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %> @@ -61,16 +61,6 @@
<% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %> Queued for <%= render_runtime(queuetime, false) %>. - <% begin %> - <% if current_job[:queue_position] == 0 %> - This job is next in the queue to run. - <% elsif current_job[:queue_position] == 1 %> - There is 1 job in the queue ahead of this one. - <% elsif current_job[:queue_position] %> - There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one. - <% end %> - <% rescue %> - <% end %>
<% elsif current_job[:state] == "Running" %> <%# column offset 8 %>