X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/0851c4f3b1edeae5f12107cd38a2fb241c724244..e19d429d019f88828333d9a306b2b323aacef29e:/web/static/seepark_web.js

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 816b6a5..e4bd8d6 100644
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -8,18 +8,36 @@ function dayschart(element, title, days, xtickformat) {
 				url: api_base_url_sensors + beginend(days),
 				mimeType: 'json',
 				xs: {
-					'0316a2193bff': '0316a2193bff_x',
-					'0316a21383ff': '0316a21383ff_x'
+					'0416a1ac66ff': '0416a1ac66ff_x',
+					'0516a207a4ff': '0516a207a4ff_x',
+					'0416a1bab9ff': '0416a1bab9ff_x',
+					'0316a2193bff': '0316a2193bff_x'
 				},
 				names: {
-					'0316a2193bff': 'Wassertemperatur in 4 m Tiefe',
-					'0316a21383ff': 'Wassertemperatur in 5 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',
+				// https://en.wikipedia.org/wiki/Web_colors
 				colors: {
-					'0316a2193bff': 'lightblue',
-					'0316a21383ff': 'darkblue'
+					'0416a1ac66ff': 'lightskyblue',
+					'0516a207a4ff': 'royalblue',
+					'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 = {
@@ -42,6 +60,12 @@ function dayschart(element, title, days, xtickformat) {
 		size: {
 			width: document.getElementById(element).parentElement.clientWidth * 80 / 100
 		},
+		onresized: function () {
+			chart.resize({
+				width: document.getElementById(element).parentElement.clientWidth * 80 / 100
+			});
+			// chart.flush();
+		},
 		transition: {
 			duration: null
 		},
@@ -49,6 +73,9 @@ function dayschart(element, title, days, xtickformat) {
 			text: title
 		},
 		data: chartdata,
+		point: {
+			r: 1.5 // default 2.5
+		},
 		axis: {
 			x: {
 				type: 'timeseries',
@@ -73,6 +100,7 @@ function dayschart(element, title, days, xtickformat) {
 		},
 		zoom: {
 			enabled: true,
+			/*
 			onzoomend: function (domain) {
 				// UNIX epoch
 				var start = domain[0].getTime()/1000;
@@ -82,9 +110,10 @@ function dayschart(element, title, days, xtickformat) {
 				// FIXME
 				var days = Math.round(duration / 86400 / 2);
 				if (days > 0) {
-					loaddays(days);
+					loaddays(this, element, days); // this = chart
 				}
 			}
+			*/
 		},
 		tooltip: {
 			format: {
@@ -92,7 +121,7 @@ function dayschart(element, title, days, xtickformat) {
 				name: function (name, ratio, id, index) {
 					var prefix = '';
 					if (element.substr(0, 7) == 'chart_w') {
-						var re = /\d m/;
+						var re = /\d+ ?c?m/;
 						prefix = 'Wasser ';
 					} else {
 						var re = /Luft/;
@@ -103,9 +132,15 @@ function dayschart(element, title, days, xtickformat) {
 				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);
 				}
 			}
 		},
@@ -123,11 +158,19 @@ function dayschart(element, title, days, xtickformat) {
 	});
 };
 
-function loaddays(days) {
-	chart.load({
-		url: api_base_url_sensors + beginend(days),
-		mimeType: 'json'
-	});
+function loaddays(chart, element, days) {
+	// TODO: maybe move to top or factor out somehow
+	if (element.substr(0, 7) == 'chart_w') {
+		chart.load({
+			url: api_base_url_sensors + beginend(days),
+			mimeType: 'json'
+		});
+	} else {
+		chart.load({
+			url: api_base_url_weather + beginend(days),
+			mimeType: 'json'
+		});
+	}
 }
 
 function beginend(days) {
@@ -144,10 +187,10 @@ function beginend(days) {
 
 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_365', 'Der See (Jahr)',  365, '%b %d');
+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_365',   'Die Luft (Jahr)',  365, '%b %d');
+dayschart('chart_air_31',    'Die Luft (Monat)',  31, '%Y-%m-%d');
+dayschart('chart_air_365',   'Die Luft (Jahr)',  365, '%b %Y');