X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2bab50e5573bec3e46585fe23e2ffb26b1b8fe55..f097af1ebfdb1ff849c1d5be4bda5b098871b877:/apps/workbench/app/views/jobs/_show_status.html.erb diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb index cec63403ef..807520940c 100644 --- a/apps/workbench/app/views/jobs/_show_status.html.erb +++ b/apps/workbench/app/views/jobs/_show_status.html.erb @@ -1,27 +1,36 @@ -
-<% pj = {} %> -<% pj[:job] = @object %> -<% pj[:name] = @object[:name] || "this job" %> -<% tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results %> -<%= render partial: 'pipeline_instances/running_component', locals: {tasks: tasks, pj: pj, i: 0, expanded: true} %> -
+
+<%= + pj = {} + pj[:job] = @object + pj[:name] = @object[:name] || "this job" + pj[:progress_bar] = render(partial: "job_progress", + locals: {:j => @object }) + tasks = JobTask.filter([['job_uuid', '=', @object.uuid]]).results + render(partial: 'pipeline_instances/running_component', + locals: { tasks: tasks, pj: pj, i: 0, expanded: true}) +%> -
-
- Used in pipelines -
-
-<% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %> +
+
+ Used in pipelines +
+
+ <% pi = PipelineInstance.order("created_at desc").filter([["components", "like", "%#{@object.uuid}%"]]) %> -<% pi.each do |pipeline| %> - <% pipeline.components.each do |k, v| %> - <% if v[:job] and v[:job][:uuid] == @object.uuid %> -
- <%= k %> component of <%= link_to_if_arvados_object pipeline, friendly_name: true %> - created at <%= render_localized_date(pipeline.created_at) %>. -
+ <% pi.each do |pipeline| %> + <% pipeline.components.each do |k, v| %> + <% if v[:job] and v[:job][:uuid] == @object.uuid %> +
+ <%= k %> + component of + <%= link_to_if_arvados_object pipeline, friendly_name: true %> + created at + <%= render_localized_date(pipeline.created_at) %>. +
+ <% end %> + <% end %> <% end %> - <% end %> -<% end %> -
+