X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/738c56973d30c744d1be86fc318536b9393c5797..72faf7d55093a0ec1af6a840150e422686b6f40b:/web/static/seepark_web.js?ds=sidebyside

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 31c045c..6d8e1f1 100644
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -58,7 +58,13 @@ function dayschart(element, title, days, xtickformat) {
 	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)
+			});
+			// chart.flush();
 		},
 		transition: {
 			duration: null
@@ -74,7 +80,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
@@ -94,18 +103,16 @@ function dayschart(element, title, days, xtickformat) {
 		},
 		zoom: {
 			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
 				}
 			}
+			*/
 		},
 		tooltip: {
 			format: {
@@ -148,6 +155,20 @@ function dayschart(element, title, days, xtickformat) {
 			{axis: 'y', start:  100, end: 999, class: 'region-boiling'}
 		]
 	});
+
+	// workaround for unrendered dots
+	setTimeout(function () { chart.flush(); }, 5000);
+
+	// reload data
+	setInterval(
+		function() {
+			chart.load({
+				url: api_base_url_sensors + beginend(days),
+				mimeType: 'json'
+			})
+		},
+		5 * 60 * 1000
+	);
 };
 
 function loaddays(chart, element, days) {
@@ -177,12 +198,16 @@ function beginend(days) {
 	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, '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_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');