9318: running and finished containers and fixtures updated.

[arvados.git] / apps / workbench / app / views / work_unit / _show_component.html.erb

diff --git a/apps/workbench/app/views/work_unit/_show_component.html.erb b/apps/workbench/app/views/work_unit/_show_component.html.erb
index 23ac3d393d5025cce157566036488982fe0a1ad0..58b8aa861b61e502464a197ee22a55afdf165785 100644 (file)
--- a/apps/workbench/app/views/work_unit/_show_component.html.erb
+++ b/apps/workbench/app/views/work_unit/_show_component.html.erb
@@ -4,95 +4,41 @@
   <div class="row-fluid">
     <%# Need additional handling for main object display  %>
     <% if @object.uuid == wu.uuid %>
-      <div class="col-md-2 pull-right">
+    <div class="container-fluid">
+      <div class="pull-right">
         <div class="container-fluid">
-          <div class="row-fluid">
-            <%# column offset 0 %>
-            <% if wu.state_label.in? ["Queued", "Running"] and wu.can_cancel? and @object.editable? %>
-                <div class="col-md-1">
+          <div class="row-fulid pipeline-instance-spacing">
+            <div class="col-md-8">
+            <% if wu.is_running? and wu.child_summary_str %>
+                <%= wu.child_summary_str %>
+            <% end %>
+            </div>
+            <div class="col-md-3">
+              <%= render partial: 'work_unit/progress', locals: {wu: wu} %>
+            </div>
+            <div class="col-md-1">
+              <% if wu.can_cancel? and @object.editable? %>
                   <%= form_tag "#{wu.uri}/cancel", remote: true, style: "display:inline; padding-left: 1em" do |f| %>
                     <%= hidden_field_tag :return_to, url_for(@object) %>
                     <%= button_tag "Cancel", {class: 'btn btn-xs btn-danger', id: "cancel-obj-button"} %>
                   <% end %>
-                </div>
-            <% end %>
-            <%# column offset 1 %>
-            <div class="pull-right col-md-5 pipeline-instance-spacing">
-              <%= render partial: 'work_unit/progress', locals: {wu: wu} %>
+              <% end %>
             </div>
           </div>
         </div>
       </div>
+    </div>
     <% end %>
 
     <div class="col-md-10" >
-      <% if wu.state_label == 'Paused' %>
+      <% if wu.is_paused? %>
         <p>
-          This <%= wu.title %> is paused. Children that are
-          already running will continue to run, but no new work will be submitted.
+          This <%= wu.title %> is paused. Children that are already running
+          will continue to run, but no new processes will be submitted.
         </p>
       <% end %>
 
-      <% runningtime = determine_wallclock_runtime(wu.children) %>
-
-      <p>
-        <% if wu.started_at %>
-          This <%= wu.title %> started at <%= render_localized_date(wu.started_at) %>.
-          It
-          <% if wu.state_label == 'Complete' %>
-            completed in
-          <% elsif wu.state_label == 'Failed' %>
-            failed after
-          <% else %>
-            has been active for
-          <% end %>
-
-          <% walltime = if wu.finished_at then
-                          wu.finished_at - wu.started_at
-                        else
-                          Time.now - wu.started_at
-                        end %>
-
-          <%= if walltime > runningtime
-                render_runtime(walltime, false)
-              else
-                render_runtime(runningtime, false)
-              end %><% if wu.finished_at %> at <%= render_localized_date(wu.finished_at) %><% end %>.
-        <% else %>
-          <% if wu.state_label %> This <%= wu.title %> is <%= if wu.state_label == 'Running' then 'active' else wu.state_label.downcase end %>. <% end %>
-            <% walltime = 0 %>
-        <% end %>
-
-        <% if wu.state_label == 'Failed' %>
-          Check the Log tab for more detail about why it failed.
-        <% end %>
-      </p>
-
-      <% if wu.state_label %>
-        <p>
-            It
-            <% if wu.state_label == 'Running' %>
-              has run
-            <% else %>
-              ran
-            <% end %>
-            for
-            <%
-                cputime = wu.children.map { |c|
-                if c.started_at
-                  (c.runtime_constraints.andand[:min_nodes] || 1) * ((c.finished_at || Time.now()) - c.started_at)
-                else
-                  0
-                end
-               }.reduce(:+) || 0 %>
-            <%= render_runtime(runningtime, false) %><% if (walltime - runningtime) > 0 %>
-              (<%= render_runtime(walltime - runningtime, false) %> queued)<% end %><% if cputime == 0 %>.<% else %>
-              and used
-            <%= render_runtime(cputime, false) %>
-            of node allocation time (<%= (cputime/runningtime).round(1) %>&Cross; scaling).
-            <% end %>
-        </p>
-      <% end %>
+      <%= raw(wu.show_runtime) %>
     </div>
   </div>