X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/26114a84293ea3fbcc5ef4adcf7900060716e62c..35336cd73e444534cb2eda20e3730464cc4e6553:/apps/workbench/app/views/users/_tables.html.erb
diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 1592632f4a..bb38c7c0fa 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -12,7 +12,8 @@
-
+
+
@@ -21,6 +22,7 @@
Log |
Age |
Status |
+ Progress |
<% @my_jobs[0..6].each do |j| %>
@@ -71,29 +73,11 @@
- <% if j.success %>
- finished
- <% elsif j.success == false %>
- failed
- <% elsif j.finished_at %>
- finished?
- <% elsif j.started_at %>
- running
- <% else %>
- queued
- <% end %>
- <% percent_total_tasks = 100 / (j.tasks_summary[:running] + j.tasks_summary[:done] + j.tasks_summary[:todo]) rescue 0 %>
-
-
-
-
-
-
- <% if j.success == false %>
-
-
- <% end %>
-
+ <%= render partial: 'job_status_label', locals: {:j => j} %>
+ |
+
+
+ <%= render partial: 'job_progress', locals: {:j => j} %>
|
@@ -115,7 +99,8 @@
-
+
+
@@ -123,6 +108,7 @@
Template |
Age |
Status |
+ Progress |
<% @my_pipelines[0..6].each do |p| %>
@@ -147,38 +133,14 @@
- <% if p.success %>
- finished
- <% elsif p.success == false %>
- failed
- <% elsif p.active and p.modified_at < 30.minutes.ago %>
- stopped
- <% elsif p.active %>
- running
- <% else %>
- queued
- <% end %>
+ <%= render partial: 'pipeline_status_label', locals: {:p => p} %>
+ |
- <% summary = pipeline_summary p %>
-
-
-
-
- <% if p.success == false %>
-
-
- <% else %>
-
-
-
-
-
-
- <% end %>
-
+
+
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %>
|
-
<% end %>