html+js: rename stuff to prepare for weather

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 63bca132533275b3cd42f35048aa4503c22f4ab1..71c9862a317a138ea2c39fb7f7ddb4d83b2097d9 100644 (file)
--- 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: {
        var chart = c3.generate({
                bindto: '#' + element,
                size: {


@@ -10,10 +10,10 @@ function dayschart(element, interval, days, xtickformat) {
                        duration: null
                },
                title: {
                        duration: null
                },
                title: {

-                       text: 'Der See (' + interval + ')'
+                       text: title

                },
                data: {
                },
                data: {

-                       url: api_base_url + beginend(days),
+                       url: api_base_url_sensors + beginend(days),

                        mimeType: 'json',
                        xs: {
                                '0316a2193bff': '0316a2193bff_x',
                        mimeType: 'json',
                        xs: {
                                '0316a2193bff': '0316a2193bff_x',


@@ -98,7 +98,7 @@ function dayschart(element, interval, days, xtickformat) {
 
 function loaddays(days) {
        chart.load({
 
 function loaddays(days) {
        chart.load({

-               url: api_base_url + beginend(days),
+               url: api_base_url_sensors + beginend(days),

                mimeType: 'json'
        });
 }
                mimeType: 'json'
        });
 }


@@ -110,7 +110,7 @@ function beginend(days) {
        return '&begin=' + begin + '&end=' + end;
 }
 
        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 3fed3e96b29c35ba9a977f741fbaef9534ac978e..562c526e93962b5f7309be7196ec39bdfb4caa70 100644 (file)
--- a/web/templates/seepark_web.html
+++ b/web/templates/seepark_web.html
@@ -40,10 +40,11 @@
                </div>
 
                <h2>Der See</h2>
                </div>
 
                <h2>Der See</h2>

-               <div id="chart1"></div>
-               <div id="chart7"></div>
-               <div id="chart31"></div>
-               <div id="chart365"></div>
+               <div id="chart_water_1"></div>
+               <div id="chart_water_7"></div>
+               <div id="chart_water_31"></div>
+               <div id="chart_water_365"></div>
+

 
                <!-- openweathermap widget -->
                <div id="openweathermap-widget-15"></div>
 
                <!-- openweathermap widget -->
                <div id="openweathermap-widget-15"></div>