don't ignore errors from fetch().then()

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 721c586c2f9cb8fb2d8387484760c9e32018ce3e..5baed88ef6574727e0c28753ef4bfb34fd6cc494 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_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;
 
 function dayschart(element, title, days, xtickformat) {
        var chartdata;


@@ -155,8 +158,14 @@ function dayschart(element, title, days, xtickformat) {
                        {axis: 'y', start:  100, end: 999, class: 'region-boiling'}
                ]
        });
                        {axis: 'y', start:  100, end: 999, class: 'region-boiling'}
                ]
        });

-       // woraround for unrendered dots
-       setTimeout(function () { chart.flush(); }, 5000);
+
+       // reload data in charts
+       setInterval(
+               function() {
+                       loaddays(chart, element, days);
+               },
+               refresh_interval
+       );

 };
 
 function loaddays(chart, element, days) {
 };
 
 function loaddays(chart, element, days) {


@@ -199,3 +208,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');
 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) {
+                               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', data['timestamp']);
+                       })
+                       .catch(function(error) {
+                               console.log(error);
+                       });
+       },
+       refresh_interval
+);