loaddays: wrap .flush in a setTimeout

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 6d8e1f1a19345fe06c2ba63b20e73f064e60e1dd..7e727a1f0927b31351122c6f2a8c00f9ac289e77 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;
@@ -64,7 +67,6 @@ function dayschart(element, title, days, xtickformat) {
                        chart.resize({
                                width: getwidth(element)
                        });
-                       // chart.flush();
                },
                transition: {
                        duration: null
@@ -146,6 +148,9 @@ function dayschart(element, title, days, xtickformat) {
                grid: {
                        y: {
                                show: true
+                       },
+                       x: {
+                               show: true
                        }
                },
                regions: [
@@ -159,15 +164,12 @@ function dayschart(element, title, days, xtickformat) {
        // workaround for unrendered dots
        setTimeout(function () { chart.flush(); }, 5000);
 
-       // reload data
+       // reload data in charts
        setInterval(
                function() {
-                       chart.load({
-                               url: api_base_url_sensors + beginend(days),
-                               mimeType: 'json'
-                       })
+                       loaddays(chart, element, days);
                },
-               5 * 60 * 1000
+               refresh_interval
        );
 };
 
@@ -176,14 +178,17 @@ function loaddays(chart, element, days) {
        if (element.substr(0, 7) == 'chart_w') {
                chart.load({
                        url: api_base_url_sensors + beginend(days),
-                       mimeType: 'json'
+                       mimeType: 'json',
+                       unload: true
                });
        } else {
                chart.load({
                        url: api_base_url_weather + beginend(days),
-                       mimeType: 'json'
+                       mimeType: 'json',
+                       unload: true
                });
-       }
+       };
+       setTimeout(function () { chart.flush(); }, 5000);
 }
 
 function beginend(days) {
@@ -211,3 +216,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', new Date(data['timestamp']));
+                       })
+                       .catch(function(error) {
+                               console.log(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', new Date(data['timestamp']));
+                       })
+                       .catch(function(error) {
+                               console.log(error);
+                       });
+       },
+       refresh_interval
+);