X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/e32107a7fe79ce34f3bdf860410a6d5455efdca7..1bcc16ab2539d2cddb7589f72487cc81ce69c171:/openwrt-web/meteo/meteo.js?ds=sidebyside diff --git a/openwrt-web/meteo/meteo.js b/openwrt-web/meteo/meteo.js index f56bc2d..36ff690 100644 --- a/openwrt-web/meteo/meteo.js +++ b/openwrt-web/meteo/meteo.js @@ -24,27 +24,29 @@ function RefreshPageState() { if (sensor != "timestamp") { for (var param in returnedData[sensor_id][sensor]) { sensor_path = sensor_id+"."+sensor+"."+param; - value = returnedData[sensor_id][sensor][param]; name = properties["names"][sensor_path]; - if (! name) { name = sensor_path; } - units = properties["units"][sensor_path]; - scale = properties["scale"][sensor_path]; - color = properties["colors"][sensor_path]; - if (scale) { - value = (scale[0] * value).toFixed(scale[1]); + if ((! name.startsWith("-")) && (name != "undefined")) { + value = returnedData[sensor_id][sensor][param]; + if (! name) { name = sensor_path; } + units = properties["units"][sensor_path]; + scale = properties["scale"][sensor_path]; + color = properties["colors"][sensor_path]; + if (scale) { + value = (scale[0] * value).toFixed(scale[1]); + } + if (! color) { + color = value_color; + } + var section = template.replace(/\$SENSOR_ID/g,sensor_id); + section = section.replace(/\$SENSOR/g,sensor); + section = section.replace(/\$PARAM/g,param); + section = section.replace(/\$NAME/g,name); + section = section.replace(/\$UNITS/g,units); + section = section.replace(/\$VALUE/g,value); + section = section.replace(/\$COLOR/g,color); + section = section.replace(/\$TIMESTAMP/g,timestamp); + html = html + section; } - if (! color) { - color = value_color; - } - var section = template.replace(/\$SENSOR_ID/g,sensor_id); - section = section.replace(/\$SENSOR/g,sensor); - section = section.replace(/\$PARAM/g,param); - section = section.replace(/\$NAME/g,name); - section = section.replace(/\$UNITS/g,units); - section = section.replace(/\$VALUE/g,value); - section = section.replace(/\$COLOR/g,color); - section = section.replace(/\$TIMESTAMP/g,timestamp); - html = html + section; } } }