From: Misha Zatsman <misha-arvados@zatsman.com>
Date: Wed, 23 Apr 2014 20:14:38 +0000 (+0000)
Subject: Made sizes human readable, added measurement date column.
X-Git-Tag: 1.1.0~2690^2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/17e1d2d431280a8911ecd1f028de1924a7dc3aed?ds=inline

Made sizes human readable, added measurement date column.
---

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 72d44f51c2..53f3d3912f 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -67,22 +67,21 @@ class UsersController < ApplicationController
     @breadcrumb_page_name = nil
     @users = User.limit(params[:limit] || 1000).all
     @user_storage = {}
+    @log_date = {}
     @users.each do |u|
       @user_storage[u.uuid] ||= {}
       storage_log = Log.
-        # filter([[:object_uuid, '=', u.uuid],
-        #         [:event_type, '=', 'user-storage-report']])
         filter([[:object_uuid, '=', u.uuid],
                 [:event_type, '=', 'user-storage-report']]).
         order(:created_at => :desc).
         limit(1)
       storage_log.each do |log_entry|
         @user_storage[u.uuid] = log_entry['properties']
+        @log_date[u.uuid] = log_entry['event_at']
       end
     end
-    @users = @users.sort_by do |u|
-      [-@user_storage[u.uuid].values.push(0).inject(:+), u.full_name]
-    end
+    @users = @users.sort_by { |u|
+      [-@user_storage[u.uuid].values.push(0).inject(:+), u.full_name]}
   end
 
   def show_pane_list
diff --git a/apps/workbench/app/views/users/storage.html.erb b/apps/workbench/app/views/users/storage.html.erb
index 51d0c2e1e3..99c8883c2a 100644
--- a/apps/workbench/app/views/users/storage.html.erb
+++ b/apps/workbench/app/views/users/storage.html.erb
@@ -1,15 +1,15 @@
 <% content_for :css do %>
 table#users-storage-table th {
     overflow-x: hidden;
+    text-align: center;
 }
-table#users-storage-table .cell-for-span-This-month,
-table#users-storage-table .cell-for-span-Last-month {
-    background: #eee;
+table#users-storage-table .byte-value {
+    text-align: right;
 }
 <% end %>
 <table class="table table-condensed arv-index" id="users-storage-table">
   <colgroup>
-    <col width="28%" />
+    <col />
   </colgroup>
 
   <tr>
@@ -20,13 +20,14 @@ table#users-storage-table .cell-for-span-Last-month {
     <th colspan="2">
       Collections Persisted Storage
     </th>
+    <th rowspan="2">Measured At</th>
   </tr>
   <tr>
     <% 2.times do %>
-    <th>
+    <th class="byte-value">
       Total (unweighted)
     </th>
-    <th>
+    <th class="byte-value">
       Shared (weighted)
     </th>
     <% end %>
@@ -44,10 +45,13 @@ table#users-storage-table .cell-for-span-Last-month {
       </small>
     </td>
     <% [:read_collections_total_bytes, :read_collections_weighted_bytes, :persisted_collections_total_bytes, :persisted_collections_weighted_bytes].each do |key| %>
-    <td>
-      <%= @user_storage[user.uuid][key].to_s %>
+    <td class="byte-value">
+      <%= human_readable_bytes_html(@user_storage[user.uuid].fetch(key,0).floor) %>
     </td>
     <% end %>
+    <td class="date">
+      <%= @log_date[user.uuid] %>
+    </td>
   </tr>
   <% end %>
 </table>