diff --git a/static/js/domoboard.js b/static/js/domoboard.js index e067d26..ebaeac6 100644 --- a/static/js/domoboard.js +++ b/static/js/domoboard.js @@ -82,7 +82,7 @@ function refreshSwitches(updateSwitches, block) { } // Top tiles functions -function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeArray) { +function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeArray, updateDivsUnitsArray) { if (tilesPreviousArray.length == 0) { for(var i = 0; i < updateDivs.length; i++){ tilesPreviousArray.push(-1); @@ -101,6 +101,9 @@ function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeAr var re = /(-?\d+\.?\d*) (.+)/; 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] + "" + tilesArray[2] + " "); tilesPreviousArray[i] = tilesArray[1]; diff --git a/templates/top_tiles.html b/templates/top_tiles.html index cbf2779..8ed1bb0 100644 --- a/templates/top_tiles.html +++ b/templates/top_tiles.html @@ -15,6 +15,7 @@ $(document).ready(function() { var updateDivs_block_{{count}}=[]; var tilesPreviousArray_{{count}}=[]; var updateDivsType_block_{{count}} = []; + var updateDivsUnits_block_{{count}} = []; {% for k, v in blockArray[count]["top_tiles"].iteritems() %} updateDivs_block_{{count}}.push("{{v[1]}}"); {% if v[3]|length > 3 %} @@ -22,10 +23,15 @@ $(document).ready(function() { {% else %} updateDivsType_block_{{count}}.push("Data"); {% endif %} + {% if v[4] %} + updateDivsUnits_block_{{count}}.push("{{v[4]}}"); + {% else %} + updateDivsUnits_block_{{count}}.push(undefined); + {% endif %} {% endfor %} - tilesPreviousArray_{{count}} = refreshTopTiles(updateDivs_block_{{count}}, "top_tiles_block_{{count}}_", tilesPreviousArray_{{count}}, updateDivsType_block_{{count}}); - tilesPreviousArray_{{count}} = setInterval(refreshTopTiles, 9000, updateDivs_block_{{count}}, "top_tiles_block_{{count}}_", tilesPreviousArray_{{count}}, updateDivsType_block_{{count}}); + tilesPreviousArray_{{count}} = refreshTopTiles(updateDivs_block_{{count}}, "top_tiles_block_{{count}}_", tilesPreviousArray_{{count}}, updateDivsType_block_{{count}}, updateDivsUnits_block_{{count}}); + tilesPreviousArray_{{count}} = setInterval(refreshTopTiles, 9000, updateDivs_block_{{count}}, "top_tiles_block_{{count}}_", tilesPreviousArray_{{count}}, updateDivsType_block_{{count}}, updateDivsUnits_block_{{count}}); var counter = 0; for (var i in updateDivs_block_{{count}}) { $("#top_tiles_block_{{count}}_" + updateDivs_block_{{count}}[i] + "_" + updateDivsType_block_{{count}}[counter]).removeClass("loading");