commit 96bbf31065b3d7a27816c9344002803619d9e3fc
author Iftekharul Islam <iffy.ryan@ibm.com> Tue Aug 22 13:44:38 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Mon Oct 09 14:13:43 2017 -0500
tree 799b12ed7590c0fe0328ac37aceab45332759617
parent ba556c310594af3daa22bc96abee55af9ce23ab2

Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/common/services/api-utils.js

diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 408e42f..bec96b1 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -425,6 +425,18 @@
                       var tempKeyParts = [];
                       var order = 0;
 
+                      function getScaledValue(value, scale){
+                        scale = scale + "";
+                        var power = parseInt(scale.replace(/[\s\t\+\-]/g,''),10);
+
+                        if(scale.indexOf("+") > -1){
+                          value = value * Math.pow(10, power);
+                        }else if(scale.indexOf("-") > -1){
+                          value = value / Math.pow(10, power);
+                        }
+                        return value;
+                      }
+
                       function getSensorStatus(reading){
                         var severityFlags = {critical: false, warning: false, normal: false}, severityText = '', order = 0;
 
@@ -483,6 +495,8 @@
                             return prev + " " + el;
                           });
 
+                          content.data[key].Value = getScaledValue(content.data[key].Value, content.data[key].Scale);
+
                           sensorData.push(Object.assign({
                             path: key,
                             selected: false,