diff --git a/app/views/admin/clients/_client.html.erb b/app/views/admin/clients/_client.html.erb
index c633088..e37a0c8 100644
--- a/app/views/admin/clients/_client.html.erb
+++ b/app/views/admin/clients/_client.html.erb
@@ -1,13 +1,16 @@
<%= link_to_if client.host.present?, "##{client.id}", admin_client_path(client) %> |
<%= link_to_if client.host.present?, client.name, admin_client_path(client) %> |
<%= client.uname %> |
<%= client.host.try(:origin) %> |
<%= @stats.active_jobs[client.id] || 0 %> |
<%= @stats.last_jobs[client.id] %> |
<%= client.file_retention_days %> |
<%= client.job_retention_days %> |
<%= number_to_human_size(@stats.jobs_sizes[client.id]) %> |
+
+ <%= [(100 * @stats.jobs_sizes[client.id] / Archiving.settings[:client_quota].to_f).round(1),
+ 100].min %> %
| <%= number_by_magnitude(@stats.jobs_files[client.id]) %> |
<%= client.auto_prune_human %> |
diff --git a/app/views/admin/clients/index.html.erb b/app/views/admin/clients/index.html.erb
index 468f4f9..61053ea 100644
--- a/app/views/admin/clients/index.html.erb
+++ b/app/views/admin/clients/index.html.erb
@@ -1,27 +1,28 @@
Bacula Clients
ClientId |
Name |
Uname |
Client Type |
Active Jobs |
Last Backup |
FileRetention (days) |
JobRetention (days) |
Space Used |
+ Space Used % |
File count |
AutoPrune |
<%= render partial: 'client', collection: @clients %>
diff --git a/app/views/clients/_client.html.erb b/app/views/clients/_client.html.erb
index 012e4b3..87ffc9e 100644
--- a/app/views/clients/_client.html.erb
+++ b/app/views/clients/_client.html.erb
@@ -1,11 +1,15 @@
<%= link_to client.name, client %> |
<%= client.uname %> |
<%= @stats.active_jobs[client.id] || 0 %> |
<%= @stats.last_jobs[client.id] %> |
<%= client.file_retention_days %> |
<%= client.job_retention_days %> |
<%= number_to_human_size(@stats.jobs_sizes[client.id]) %> |
+
+ <%= [(100 * @stats.jobs_sizes[client.id] / Archiving.settings[:client_quota].to_f).round(1),
+ 100].min %> %
+ |
<%= number_by_magnitude(@stats.jobs_files[client.id]) %> |
<%= client.auto_prune_human %> |
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index 20e488e..f3f16f8 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -1,54 +1,55 @@
<%= link_to 'New Client', new_host_path, class: 'btn btn-primary', role: 'button' %>
My Bacula Clients
Name |
Uname |
Active Jobs |
Last Backup |
FileRetention (days) |
JobRetention (days) |
Space Used |
+ Space Used % |
File count |
AutoPrune |
<%= render partial: 'client', collection: @clients %>
<% if @hosts.any? %>
My Pending Hosts
Name |
FQDN |
Port |
Password |
FileRetention (days) |
JobRetention (days) |
AutoPrune |
Verified |
Created At |
<%= render partial: 'hosts/host', collection: @hosts %>
<% end %>
<%= render partial: 'client_graphs', locals: { path: clients_path } %>