X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fd307c578c8665feb50b71b7a3b7c5bf79d70607..bdbcc4024e4320e17634fdfbdeb48a6051b0fccd:/apps/workbench/app/views/pipeline_instances/_running_component.html.erb

diff --git a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
index a7dc22f0f5..06ed01ee6e 100644
--- a/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_running_component.html.erb
@@ -18,27 +18,29 @@
         </div>
 
         <%# column offset 4 %>
-        <div class="col-md-1">
-        <% if current_job %>
-          <% if(pipeline_display rescue nil) %>
-            <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
-              <% if current_job[:log] %>
+        <% if not current_job %>
+          <div class="col-md-8"></div>
+        <% else %>
+          <div class="col-md-1">
+            <% if (pipeline_display rescue nil) %>
+              <% if current_job[:state].in? ["Complete", "Failed", "Cancelled"] %>
+                <% if current_job[:log] %>
                   <% logCollection = Collection.find? current_job[:log] %>
                   <% if logCollection %>
                     <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                   <% else %>
                     Log unavailable
                   <% end %>
-              <% end %>
-            <% elsif current_job[:state] == "Running" %>
+                <% end %>
+              <% elsif current_job[:state] == "Running" %>
                 <% job = Job.find? current_job[:uuid] %>
                 <% if job %>
                   <%= link_to "Log", job_path(current_job[:uuid], anchor: "Log") %>
                 <% else %>
                   Log unavailable
                 <% end %>
+              <% end %>
             <% end %>
-          <% end %>
           </div>
 
           <%# column offset 5 %>
@@ -46,7 +48,7 @@
           <div class="col-md-3">
             <% if current_job[:started_at] %>
               <% walltime = ((if current_job[:finished_at] then current_job[:finished_at] else Time.now() end) - current_job[:started_at]) %>
-              <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1) *
+              <% cputime = (current_job[:runtime_constraints].andand[:min_nodes] || 1).to_i *
                            ((current_job[:finished_at] || Time.now()) - current_job[:started_at]) %>
               <%= render_runtime(walltime, false) %>
               <% if cputime > 0 %> / <%= render_runtime(cputime, false) %> (<%= (cputime/walltime).round(1) %>&Cross;)<% end %>
@@ -59,16 +61,6 @@
             <div class="col-md-6">
               <% queuetime = Time.now - Time.parse(current_job[:created_at].to_s) %>
               Queued for <%= render_runtime(queuetime, false) %>.
-              <% begin %>
-                <% if current_job[:queue_position] == 0 %>
-                  This job is next in the queue to run.
-                <% elsif current_job[:queue_position] == 1 %>
-                  There is 1 job in the queue ahead of this one.
-                <% elsif current_job[:queue_position] %>
-                  There are <%= current_job[:queue_position] %> jobs in the queue ahead of this one.
-                <% end %>
-              <% rescue %>
-              <% end %>
             </div>
           <% elsif current_job[:state] == "Running" %>
             <%# column offset 8 %>