seepark_web.py: move 'mainsensor' in ini to section webapp

[chrisu/seepark.git] / web / static / seepark_web.js

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 33fb82dc245416c8d9ebda4498a1ef952b007bfa..a9d47563e26fc5549cace84cf75d8350f2af9c80 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -8,18 +8,32 @@ 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'
                                },
                                names: {
-                                       '0316a2193bff': 'Wassertemperatur in 4 m Tiefe',
-                                       '0316a21383ff': 'Wassertemperatur in 5 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: {
-                                       '0316a2193bff': 'lightblue',
-                                       '0316a21383ff': 'darkblue'
+                                       '0416a1ac66ff': 'lightskyblue',
+                                       '0516a207a4ff': 'royalblue',
+                                       '0416a1bab9ff': '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 = {
@@ -49,6 +63,9 @@ function dayschart(element, title, days, xtickformat) {
                        text: title
                },
                data: chartdata,
+               point: {
+                       r: 1.5 // default 2.5
+               },
                axis: {
                        x: {
                                type: 'timeseries',
@@ -82,7 +99,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
                                }
                        }
                },
@@ -92,7 +109,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/;
@@ -123,11 +140,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) {