From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 7D9A86741F
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 16:01:32 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7561618440
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 16:01:32 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 905F718425
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 16:01:31 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 446A64605B
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 16:01:31 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Mon, 9 Nov 2020 16:01:22 +0100
Message-Id: <20201109150130.4956-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201109150130.4956-1-d.csapak@proxmox.com>
References: <20201109150130.4956-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.395 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pbs-devel] [PATCH proxmox-backup 02/10] ui: refactor
render_estimate
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2020 15:01:32 -0000
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