X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c16fd46f51a61f5d66e08b786362d91ef5a33f7d..da67c81ff6cc5fd540c0725de1c8208c2d8933be:/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 6e740df5a4..10592f5009 100644 --- a/apps/workbench/app/views/users/_tables.html.erb +++ b/apps/workbench/app/views/users/_tables.html.erb @@ -1,80 +1,83 @@ <% if current_user.andand.is_active %>
(None)
<% else %>Script | -Output | -Log | -Age | -Status | -Script | +Output | +Log | +Age | +Status | +Progress | + <% @my_jobs[0..6].each do |j| %> -
---|---|---|---|---|---|---|---|
- <%= 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 %> - - - <% 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 %> - + | + + <% 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 %> + + + <% end %> + | <% 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 %> | - <%= 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.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 | -Age | -Status | +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 %> | - <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about -','~').sub(' ',' ')) if p.created_at %> + <%= link_to_if_arvados_object p.pipeline_template_uuid, friendly_name: true %> | - <% if p.success %> - finished - <% elsif p.success == false %> - failed - <% elsif p.active %> - running - <% else %> - queued - <% end %> + + <%= raw(distance_of_time_in_words(p.created_at, Time.now).sub('about ','~').sub(' ',' ')) if p.created_at %> + + | + ++ <%= render partial: 'pipeline_status_label', locals: {:p => p} %> | +
+
+ <%= render partial: 'pipeline_progress', locals: {:p => p} %>
+
+ |
(None)
<% else %>Contents | -Age | +Contents | +Tags | +Age | +Storage |
---|---|---|---|---|---|
+ + + <% c.files.each do |file| %> + <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> + <% end %> + + + | + <% if @my_tag_links[c.uuid] %> - - <% c.files.each do |file| %> - <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %> - <% end %> - + <%= @my_tag_links[c.uuid].collect(&:name).join(", ") %> + <% end %> | - <%= 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] } %> + |
+ 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" %>
+