From 80996a20e1f1986d827c9af79aa4932fbfc29b2e Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Thu, 2 Aug 2018 11:32:07 +0200 Subject: [PATCH] html+js: rename stuff to prepare for weather --- web/static/seepark_web.js | 18 +++++++++--------- web/templates/seepark_web.html | 9 +++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index 63bca13..71c9862 100644 --- a/web/static/seepark_web.js +++ b/web/static/seepark_web.js @@ -1,6 +1,6 @@ -var api_base_url = '/api/1/sensor/type/Wassertemperatur?mode=consolidated&format=c3'; +var api_base_url_sensors = '/api/1/sensor/type/Wassertemperatur?mode=consolidated&format=c3'; -function dayschart(element, interval, days, xtickformat) { +function dayschart(element, title, days, xtickformat) { var chart = c3.generate({ bindto: '#' + element, size: { @@ -10,10 +10,10 @@ function dayschart(element, interval, days, xtickformat) { duration: null }, title: { - text: 'Der See (' + interval + ')' + text: title }, data: { - url: api_base_url + beginend(days), + url: api_base_url_sensors + beginend(days), mimeType: 'json', xs: { '0316a2193bff': '0316a2193bff_x', @@ -98,7 +98,7 @@ function dayschart(element, interval, days, xtickformat) { function loaddays(days) { chart.load({ - url: api_base_url + beginend(days), + url: api_base_url_sensors + beginend(days), mimeType: 'json' }); } @@ -110,7 +110,7 @@ function beginend(days) { return '&begin=' + begin + '&end=' + end; } -dayschart('chart1', 'Tag', 1, '%H:%M'); -dayschart('chart7', 'Woche', 7, '%a %d'); -dayschart('chart31', 'Monat', 31, 'Woche %V'); -dayschart('chart365', 'Jahr', 365, '%b %d'); +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'); diff --git a/web/templates/seepark_web.html b/web/templates/seepark_web.html index 3fed3e9..562c526 100644 --- a/web/templates/seepark_web.html +++ b/web/templates/seepark_web.html @@ -40,10 +40,11 @@

Der See

-
-
-
-
+
+
+
+
+
-- 2.47.3