Merge pull request #167 from chinyihan/formula_bug

nicolaisi · web-flow · commit d26395cfb514 · 2024-07-04T13:37:16.000+02:00
Math.round lead to negative sign not showing
diff --git a/js_plugins/adei.js b/js_plugins/adei.js
@@ -69,11 +69,15 @@ function parse_adei(key, value, timestamp, invalid) {
         }
     } else {
         if (data_decimal_numbers != undefined && data_decimal_numbers >= 0) {
-            value = (Math.round(value * 100) / 100).toFixed(data_decimal_numbers);
+            if (value >= 0) {
+                value = (Math.round(value * 100) / 100).toFixed(data_decimal_numbers);
+            } else {
+                // negative value
+                value = ((value * 100) / 100).toFixed(data_decimal_numbers);
+            }
         }
     }
 
-
     if (invalid != undefined && invalid < delta) {
         $("#" + key + "> .value").css('color', 'grey');
         $("#" + key + "> .unit-name").css('color', 'grey');

Original file line number	Diff line number	Diff line change
`@@ -69,11 +69,15 @@ function parse_adei(key, value, timestamp, invalid) {`
`69`	`69`	`}`
`70`	`70`	`} else {`
`71`	`71`	`if (data_decimal_numbers != undefined && data_decimal_numbers >= 0) {`
`72`		`- value = (Math.round(value * 100) / 100).toFixed(data_decimal_numbers);`
	`72`	`+ if (value >= 0) {`
	`73`	`+ value = (Math.round(value * 100) / 100).toFixed(data_decimal_numbers);`
	`74`	`+ } else {`
	`75`	`+ // negative value`
	`76`	`+ value = ((value * 100) / 100).toFixed(data_decimal_numbers);`
	`77`	`+ }`
`73`	`78`	`}`
`74`	`79`	`}`
`75`	`80`
`76`		`-`
`77`	`81`	`if (invalid != undefined && invalid < delta) {`
`78`	`82`	`$("#" + key + "> .value").css('color', 'grey');`
`79`	`83`	`$("#" + key + "> .unit-name").css('color', 'grey');`