Merge branch 'master' into 8441-project-chooser

[arvados.git] / apps / workbench / app / views / projects / _compute_node_status.html.erb

diff --git a/apps/workbench/app/views/projects/_compute_node_status.html.erb b/apps/workbench/app/views/projects/_compute_node_status.html.erb
index 528d0ea0eb1ddc195f5d8dee4f9b4074b761676d..cd9243d68f76003a77f65c7197477aa213d60e38 100644 (file)
--- a/apps/workbench/app/views/projects/_compute_node_status.html.erb
+++ b/apps/workbench/app/views/projects/_compute_node_status.html.erb
@@ -1,7 +1,50 @@
+<h4>Queue</h4>
+<% queue = Job.queue %>
+<% if queue.any? %>
 
+<% queue.each do |j| %>
+  <div class="row">
+    <div class="col-md-3 text-overflow-ellipsis">
+      <%= link_to_if_arvados_object j, friendly_name: true %>
+    </div>
+    <div class="col-md-4">
+      <%= render_localized_date(j[:created_at]) %>
+    </div>
+    <div class="col-md-3">
+      <%= render_runtime(Time.now - j[:created_at], false) %>
+    </div>
+    <div class="col-md-2">
+      <%= j[:priority] %>
+    </div>
+  </div>
+<% end %>
+  <div class="row">
+    <div class="col-md-3">
+      <b>Job</b>
+    </div>
+    <div class="col-md-4">
+      <b>Submitted</b>
+    </div>
+    <div class="col-md-3">
+      <b>Queued</b>
+    </div>
+    <div class="col-md-2">
+      <b>Priority</b>
+    </div>
+  </div>
+  <% if Job.queue_size > queue.size %>
+    <i>Note: some items in the queue are not visible to you.</i>
+  <% end %>
+  <div>
+  </div>
+<% else %>
+  There are currently no jobs in your queue.
+<% end %>
+
+<h4>Node status</h4>
 <div class="compute-summary-nodelist">
     <% nodes.sort_by { |n| n.hostname || "" }.each do |n| %>
-      <% if n.crunch_worker_state.in? ["busy", "idle"] %>
+      <% if n.crunch_worker_state.in? ["busy", "idle"] and (Time.now - n[:last_ping_at]) < 3600 %>
         <div class="compute-summary">
           <a data-toggle="collapse" href="#detail_<%= n.hostname %>" class="compute-summary-head label label-<%= if n.crunch_worker_state == 'busy' then 'primary' else 'default' end %>">
             <%= n.hostname %>
@@ -9,7 +52,7 @@
           <div id="detail_<%= n.hostname %>" class="collapse compute-detail">
             state: <%= n.crunch_worker_state %><br>
             <% [:total_cpu_cores, :total_ram_mb, :total_scratch_mb].each do |i| %>
-              <%= i.to_s.gsub '_', ' ' %>: <%= n.info[i] %><br>
+              <%= i.to_s.gsub '_', ' ' %>: <%= n.properties[i] %><br>
             <% end %>
           </div>
         </div>