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 9ac4f444a1e50235b3f26802c955bd26a61eb3b0..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_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;


@@ -10,19 +13,34 @@ function dayschart(element, title, days, xtickformat) {
                                xs: {
                                        '0416a1ac66ff': '0416a1ac66ff_x',
                                        '0516a207a4ff': '0516a207a4ff_x',
                                xs: {
                                        '0416a1ac66ff': '0416a1ac66ff_x',
                                        '0516a207a4ff': '0516a207a4ff_x',

-                                       '0416a1bab9ff': '0416a1bab9ff_x'
+                                       '0416a1bab9ff': '0416a1bab9ff_x',
+                                       '0316a2193bff': '0316a2193bff_x'

                                },
                                names: {
                                },
                                names: {

-                                       '0416a1ac66ff': 'Wassertemperatur in 50 cm Tiefe',
-                                       '0516a207a4ff': 'Wassertemperatur in 1 m Tiefe',
-                                       '0416a1bab9ff': 'Wassertemperatur in 2 m Tiefe'
+                                       '0416a1ac66ff': 'Wassertemperatur 30cm Tiefe',
+                                       '0516a207a4ff': 'Wassertemperatur 50cm Tiefe',
+                                       '0416a1bab9ff': 'Wassertemperatur 1m Tiefe',
+                                       '0316a2193bff': 'Wassertemperatur in 30 cm Tiefe'

                                },
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                },
                                xFormat: '%Y-%m-%d %H:%M:%S',

+                               // https://en.wikipedia.org/wiki/Web_colors

                                colors: {
                                        '0416a1ac66ff': 'lightskyblue',
                                        '0516a207a4ff': 'royalblue',
                                colors: {
                                        '0416a1ac66ff': 'lightskyblue',
                                        '0516a207a4ff': 'royalblue',

-                                       '0416a1bab9ff': 'midnightblue'
+                                       '0416a1bab9ff': 'mediumblue',
+                                       '0316a2193bff': 'midnightblue'
+                               },
+                               /*
+                               xSort: false,
+                               order: function (a, b) {
+                                       // gets 2 x objects. seems to be a "sort function" for js's sort()
+                                       // -1: a before b etc.
+                                       // only handle cases that appear in the wild
+                                       // console.log("a.id", a.id, "b.id", b.id);
+                                       if (a.id == '0416a1ac66ff') {return -1};
+                                       if (a.id == '0416a1bab9ff') {return  1};

                                }
                                }

+                               */

                };
        } else {
                chartdata = {
                };
        } else {
                chartdata = {


@@ -43,7 +61,12 @@ 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({
+                               width: getwidth(element)
+                       });

                },
                transition: {
                        duration: null
                },
                transition: {
                        duration: null


@@ -59,7 +82,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


@@ -79,18 +105,16 @@ function dayschart(element, title, days, xtickformat) {
                },
                zoom: {
                        enabled: true,
                },
                zoom: {
                        enabled: true,

+                       /*

                        onzoomend: function (domain) {
                        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
                                }
                        }

+                       */

                },
                tooltip: {
                        format: {
                },
                tooltip: {
                        format: {


@@ -98,7 +122,7 @@ function dayschart(element, title, days, xtickformat) {
                                name: function (name, ratio, id, index) {
                                        var prefix = '';
                                        if (element.substr(0, 7) == 'chart_w') {
                                name: function (name, ratio, id, index) {
                                        var prefix = '';
                                        if (element.substr(0, 7) == 'chart_w') {

-                                               var re = /\d+ c?m/;
+                                               var re = /\d+ ?c?m/;

                                                prefix = 'Wasser ';
                                        } else {
                                                var re = /Luft/;
                                                prefix = 'Wasser ';
                                        } else {
                                                var re = /Luft/;


@@ -109,15 +133,24 @@ function dayschart(element, title, days, xtickformat) {
                                value: function (value, ratio, id, index) {
                                        return value.toFixed(2) + '°';
                                },
                                value: function (value, ratio, id, index) {
                                        return value.toFixed(2) + '°';
                                },

-                               title: function (x) {
-                                       // TODO: format datetime into something readable
-                                       return x;
+                               title: function (datetime) {
+                                       // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toLocaleString
+                                       options = {
+                                               weekday: 'short',
+                                               year: 'numeric', month: 'numeric', day: 'numeric',
+                                               hour: 'numeric', minute: 'numeric', second: 'numeric',
+                                               timeZone: 'Europe/Vienna', timeZoneName: 'short'
+                                       };
+                                       return datetime.toLocaleString('de-AT', options);

                                }
                        }
                },
                grid: {
                        y: {
                                show: true
                                }
                        }
                },
                grid: {
                        y: {
                                show: true

+                       },
+                       x: {
+                               show: true

                        }
                },
                regions: [
                        }
                },
                regions: [


@@ -127,6 +160,17 @@ function dayschart(element, title, days, xtickformat) {
                        {axis: 'y', start:  100, end: 999, class: 'region-boiling'}
                ]
        });
                        {axis: 'y', start:  100, end: 999, class: 'region-boiling'}
                ]
        });

+
+       // workaround 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) {


@@ -134,14 +178,17 @@ function loaddays(chart, element, days) {
        if (element.substr(0, 7) == 'chart_w') {
                chart.load({
                        url: api_base_url_sensors + beginend(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),
                });
        } else {
                chart.load({
                        url: api_base_url_weather + beginend(days),

-                       mimeType: 'json'
+                       mimeType: 'json',
+                       unload: true

                });
                });

-       }
+       };
+       setTimeout(function () { chart.flush(); }, 5000);

 }
 
 function beginend(days) {
 }
 
 function beginend(days) {


@@ -156,12 +203,45 @@ 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_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, 'Woche %V');
+dayschart('chart_water_31',  'Der See (Monat)',  31, '%Y-%m-%d');

 dayschart('chart_water_365', 'Der See (Jahr)',  365, '%b %Y');
 
 dayschart('chart_air_1',     'Die Luft (Tag)',     1, '%H:%M');
 dayschart('chart_air_7',     'Die Luft (Woche)',   7, '%a %d');
 dayschart('chart_water_365', 'Der See (Jahr)',  365, '%b %Y');
 
 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, 'Woche %V');
+dayschart('chart_air_31',    'Die Luft (Monat)',  31, '%Y-%m-%d');

 dayschart('chart_air_365',   'Die Luft (Jahr)',  365, '%b %Y');
 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
+);