From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 03/10] ui: refactor render_size_usage to Utils
Date: Mon, 9 Nov 2020 16:01:23 +0100 [thread overview]
Message-ID: <20201109150130.4956-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201109150130.4956-1-d.csapak@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/Utils.js | 9 +++++++++
www/datastore/Summary.js | 13 +------------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/www/Utils.js b/www/Utils.js
index 3d7e6824..8b87f1bf 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -185,6 +185,15 @@ Ext.define('PBS.Utils', {
return Ext.String.format(gettext("in {0}"), duration);
},
+ render_size_usage: function(val, max) {
+ if (max === 0) {
+ return gettext('N/A');
+ }
+ return (val*100/max).toFixed(2) + '% (' +
+ Ext.String.format(gettext('{0} of {1}'),
+ Proxmox.Utils.format_size(val), Proxmox.Utils.format_size(max)) + ')';
+ },
+
constructor: function() {
var me = this;
diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js
index 4a89460c..ac3f19e2 100644
--- a/www/datastore/Summary.js
+++ b/www/datastore/Summary.js
@@ -51,18 +51,7 @@ Ext.define('PBS.DataStoreInfo', {
let total = store.getById('total').data.value;
let used = store.getById('used').data.value;
- let percent = 100*used/total;
- if (total === 0) {
- percent = 0;
- }
- let used_percent = `${percent.toFixed(2)}%`;
-
- let usage = used_percent + ' (' +
- Ext.String.format(
- gettext('{0} of {1}'),
- Proxmox.Utils.format_size(used),
- Proxmox.Utils.format_size(total),
- ) + ')';
+ let usage = PBS.Utils.render_size_usage(used, total);
vm.set('usagetext', usage);
vm.set('usage', used/total);
--
2.20.1
next prev parent reply other threads:[~2020-11-09 15:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 15:01 [pbs-devel] [PATCH proxmox-backup 00/10] add Datastore overview panel Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 01/10] api2/node/tasks: add check_job_store and use it Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 02/10] ui: refactor render_estimate Dominik Csapak
2020-11-09 15:01 ` Dominik Csapak [this message]
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 04/10] ui: Utils: add parse_datastore_worker_id Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 05/10] ui: make Sync/VerifyView and Edit usable without datastore Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 06/10] ui: TaskSummary: move state/types/titles out of the controller Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 07/10] ui: TaskSummary: add subPanelModal and datastore parameters Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 08/10] ui: TaskSummary: handle less defined parameters of tasks Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 09/10] ui: add Panels necessary for Datastores Overview Dominik Csapak
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 10/10] ui: make Datastore clickable again Dominik Csapak
2020-11-09 17:55 ` [pbs-devel] applied series: [PATCH proxmox-backup 00/10] add Datastore overview panel Thomas Lamprecht
2020-11-09 18:28 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201109150130.4956-4-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox