X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/282065a04f0b9762a1019376712fdfc4a7bc4acf..4d0eef893a499d6078a60b8b703cef05e95c1092:/web/static/seepark_web.js

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 583a14a..5cdeca5 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;
@@ -146,6 +149,9 @@ function dayschart(element, title, days, xtickformat) {
 		grid: {
 			y: {
 				show: true
+			},
+			x: {
+				show: true
 			}
 		},
 		regions: [
@@ -156,16 +162,15 @@ function dayschart(element, title, days, xtickformat) {
 		]
 	});
 
-	// reload data
+	// workaround for unrendered dots
+	setTimeout(function () { chart.flush(); }, 5000);
+
+	// reload data in charts
 	setInterval(
 		function() {
-			chart.load({
-				url: api_base_url_sensors + beginend(days),
-				mimeType: 'json'
-			});
-			chart.flush();
+			loaddays(chart, element, days);
 		},
-		5 * 60 * 1000
+		refresh_interval
 	);
 };
 
@@ -174,14 +179,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
 		});
-	}
+	};
+	chart.flush();
 }
 
 function beginend(days) {
@@ -209,3 +217,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
+);