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 43589638D4
for <pbs-devel@lists.proxmox.com>; Mon, 5 Oct 2020 15:43:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3C97A1B0EF
for <pbs-devel@lists.proxmox.com>; Mon, 5 Oct 2020 15:43:20 +0200 (CEST)
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 3D8021B0C3
for <pbs-devel@lists.proxmox.com>; Mon, 5 Oct 2020 15:43:18 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 08E1E458AB
for <pbs-devel@lists.proxmox.com>; Mon, 5 Oct 2020 15:43:18 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Mon, 5 Oct 2020 15:43:14 +0200
Message-Id: <20201005134317.12425-4-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201005134317.12425-1-d.csapak@proxmox.com>
References: <20201005134317.12425-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.535 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 4/7] ui: refactor render_icon code
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, 05 Oct 2020 13:43:20 -0000
we will reuse this later
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/dashboard/TaskSummary.js | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/www/dashboard/TaskSummary.js b/www/dashboard/TaskSummary.js
index 6f2e1d99..0cf049cd 100644
--- a/www/dashboard/TaskSummary.js
+++ b/www/dashboard/TaskSummary.js
@@ -7,30 +7,36 @@ Ext.define('PBS.TaskSummary', {
controller: {
xclass: 'Ext.app.ViewController',
- render_count: function(value, md, record, rowindex, colindex) {
+ render_icon: function(state, count) {
let cls = 'question';
let color = 'faded';
- switch (colindex) {
- case 1:
+ switch (state) {
+ case "error":
cls = "times-circle";
color = "critical";
break;
- case 2:
+ case "warning":
cls = "exclamation-circle";
color = "warning";
break;
- case 3:
+ case "ok":
cls = "check-circle";
color = "good";
break;
default: break;
}
- if (value < 1) {
+ if (count < 1) {
color = "faded";
}
cls += " " + color;
- return `<i class="fa fa-${cls}"></i> ${value}`;
+ return `<i class="fa fa-${cls}"></i>`;
+ },
+
+ render_count: function(value, md, record, rowindex, colindex) {
+ let me = this;
+ let icon = me.render_icon(me.states[colindex], value);
+ return `${icon} ${value}`;
},
},
--
2.20.1