From 3ccb6122224e8e78df652f37903f674573506373 Mon Sep 17 00:00:00 2001 From: hengsin Date: Fri, 19 Apr 2024 19:19:14 +0800 Subject: [PATCH] IDEMPIERE-6106 Performance indicator (the Gauge chart): rendering of needle is wrong when value is > the max interval (#2312) --- org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml | 6 +++--- .../src/org/idempiere/zk/billboard/Version.java | 2 +- .../src/web/js/zul/billboard/ext/billboard.gauge.js | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml b/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml index f75d108997..521d0c8666 100644 --- a/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml +++ b/org.idempiere.zk.billboard/src/metainfo/zk/lang-addon.xml @@ -6,7 +6,7 @@ xul/html org.idempiere.zk.billboard.Version - 3.10.3.20231118 + 3.10.3.20240411 billboard @@ -19,7 +19,7 @@ - + - + diff --git a/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java b/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java index 265c5d6bae..5d658e628f 100644 --- a/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java +++ b/org.idempiere.zk.billboard/src/org/idempiere/zk/billboard/Version.java @@ -34,5 +34,5 @@ public class Version { * Returns the version UID.
* Must match with version-uid value in lang-addon.xml */ - public static final String UID = "3.10.3.20231118"; + public static final String UID = "3.10.3.20240411"; } diff --git a/org.idempiere.zk.billboard/src/web/js/zul/billboard/ext/billboard.gauge.js b/org.idempiere.zk.billboard/src/web/js/zul/billboard/ext/billboard.gauge.js index 1e31e4e53f..8e9d09ce5a 100644 --- a/org.idempiere.zk.billboard/src/web/js/zul/billboard/ext/billboard.gauge.js +++ b/org.idempiere.zk.billboard/src/web/js/zul/billboard/ext/billboard.gauge.js @@ -13,7 +13,7 @@ billboard.GaugeRenderer = class { if (rendererOptions) { if (rendererOptions["showNeedle"] && rendererOptions["showNeedle"] == true) { showNeedle = true; - gauge.title = "\n{=NEEDLE_VALUE}%"; + gauge.title = "\n"+wgt.getSeriesData()[1]+"%"; gauge.width = 20; gauge.label = { format: function(_value, _ratio, id) { return id; } @@ -69,6 +69,11 @@ billboard.GaugeRenderer = class { value: wgt.getSeriesData()[1][0] } }; + if (rendererOptions["intervals"]) { + if (model.arc.needle.value > rendererOptions["intervals"][rendererOptions["intervals"].length-1]) { + model.arc.needle.value = rendererOptions["intervals"][rendererOptions["intervals"].length-1]+3; + } + } model.interaction = { enabled: false };