From a1936f33ebf4d09ed8aaa7a0bc4a7d804069a7f3 Mon Sep 17 00:00:00 2001
From: Squandor <git@digitaal-rechercheurs.nl>
Date: Tue, 17 Jan 2017 16:42:39 +0100
Subject: [PATCH] changed regex for issue #63

---
 static/js/domoboard.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/static/js/domoboard.js b/static/js/domoboard.js
index 204bffd..bcfd270 100644
--- a/static/js/domoboard.js
+++ b/static/js/domoboard.js
@@ -94,23 +94,28 @@ function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeAr
     requestAPI(url, function(d) {
 		var obj = JSON.parse(d);
 		if (obj.result != undefined) {
-			var data = obj.result[0][updateDivsTypeArray[i]];
+			var data = obj.result[0][updateDivsTypeArray[i]].toString();
 		} else {
 			var data = "-";
 		}
-		var re = /(-?\d+\.?\d*) (.+)/;
+		//var re = /(-?\d+\.?\d*) (.+)/;  -- old regex didn't found an temp value
+    var re = /(-?\d+[\.*]?\d*)(\s*.*)/;
 		tilesArray = re.exec(data);
+
 		if (tilesArray != null) {
       if (updateDivsUnitsArray[i]) {
         tilesArray[2] = updateDivsUnitsArray[i];
       }
 			if (tilesArray[1] < tilesPreviousArray[i]) {
+
 				$("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "<font size='3'>" + tilesArray[2] + " <i class='fa fa-caret-down fa-lg' style='color:red'></font>");
 				tilesPreviousArray[i] = tilesArray[1];
 			} else if (tilesArray[1] > tilesPreviousArray[i]) {
 				$("#" + block + divID  + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "<font size='3'>" + tilesArray[2] + " <i class='fa fa-caret-up fa-lg' style='color:green'></font>");
 				tilesPreviousArray[i] = tilesArray[1];
-			}
+			} else {
+        $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(tilesArray[1] + "<font size='3'>" + tilesArray[2] + " <i class='fa fa-caret-up fa-lg' style='color:green'></font>");
+      }
 		} else {
 			$("#" + block + divID + "_" + updateDivsTypeArray[i]).html(data);
 		}
@@ -332,6 +337,7 @@ function changeSetpoint(idx, val) {
 
 function refreshSetpoints(updateSetpoints, block) {
   $.each(updateSetpoints, function(i, setpointID) {
+    console.log(setpointID);
     var url = flask_server + "/api?type=devices&rid="+ setpointID;
     var setpointVal = document.getElementById("setpoint_" + setpointID + "_block_" + block);
     requestAPI(url, function(d) {