From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 02/10] ui: refactor render_estimate
Date: Mon, 9 Nov 2020 16:01:22 +0100 [thread overview]
Message-ID: <20201109150130.4956-3-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 | 18 ++++++++++++++++++
www/dashboard/DataStoreStatistics.js | 20 +-------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/www/Utils.js b/www/Utils.js
index 3d370781..3d7e6824 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -167,6 +167,24 @@ Ext.define('PBS.Utils', {
return tokenid.match(/^(.+)!([^!]+)$/)[2];
},
+ render_estimate: function(value) {
+ if (!value) {
+ return gettext('Not enough data');
+ }
+
+ let now = new Date();
+ let estimate = new Date(value*1000);
+
+ let timespan = (estimate - now)/1000;
+
+ if (Number(estimate) <= Number(now) || isNaN(timespan)) {
+ return gettext('Never');
+ }
+
+ let duration = Proxmox.Utils.format_duration_human(timespan);
+ return Ext.String.format(gettext("in {0}"), duration);
+ },
+
constructor: function() {
var me = this;
diff --git a/www/dashboard/DataStoreStatistics.js b/www/dashboard/DataStoreStatistics.js
index 3aaa3c9b..13e1d160 100644
--- a/www/dashboard/DataStoreStatistics.js
+++ b/www/dashboard/DataStoreStatistics.js
@@ -47,24 +47,6 @@ Ext.define('PBS.DatastoreStatistics', {
controller: {
xclass: 'Ext.app.ViewController',
- render_estimate: function(value) {
- if (!value) {
- return gettext('Not enough data');
- }
-
- let now = new Date();
- let estimate = new Date(value*1000);
-
- let timespan = (estimate - now)/1000;
-
- if (Number(estimate) <= Number(now) || isNaN(timespan)) {
- return gettext('Never');
- }
-
- let duration = Proxmox.Utils.format_duration_human(timespan);
- return Ext.String.format(gettext("in {0}"), duration);
- },
-
init: function(view) {
Proxmox.Utils.monStoreErrors(view, view.getStore().rstore);
},
@@ -111,7 +93,7 @@ Ext.define('PBS.DatastoreStatistics', {
text: gettext('Estimated Full'),
dataIndex: 'estimated-full-date',
sortable: true,
- renderer: 'render_estimate',
+ renderer: PBS.Utils.render_estimate,
flex: 1,
minWidth: 130,
maxWidth: 200,
--
2.20.1
next prev parent reply other threads:[~2020-11-09 15:01 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 ` Dominik Csapak [this message]
2020-11-09 15:01 ` [pbs-devel] [PATCH proxmox-backup 03/10] ui: refactor render_size_usage to Utils Dominik Csapak
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-3-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