seepark_web.js: use our new sensors API instead of the random data

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 0bda80064e8391adc56a63a268d61ae0c9e991cb..025aefae6ad79d8dd1feaae944135444f48fc11f 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -1,3 +1,5 @@
+var api_base_url = '/api/1/sensor/type/Wassertemperatur?mode=consolidated&format=c3';
+

 var chart = c3.generate({
        bindto: '#chart',
        transition: {
 var chart = c3.generate({
        bindto: '#chart',
        transition: {


@@ -7,7 +9,8 @@ var chart = c3.generate({
                text: 'Der See'
        },
        data: {
                text: 'Der See'
        },
        data: {

-               url: '/data/', // redirects to /data/1
+//             url: '/data/', // redirects to /data/1
+               url: api_base_url + beginend(1),

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


@@ -17,7 +20,11 @@ var chart = c3.generate({
                        '0316a2193bff': 'Wassertemperatur in 4 m Tiefe',
                        '0316a21383ff': 'Wassertemperatur in 5 m Tiefe'
                },
                        '0316a2193bff': 'Wassertemperatur in 4 m Tiefe',
                        '0316a21383ff': 'Wassertemperatur in 5 m Tiefe'
                },

-               xFormat: '%Y-%m-%d %H:%M:%S'
+               xFormat: '%Y-%m-%d %H:%M:%S',
+               colors: {
+                       '0316a2193bff': 'lightblue',
+                       '0316a21383ff': 'darkblue'
+               }

        },
        axis: {
                x: {
        },
        axis: {
                x: {


@@ -64,7 +71,7 @@ var chart = c3.generate({
                                return res;
                        },
                        value: function (value, ratio, id, index) {
                                return res;
                        },
                        value: function (value, ratio, id, index) {

-                               return value + '°';
+                               return value.toFixed(2) + '°';

                        }
                }
        },
                        }
                }
        },


@@ -83,7 +90,15 @@ var chart = c3.generate({
 
 function loaddays(days) {
        chart.load({
 
 function loaddays(days) {
        chart.load({

-               url: '/data/' + days,
+//             url: '/data/' + days,
+               url: api_base_url + beginend(days),

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

+
+function beginend(days) {
+       var now = Date.now();
+       var end = new Date(now).toISOString().substr(0, 19); // 2018-06-13T16:52:30.995Z
+       var begin = new Date(now - days * 60*60*24 * 1000).toISOString().substr(0, 19);
+       return '&begin=' + begin + '&end=' + end;
+}