generalize convert_to_c3: sensors and weather have different fields

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 87e897a33c828485881944e241aa171b5c52eb3f..71c9862a317a138ea2c39fb7f7ddb4d83b2097d9 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -1,16 +1,19 @@
-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) {
+function dayschart(element, title, days, xtickformat) {

        var chart = c3.generate({
        var chart = c3.generate({

-               bindto: element,
+               bindto: '#' + element,
+               size: {
+                       width: document.getElementById(element).parentElement.clientWidth * 80 / 100
+               },

                transition: {
                        duration: null
                },
                title: {
                transition: {
                        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',


@@ -30,7 +33,7 @@ function dayschart(element, interval, days) {
                        x: {
                                type: 'timeseries',
                                tick: {
                        x: {
                                type: 'timeseries',
                                tick: {

-                                       format: '%Y-%m-%d %H:%M',
+                                       format: xtickformat,

                                        fit: false,
                                        multiline: true, // broken? so →
                                        rotate: -90
                                        fit: false,
                                        multiline: true, // broken? so →
                                        rotate: -90


@@ -72,6 +75,10 @@ function dayschart(element, interval, days) {
                                },
                                value: function (value, ratio, id, index) {
                                        return value.toFixed(2) + '°';
                                },
                                value: function (value, ratio, id, index) {
                                        return value.toFixed(2) + '°';

+                               },
+                               title: function (x) {
+                                       // TODO: format datetime into something readable
+                                       return x;

                                }
                        }
                },
                                }
                        }
                },


@@ -91,7 +98,7 @@ function dayschart(element, interval, days) {
 
 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'
        });
 }


@@ -103,7 +110,7 @@ function beginend(days) {
        return '&begin=' + begin + '&end=' + end;
 }
 
        return '&begin=' + begin + '&end=' + end;
 }
 

-dayschart('#chart1',   'Tag',     1);
-dayschart('#chart7',   'Woche',   7);
-dayschart('#chart31',  'Monat',  31);
-dayschart('#chart365', 'Jahr',  365);
+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');