Merge remote-tracking branch 'refs/remotes/origin/master'

[weathermon.git] / openwrt-web / meteo / meteo.js

diff --git a/openwrt-web/meteo/meteo.js b/openwrt-web/meteo/meteo.js
index f56bc2db61063ba15c7846e3f5c6375e8fc1783d..36ff690eb91604665b9a9cf08db6feabc9fa1781 100644 (file)
--- 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;
           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];
               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;

             }
           }  
         }
             }
           }  
         }