X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2873926cdbfc8012b276db11d24cea3ad6a4bdd4..964ab3dd90ff1508efc0c77378cde2b3a4da1029:/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 8613d54a10..c916ee9530 100644 --- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb +++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb @@ -1,84 +1,97 @@ - <% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %> -
-
-
-
+<% current_job = pj[:job] if pj[:job] != {} and pj[:job][:uuid] %> +
+
+
+
+ <%# column offset 0 %> +
+

+ + <%= pj[:name] %> + +

+
+ + <%# column offset 3 %> +
+ <%= pj[:progress_bar] %> +
+ + <% if current_job %> + <%# column offset 5 %> + <% if current_job[:state] != "Queued" %>
-

- - <%= pj[:name] %> - -

+ <% 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 = tasks.map { |task| + if task.started_at and task.job_uuid == current_job[:uuid] + (if task.finished_at then task.finished_at else Time.now() end) - task.started_at + else + 0 + end + }.reduce(:+) || 0 %> + <%= render_runtime(walltime, false, false) %> + <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %> + <% end %>
+ <% end %> - <% if current_job %> -
- <%= render(partial: 'job_status_label', locals: { j: current_job }) %> + <% if current_job[:state] == "Queued" %> + <%# column offset 5 %> +
+ <% queuetime = Time.now - current_job[:created_at] %> + Queued for <%= render_runtime(queuetime, true) %>. + <% 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 %>
- <% 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 = tasks.map { |task| - if task.started_at and task.job_uuid == current_job.uuid - (if task.finished_at then task.finished_at else Time.now() end) - task.started_at - else - 0 - end - }.reduce(:+) || 0 %> - <%= render_runtime(walltime, false, false) %> - <% if cputime > 0 %> / <%= render_runtime(cputime, false, false) %> (<%= (cputime/walltime).round(1) %>⨯)<% end %> + + <%= current_job[:tasks_summary][:done] %> <%= "task".pluralize(current_job[:tasks_summary][:done]) %> done, + <%= current_job[:tasks_summary][:failed] %> failed, + <%= current_job[:tasks_summary][:running] %> running, + <%= current_job[:tasks_summary][:todo] %> pending + +
+ <% elsif current_job[:state].in? ["Complete", "Failed", "Cancelled"] %> + <%# column offset 8 %> +
+ <% if pj[:output_uuid] %> + <%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %> + <% elsif current_job[:output] %> + <%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %> + <% else %> + No output. <% end %>
+ <% end %> - <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %> -
- <% if pj[:output_uuid] %> - <%= link_to_if_arvados_object pj[:output_uuid], friendly_name: true %> - <% elsif current_job.andand[:output] %> - <%= link_to_if_arvados_object current_job[:output], link_text: "Output of #{pj[:name]}" %> - <% else %> - No output. - <% end %> -
- <% elsif current_job[:state] == "Running" %> -
- <%= pj[:progress_bar] %> -
-
- <%= form_tag "/jobs/#{current_job.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %> + <% if current_job[:state].in? ["Queued", "Running"] %> + <%# column offset 11 %> +
+ <%= form_tag "/jobs/#{current_job[:uuid]}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %> <%= hidden_field_tag :return_to, url_for(@object) %> <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-job-button"} %> -
- <% end %> - <% elsif current_job[:state] == "Queued" %> -
- <% queuetime = Time.now - current_job[:created_at] %> - Queued for <%= render_runtime(queuetime, true) %>. - <% 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. - <% else %> - There are <%= current_job.queue_position %> jobs in the queue ahead of this one. <% end %> - <% rescue %> - <% end %>
<% end %> - <% else %> -
- Not ready -
-<% end %> -
-
-
+ <% end %> +
+
+
-
-
-
+
+
+
<% current_component = (if current_job then current_job else pj end) %>
@@ -154,21 +167,8 @@

script_parameters:

<%= JSON.pretty_generate(current_component[:script_parameters]) rescue nil %>
- <% if current_component[:tasks_summary] %> -
- - <% [:done, :running, :failed, :todo].each do |d| %> - - - - - - <% end %> -
<%= 'tasks:' if d == :done %><%= d.to_s %><%= current_component[:tasks_summary][d] %>
-
- <% end %>
+
-