resolution in consolidated mode: use <= for time intervals

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 33fb82dc245416c8d9ebda4498a1ef952b007bfa..66cc2a951173a208b1488b8908da499c4978ea3b 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -8,17 +8,20 @@ function dayschart(element, title, days, xtickformat) {
                                url: api_base_url_sensors + beginend(days),
                                mimeType: 'json',
                                xs: {
                                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: {
                                },
                                names: {

-                                       '0316a2193bff': 'Wassertemperatur in 4 m Tiefe',
-                                       '0316a21383ff': 'Wassertemperatur in 5 m Tiefe'
+                                       '0416a1ac66ff': 'Wassertemperatur in 50 cm Tiefe',
+                                       '0516a207a4ff': 'Wassertemperatur in 1 m Tiefe',
+                                       '0416a1bab9ff': 'Wassertemperatur in 2 m Tiefe'

                                },
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                colors: {
                                },
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                colors: {

-                                       '0316a2193bff': 'lightblue',
-                                       '0316a21383ff': 'darkblue'
+                                       '0416a1ac66ff': 'lightskyblue',
+                                       '0516a207a4ff': 'royalblue',
+                                       '0416a1bab9ff': 'midnightblue'

                                }
                };
        } else {
                                }
                };
        } else {


@@ -49,6 +52,9 @@ function dayschart(element, title, days, xtickformat) {
                        text: title
                },
                data: chartdata,
                        text: title
                },
                data: chartdata,

+               point: {
+                       r: 1.5 // default 2.5
+               },

                axis: {
                        x: {
                                type: 'timeseries',
                axis: {
                        x: {
                                type: 'timeseries',


@@ -92,7 +98,7 @@ function dayschart(element, title, days, xtickformat) {
                                name: function (name, ratio, id, index) {
                                        var prefix = '';
                                        if (element.substr(0, 7) == 'chart_w') {
                                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/;
                                                prefix = 'Wasser ';
                                        } else {
                                                var re = /Luft/;