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 e4bd8d640646581708e418b28469bd256e81010c..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;


@@ -58,11 +61,11 @@ function dayschart(element, title, days, xtickformat) {
        var chart = c3.generate({
                bindto: '#' + element,
                size: {
        var chart = c3.generate({
                bindto: '#' + element,
                size: {

-                       width: document.getElementById(element).parentElement.clientWidth * 80 / 100
+                       width: getwidth(element)

                },
                onresized: function () {
                        chart.resize({
                },
                onresized: function () {
                        chart.resize({

-                               width: document.getElementById(element).parentElement.clientWidth * 80 / 100
+                               width: getwidth(element)

                        });
                        // chart.flush();
                },
                        });
                        // chart.flush();
                },


@@ -80,7 +83,10 @@ function dayschart(element, title, days, xtickformat) {
                        x: {
                                type: 'timeseries',
                                tick: {
                        x: {
                                type: 'timeseries',
                                tick: {

-                                       format: xtickformat,
+                                       format: function (d) {
+                                               var strftimeDE = strftime.localizeByIdentifier('de_DE');
+                                               return strftimeDE(xtickformat, new Date(d));
+                                       },

                                        fit: false,
                                        multiline: true, // broken? so →
                                        rotate: -90
                                        fit: false,
                                        multiline: true, // broken? so →
                                        rotate: -90


@@ -102,13 +108,9 @@ function dayschart(element, title, days, xtickformat) {
                        enabled: true,
                        /*
                        onzoomend: function (domain) {
                        enabled: true,
                        /*
                        onzoomend: function (domain) {

-                               // UNIX epoch
-                               var start = domain[0].getTime()/1000;
-                               var end   = domain[1].getTime()/1000;
-                               var duration = end - start;
-                               // duration is now the diff of the "viewport in seconds"
-                               // FIXME
-                               var days = Math.round(duration / 86400 / 2);
+                               var duration = (domain[1] - domain[0]) / 1000; // duration is now the diff of the "viewport in seconds"
+                               // FIXME?
+                               var days = duration / 86400;

                                if (days > 0) {
                                        loaddays(this, element, days); // this = chart
                                }
                                if (days > 0) {
                                        loaddays(this, element, days); // this = chart
                                }


@@ -156,6 +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'}
                ]
        });

+
+       // reload data in charts
+       setInterval(
+               function() {
+                       loaddays(chart, element, days);
+               },
+               refresh_interval
+       );

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


@@ -185,6 +195,10 @@ function beginend(days) {
        return '&begin=' + begin + '&end=' + end;
 }
 
        return '&begin=' + begin + '&end=' + end;
 }
 

+function getwidth(element) {
+       return document.getElementById(element).parentElement.clientWidth * 80 / 100;
+}
+

 dayschart('chart_water_1',   'Der See (Tag)',     1, '%H:%M');
 dayschart('chart_water_7',   'Der See (Woche)',   7, '%a %d');
 dayschart('chart_water_31',  'Der See (Monat)',  31, '%Y-%m-%d');
 dayschart('chart_water_1',   'Der See (Tag)',     1, '%H:%M');
 dayschart('chart_water_7',   'Der See (Woche)',   7, '%a %d');
 dayschart('chart_water_31',  'Der See (Monat)',  31, '%Y-%m-%d');


@@ -194,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
+);