summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2018-02-07 14:30:17 -0600
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-02-12 23:49:08 +0000
commit022f564469ea6241631684abca154009c2abdc71 (patch)
tree9d8a8a596549884aa54d17e28530b1979bd3fbf4
parentcacfa6df26bc3823efe70a8457964873c9fe7fe0 (diff)
downloadphosphor-webui-022f564469ea6241631684abca154009c2abdc71.tar.gz
phosphor-webui-022f564469ea6241631684abca154009c2abdc71.zip
Scale critical and warning values
The scale value should be applied to the CriticalLow, CriticalHigh, WarningLow, and WarningHigh values. Resolves openbmc/openbmc#2874 Tested: Pointed the local GUI to a Witherspoon system and verfied the correct critical and warning values. Change-Id: I5a04009570e47d2b448f505969585d46b5ffca07 Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
-rw-r--r--app/common/services/api-utils.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 3f28751..4d8b12c 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -554,7 +554,10 @@ window.angular && (function (angular) {
});
content.data[key].Value = getScaledValue(content.data[key].Value, content.data[key].Scale);
-
+ content.data[key].CriticalLow = getScaledValue(content.data[key].CriticalLow, content.data[key].Scale);
+ content.data[key].CriticalHigh = getScaledValue(content.data[key].CriticalHigh, content.data[key].Scale);
+ content.data[key].WarningLow = getScaledValue(content.data[key].WarningLow, content.data[key].Scale);
+ content.data[key].WarningHigh = getScaledValue(content.data[key].WarningHigh, content.data[key].Scale);
if(Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit) > -1){
customOrder = Constants.SENSOR_SORT_ORDER.indexOf(content.data[key].Unit);
}else{
OpenPOWER on IntegriCloud