X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/a72b8d03929f166cd8f034b207cc224b11623e6e..8422e1bb7ea6ab2bda185ef9d9b77cd41e7eb3d1:/web/static/seepark_web.js?ds=inline diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index c762fb0..40fd919 100644 --- 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; @@ -80,7 +83,10 @@ function dayschart(element, title, days, xtickformat) { 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 @@ -102,13 +108,9 @@ function dayschart(element, title, days, xtickformat) { 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 } @@ -147,6 +149,9 @@ function dayschart(element, title, days, xtickformat) { grid: { y: { show: true + }, + x: { + show: true } }, regions: [ @@ -156,6 +161,14 @@ function dayschart(element, title, days, xtickformat) { {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) { @@ -198,3 +211,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 +);