X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/56d8ed80ce834a051be71d2bcf76a346b7bc7f0b..2c292c1942746dfa7b93411d76a8374e1b0aff16:/apps/workbench/app/views/users/_tables.html.erb?ds=sidebyside diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb index bcbf3d7c6d..9e1c220fd6 100644 --- a/apps/workbench/app/views/users/_tables.html.erb +++ b/apps/workbench/app/views/users/_tables.html.erb @@ -1,18 +1,20 @@ <% if current_user.andand.is_active %>
(None)
<% else %>Script | @@ -20,23 +22,24 @@Log | Age | Status | +Progress | |
---|---|---|---|---|---|
- <%= link_to j.script[0..31], job_path(j.uuid) %> + <%= link_to((j.script.andand[0..31] || j.uuid), job_path(j.uuid)) %> |
- <% if j.success %>
+ <% if j.success and j.output %>
- <% Collection.limit(1).where(uuid: j.output).each do |c|
- c.files.each do |file| %>
+ <% Collection.limit(1).where(uuid: j.output).each do |c| %>
+ <% c.files.each do |file| %>
<%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
<% end %>
<% end %>
@@ -49,7 +52,15 @@
<% if j.log %>
- Log
+ <% fixup = /([a-f0-9]{32}\+\d+)(\+?.*)/.match(j.log)%>
+ <% Collection.limit(1).where(uuid: fixup[1]).each do |c| %>
+ <% c.files.each do |file| %>
+ Log
+ <% end %>
+ <% end %>
+ <% elsif j.respond_to? :log_buffer and j.log_buffer %>
+ <% buf = j.log_buffer.strip.split("\n").last %>
+ <%= buf %>
<% end %>
|
@@ -62,19 +73,12 @@
|
- <% if j.success %>
- finished
- <% elsif j.success == false %>
- failed
- <% elsif j.running and j.started_at and not j.finished_at %>
- <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-
-
-
-
- <% else %>
- queued
- <% end %>
+ <%= render partial: 'job_status_label', locals: {:j => j} %>
+ |
+
+
+ <%= render partial: 'job_progress', locals: {:j => j} %>
+
|
Pipeline template | +Instance | +Template | Age | Status | +Progress |
---|---|---|---|---|---|
- <% PipelineTemplate.limit(1).where(uuid: p.pipeline_template_uuid).each do |i| %> - <%= link_to i.name, pipeline_instance_path(p.uuid) %> - <% end %> + <%= link_to_if_arvados_object p.uuid, friendly_name: true %> + + | + ++ + <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> | @@ -120,17 +133,14 @@- <% if p.success %> - finished - <% elsif p.success == false %> - failed - <% elsif p.active %> - running - <% else %> - queued - <% end %> + <%= render partial: 'pipeline_status_label', locals: {:p => p} %> | +
+
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %>
+
+ |
(None)
<% else %>