12902: Say "created at" instead of "started at" for a queued ctr.
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 31 Jan 2018 15:09:11 +0000 (10:09 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 31 Jan 2018 15:18:55 +0000 (10:18 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

apps/workbench/app/views/projects/_show_dashboard.html.erb

index 713582654fee93b3c9bd11432701e002b6fc5d0c..e51cf5314d275137260f214f2e0bbbc6852bd373 100644 (file)
@@ -125,12 +125,15 @@ SPDX-License-Identifier: AGPL-3.0 %>
               </div>
 
               <div class="clearfix">
-                Started at <%= render_localized_date(wu.started_at || wu.created_at, "noseconds") %>.
-                <% wu_time = Time.now - (wu.started_at || wu.created_at) %>
-                Active for <%= render_runtime(wu_time, false) %>.
-
-                <div class="pull-right">
-                </div>
+                <% if wu.started_at %>
+                  Started at <%= render_localized_date(wu.started_at, "noseconds") %>
+                  Active for <%= render_runtime(Time.now - wu.started_at, false) %>.
+                <% else %>
+                  Created at <%= render_localized_date(wu.created_at, "noseconds") %>.
+                  <% if wu.state_label == 'Queued' %>
+                    Queued for <%= render_runtime(Time.now - wu.created_at, false) %>.
+                  <% end %>
+                <% end %>
               </div>
             </div>
             <% end %>