simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed regex for issue #63

This commit is contained in:
Squandor 2017-01-17 16:42:39 +01:00
parent 3eddfd5ba8
commit a1936f33eb
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/domoboard.js
View File

@ -94,23 +94,28 @@ function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeAr
requestAPI(url, function(d) { requestAPI(url, function(d) {
var obj = JSON.parse(d); var obj = JSON.parse(d);
if (obj.result != undefined) { if (obj.result != undefined) {
var data = obj.result[0][updateDivsTypeArray[i]]; var data = obj.result[0][updateDivsTypeArray[i]].toString();
} else { } else {
var data = "-"; 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); tilesArray = re.exec(data);
if (tilesArray != null) { if (tilesArray != null) {
if (updateDivsUnitsArray[i]) { if (updateDivsUnitsArray[i]) {
tilesArray[2] = updateDivsUnitsArray[i]; tilesArray[2] = updateDivsUnitsArray[i];
} }
if (tilesArray[1] < tilesPreviousArray[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>"); $("#" + 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]; tilesPreviousArray[i] = tilesArray[1];
} else if (tilesArray[1] > tilesPreviousArray[i]) { } 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>"); $("#" + 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]; 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 { } else {
$("#" + block + divID + "_" + updateDivsTypeArray[i]).html(data); $("#" + block + divID + "_" + updateDivsTypeArray[i]).html(data);
} }
@ -332,6 +337,7 @@ function changeSetpoint(idx, val) {
function refreshSetpoints(updateSetpoints, block) { function refreshSetpoints(updateSetpoints, block) {
$.each(updateSetpoints, function(i, setpointID) { $.each(updateSetpoints, function(i, setpointID) {
console.log(setpointID);
var url = flask_server + "/api?type=devices&rid="+ setpointID; var url = flask_server + "/api?type=devices&rid="+ setpointID;
var setpointVal = document.getElementById("setpoint_" + setpointID + "_block_" + block); var setpointVal = document.getElementById("setpoint_" + setpointID + "_block_" + block);
requestAPI(url, function(d) { requestAPI(url, function(d) {