switch from 5 minutes to 10 minutes

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 88854ca5babe7b5a9bd52d09022bcd6d025c4bc9..bc0f8c3b434b66b68fb0c2739e14ebbaee8d0ec9 100644 (file)
--- a/web/static/seepark_web.js
+++ b/web/static/seepark_web.js
@@ -2,7 +2,7 @@ var api_base_url_sensors = '/api/1/sensor/type/Wassertemperatur?mode=consolidate
 var api_base_url_weather = '/api/1/openweathermap/city/3319578?mode=consolidated&format=c3';
 var api_url_currentair   = '/api/1/currentairtemperature';
 var api_url_currentwater = '/api/1/currentwatertemperature';
 var api_base_url_weather = '/api/1/openweathermap/city/3319578?mode=consolidated&format=c3';
 var api_url_currentair   = '/api/1/currentairtemperature';
 var api_url_currentwater = '/api/1/currentwatertemperature';

-var refresh_interval     = 5 * 60 * 1000;
+var refresh_interval     = 10 * 60 * 1000;

 
 function dayschart(element, title, days, xtickformat) {
        var chartdata;
 
 function dayschart(element, title, days, xtickformat) {
        var chartdata;


@@ -30,6 +30,7 @@ function dayschart(element, title, days, xtickformat) {
                                        '0416a1bab9ff': 'mediumblue',
                                        '0316a2193bff': 'midnightblue'
                                },
                                        '0416a1bab9ff': 'mediumblue',
                                        '0316a2193bff': 'midnightblue'
                                },

+                               type: 'line', // default

                                /*
                                xSort: false,
                                order: function (a, b) {
                                /*
                                xSort: false,
                                order: function (a, b) {


@@ -55,7 +56,8 @@ function dayschart(element, title, days, xtickformat) {
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                colors: {
                                        '3319578': 'red'
                                xFormat: '%Y-%m-%d %H:%M:%S',
                                colors: {
                                        '3319578': 'red'

-                               }
+                               },
+                               type: 'spline',

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


@@ -67,7 +69,6 @@ function dayschart(element, title, days, xtickformat) {
                        chart.resize({
                                width: getwidth(element)
                        });
                        chart.resize({
                                width: getwidth(element)
                        });

-                       // chart.flush();

                },
                transition: {
                        duration: null
                },
                transition: {
                        duration: null


@@ -149,6 +150,9 @@ function dayschart(element, title, days, xtickformat) {
                grid: {
                        y: {
                                show: true
                grid: {
                        y: {
                                show: true

+                       },
+                       x: {
+                               show: true

                        }
                },
                regions: [
                        }
                },
                regions: [


@@ -159,6 +163,9 @@ function dayschart(element, title, days, xtickformat) {
                ]
        });
 
                ]
        });
 

+       // workaround for unrendered dots
+       setTimeout(function () { chart.flush(); }, 5000);
+

        // reload data in charts
        setInterval(
                function() {
        // reload data in charts
        setInterval(
                function() {


@@ -173,14 +180,17 @@ function loaddays(chart, element, days) {
        if (element.substr(0, 7) == 'chart_w') {
                chart.load({
                        url: api_base_url_sensors + beginend(days),
        if (element.substr(0, 7) == 'chart_w') {
                chart.load({
                        url: api_base_url_sensors + beginend(days),

-                       mimeType: 'json'
+                       mimeType: 'json',
+                       unload: true

                });
        } else {
                chart.load({
                        url: api_base_url_weather + beginend(days),
                });
        } else {
                chart.load({
                        url: api_base_url_weather + beginend(days),

-                       mimeType: 'json'
+                       mimeType: 'json',
+                       unload: true

                });
                });

-       }
+       };
+       setTimeout(function () { chart.flush(); }, 5000);

 }
 
 function beginend(days) {
 }
 
 function beginend(days) {


@@ -209,7 +219,7 @@ dayschart('chart_air_7',     'Die Luft (Woche)',   7, '%a %d');
 dayschart('chart_air_31',    'Die Luft (Monat)',  31, '%Y-%m-%d');
 dayschart('chart_air_365',   'Die Luft (Jahr)',  365, '%b %Y');
 
 dayschart('chart_air_31',    'Die Luft (Monat)',  31, '%Y-%m-%d');
 dayschart('chart_air_365',   'Die Luft (Jahr)',  365, '%b %Y');
 

-// reload current values
+// reload current values + owm script

 setInterval(
        function() {
                var airvalue   = document.getElementById('currentairvalue');
 setInterval(
        function() {
                var airvalue   = document.getElementById('currentairvalue');


@@ -234,6 +244,14 @@ setInterval(
                        .catch(function(error) {
                                console.log(error);
                        });
                        .catch(function(error) {
                                console.log(error);
                        });

+
+               var owmwidget = document.getElementById('openweathermap-widget-15');
+               owmwidget.removeChild(owmwidget.childNodes[0]);
+               var owmscript = document.head.lastElementChild;
+               document.head.removeChild(owmscript);
+               var newowmscript = document.createElement('script');
+               newowmscript.src = '//openweathermap.org/themes/openweathermap/assets/vendor/owm/js/weather-widget-generator.js';
+               document.head.appendChild(newowmscript);

        },
        refresh_interval
 );
        },
        refresh_interval
 );