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

Add custom Units for top tiles

This commit is contained in:
wez3 2017-01-14 21:25:36 +01:00
parent 70cf474fe6
commit df97fe5a45
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
static/js/domoboard.js
View File

@ -82,7 +82,7 @@ function refreshSwitches(updateSwitches, block) {
} }
// Top tiles functions // Top tiles functions
function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeArray) { function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeArray, updateDivsUnitsArray) {
if (tilesPreviousArray.length == 0) { if (tilesPreviousArray.length == 0) {
for(var i = 0; i < updateDivs.length; i++){ for(var i = 0; i < updateDivs.length; i++){
tilesPreviousArray.push(-1); tilesPreviousArray.push(-1);
@ -101,6 +101,9 @@ function refreshTopTiles(updateDivs, block, tilesPreviousArray, updateDivsTypeAr
var re = /(-?\d+\.?\d*) (.+)/; var re = /(-?\d+\.?\d*) (.+)/;
tilesArray = re.exec(data); tilesArray = re.exec(data);
if (tilesArray != null) { if (tilesArray != null) {
if (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];

10
templates/top_tiles.html
View File

@ -15,6 +15,7 @@ $(document).ready(function() {
var updateDivs_block_{{count}}=[]; var updateDivs_block_{{count}}=[];
var tilesPreviousArray_{{count}}=[]; var tilesPreviousArray_{{count}}=[];
var updateDivsType_block_{{count}} = []; var updateDivsType_block_{{count}} = [];
var updateDivsUnits_block_{{count}} = [];
{% for k, v in blockArray[count]["top_tiles"].iteritems() %} {% for k, v in blockArray[count]["top_tiles"].iteritems() %}
updateDivs_block_{{count}}.push("{{v[1]}}"); updateDivs_block_{{count}}.push("{{v[1]}}");
{% if v[3]|length > 3 %} {% if v[3]|length > 3 %}
@ -22,10 +23,15 @@ $(document).ready(function() {
{% else %} {% else %}
updateDivsType_block_{{count}}.push("Data"); updateDivsType_block_{{count}}.push("Data");
{% endif %} {% endif %}
{% if v[4] %}
updateDivsUnits_block_{{count}}.push("{{v[4]}}");
{% else %}
updateDivsUnits_block_{{count}}.push(undefined);
{% endif %}
{% endfor %} {% endfor %}
tilesPreviousArray_{{count}} = refreshTopTiles(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}}); tilesPreviousArray_{{count}} = setInterval(refreshTopTiles, 9000, updateDivs_block_{{count}}, "top_tiles_block_{{count}}_", tilesPreviousArray_{{count}}, updateDivsType_block_{{count}}, updateDivsUnits_block_{{count}});
var counter = 0; var counter = 0;
for (var i in updateDivs_block_{{count}}) { for (var i in updateDivs_block_{{count}}) {
$("#top_tiles_block_{{count}}_" + updateDivs_block_{{count}}[i] + "_" + updateDivsType_block_{{count}}[counter]).removeClass("loading"); $("#top_tiles_block_{{count}}_" + updateDivs_block_{{count}}[i] + "_" + updateDivsType_block_{{count}}[counter]).removeClass("loading");