X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/babe905207138d35d94b476a1f0b81d9514da7d8..5ded0a74693c3e1f738adc9338a09fd53a1bcab0:/web/static/seepark_web.js

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index e0d569c..51bfc70 100644
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -13,15 +13,15 @@ function dayschart(element, title, days, xtickformat) {
 					'0416a1bab9ff': '0416a1bab9ff_x'
 				},
 				names: {
-					'0416a1ac66ff': 'Wassertemperatur in 50 cm Tiefe',
-					'0516a207a4ff': 'Wassertemperatur in 1 m Tiefe',
-					'0416a1bab9ff': 'Wassertemperatur in 2 m Tiefe'
+					'0416a1ac66ff': 'Wassertemperatur in 30 cm Tiefe',
+					'0516a207a4ff': 'Wassertemperatur in 50 cm Tiefe',
+					'0416a1bab9ff': 'Wassertemperatur in 1 m Tiefe'
 				},
 				xFormat: '%Y-%m-%d %H:%M:%S',
 				colors: {
-					'0416a1ac66ff': 'lightblue',
-					'0516a207a4ff': 'middleblue',
-					'0416a1bab9ff': 'darkblue'
+					'0416a1ac66ff': 'lightskyblue',
+					'0516a207a4ff': 'royalblue',
+					'0416a1bab9ff': 'midnightblue'
 				}
 		};
 	} else {
@@ -88,7 +88,7 @@ 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
 				}
 			}
 		},
@@ -98,7 +98,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/;
@@ -129,11 +129,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) {