X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/4a3782f2287399b05ed0aa59c0ac8c921a21a5c3..8f767296cf0be759c6cccaaf7da9fde3e1fd1f85:/web/static/seepark_web.js diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index 2aad39b..7e727a1 100644 --- a/web/static/seepark_web.js +++ b/web/static/seepark_web.js @@ -67,7 +67,6 @@ function dayschart(element, title, days, xtickformat) { chart.resize({ width: getwidth(element) }); - // chart.flush(); }, transition: { duration: null @@ -149,6 +148,9 @@ function dayschart(element, title, days, xtickformat) { grid: { y: { show: true + }, + x: { + show: true } }, regions: [ @@ -159,6 +161,9 @@ function dayschart(element, title, days, xtickformat) { ] }); + // workaround for unrendered dots + setTimeout(function () { chart.flush(); }, 5000); + // reload data in charts setInterval( function() { @@ -173,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) { @@ -220,19 +228,19 @@ setInterval( .then((resp) => resp.json()) .then(function(data) { airvalue.innerText = data['value'].toFixed(1); - airtime.innerText = strftime('%Y-%m-%d H:%M', data['timestamp']); + airtime.innerText = strftime('%Y-%m-%d %H:%M', new Date(data['timestamp'])); }) .catch(function(error) { - // handle 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']); + watertime.innerText = strftime('%Y-%m-%d %H:%M', new Date(data['timestamp'])); }) .catch(function(error) { - // handle error + console.log(error); }); }, refresh_interval