X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7cf55dce1df774d2c3daa3e54c0d4f27c38d4b11..5d356c84dcf8f3a2129cce0f4fbfc50f16a8a339:/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..2fd5bba388 100644 --- a/apps/workbench/app/views/users/_tables.html.erb +++ b/apps/workbench/app/views/users/_tables.html.erb @@ -12,39 +12,41 @@ - + + - Script - Output - Log - Age - Status - + Script + Output + Log + Age + Status + Progress + <% @my_jobs[0..6].each do |j| %> - + - <%= link_to((j.script.andand[0..31] || j.uuid), 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| %> - <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> - <% end %> - <% end %> - + + <% 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 %> + - <% end %> - + <% end %> + @@ -65,35 +67,16 @@ - <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about -','~').sub(' ',' ')) if j.created_at %> + <%= raw(distance_of_time_in_words(j.created_at, Time.now).sub('about ','~').sub(' ',' ')) if j.created_at %> - <% 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,70 +98,47 @@ - + + - Instance - Template - Age - Status + Instance + Template + Age + Status + Progress <% @my_pipelines[0..6].each do |p| %> - + - <%= link_to_if_arvados_object p.uuid, friendly_name: true %> + <%= link_to_if_arvados_object p.uuid, friendly_name: true %> - <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> + <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> - <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about -','~').sub(' ',' ')) if p.created_at %> + <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about ','~').sub(' ',' ')) if p.created_at %> - <% 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 %> @@ -200,7 +160,7 @@ <% end %> -
+
<% end %> <% if not current_user.andand.is_active or @my_collections.empty? %> @@ -209,25 +169,27 @@ - - + + + - - - + + + + <% @my_collections[0..6].each do |c| %> - + + <% end %>
ContentsTagsAgeContentsTagsAgeStorage
- - <% c.files.each do |file| %> - <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> - <% end %> - + + <% c.files.each do |file| %> + <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> + <% end %> + @@ -239,10 +201,12 @@ - <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about -','~').sub(' ',' ')) if c.created_at %> + <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ',' ')) if c.created_at %> + <%= render partial: 'collections/toggle_persist', locals: { uuid: c.uuid, current_state: @persist_state[c.uuid] } %> +
@@ -258,19 +222,19 @@

Welcome to Arvados, <%= current_user.first_name %>!

-

- Your account must be activated by an Arvados administrator. If this - is your first time accessing Arvados and would like to request - access, or you believe you are seeing the page in error, please - <%= link_to "contact us", Rails.configuration.activation_contact_link %>. - You should receive an email at the address you used to log in when - your account is activated. In the mean time, you can - <%= link_to "learn more about Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %>, - and <%= link_to "read the Arvados user guide", "http://doc.arvados.org/user" %>. -

-

- <%= link_to raw('Contact us ✉'), - Rails.configuration.activation_contact_link, class: "pull-right btn btn-primary" %>

+

+ Your account must be activated by an Arvados administrator. If this + is your first time accessing Arvados and would like to request + access, or you believe you are seeing the page in error, please + <%= link_to "contact us", Rails.configuration.activation_contact_link %>. + You should receive an email at the address you used to log in when + your account is activated. In the mean time, you can + <%= link_to "learn more about Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %>, + and <%= link_to "read the Arvados user guide", "http://doc.arvados.org/user" %>. +

+

+ <%= link_to raw('Contact us ✉'), + Rails.configuration.activation_contact_link, class: "pull-right btn btn-primary" %>