reload from the correct different API endpoints for air and water

[chrisu/seepark.git] / web / static / seepark_web.js

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 583a14a7d4f619d4ea4742a4d28503c0da220bce..ff430ff9337969d9775bd8da1022c8305aca1fef 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -1,5 +1,8 @@
 var api_base_url_sensors = '/api/1/sensor/type/Wassertemperatur?mode=consolidated&format=c3';
 var api_base_url_weather = '/api/1/openweathermap/city/3319578?mode=consolidated&format=c3';
+var api_url_currentair   = '/api/1/currentairtemperature';
+var api_url_currentwater = '/api/1/currentwatertemperature';
+var refresh_interval     = 5 * 60 * 1000;
 
 function dayschart(element, title, days, xtickformat) {
        var chartdata;
@@ -156,16 +159,27 @@ function dayschart(element, title, days, xtickformat) {
                ]
        });
 
-       // reload data
+       // reload data in charts
+       // TODO: this is basically the same as the unused loaddays function below
        setInterval(
                function() {
-                       chart.load({
-                               url: api_base_url_sensors + beginend(days),
-                               mimeType: 'json'
-                       });
-                       chart.flush();
+                       if (element.substr(0, 7) == 'chart_w') {
+                               console.log("water");
+                               chart.load({
+                                       url: api_base_url_sensors + beginend(days),
+                                       mimeType: 'json'
+                               });
+                               chart.flush();
+                       } else {
+                               console.log("air");
+                               chart.load({
+                                       url: api_base_url_weather + beginend(days),
+                                       mimeType: 'json'
+                               });
+                               chart.flush();
+                       }
                },
-               5 * 60 * 1000
+               refresh_interval
        );
 };
 
@@ -209,3 +223,32 @@ dayschart('chart_air_1',     'Die Luft (Tag)',     1, '%H:%M');
 dayschart('chart_air_7',     'Die Luft (Woche)',   7, '%a %d');
 dayschart('chart_air_31',    'Die Luft (Monat)',  31, '%Y-%m-%d');
 dayschart('chart_air_365',   'Die Luft (Jahr)',  365, '%b %Y');
+
+// reload current values
+setInterval(
+       function() {
+               var airvalue   = document.getElementById('currentairvalue');
+               var airtime    = document.getElementById('currentairtime');
+               var watervalue = document.getElementById('currentwatervalue');
+               var watertime  = document.getElementById('currentwatertime');
+               fetch(api_url_currentair)
+                       .then((resp) => resp.json())
+                       .then(function(data) {
+                               airvalue.innerText = data['value'].toFixed(1);
+                               airtime.innerText  = strftime('%Y-%m-%d H:%M', data['timestamp']);
+                       })
+                       .catch(function(error) {
+                               // handle error
+                       });
+               fetch(api_url_currentwater)
+                       .then((resp) => resp.json())
+                       .then(function(data) {
+                               watervalue.innerText = data['value'].toFixed(1);
+                               watertime.innerText  = strftime('%Y-%m-%d H:%M', data['timestamp']);
+                       })
+                       .catch(function(error) {
+                               // handle error
+                       });
+       },
+       refresh_interval
+);