remove import of our seeparklib

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 51bfc70fa4f9b47bbd8d4726e66cfd07e8ee63a2..2944e90e760c976c725243bb10d9f2fefec6d859 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -13,16 +13,27 @@ function dayschart(element, title, days, xtickformat) {
                                        '0416a1bab9ff': '0416a1bab9ff_x'
                                },
                                names: {
-                                       '0416a1ac66ff': 'Wassertemperatur in 30 cm Tiefe',
-                                       '0516a207a4ff': 'Wassertemperatur in 50 cm Tiefe',
-                                       '0416a1bab9ff': 'Wassertemperatur in 1 m Tiefe'
+                                       '0416a1ac66ff': 'Wassertemperatur 30cm Tiefe',
+                                       '0516a207a4ff': 'Wassertemperatur 50cm Tiefe',
+                                       '0416a1bab9ff': 'Wassertemperatur 1m Tiefe'
                                },
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                colors: {
                                        '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 = {
@@ -98,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+ c?m/;
+                                               var re = /\d+ ?c?m/;
                                                prefix = 'Wasser ';
                                        } else {
                                                var re = /Luft/;