reStructuredText format for docstrings of sensorid and sensortype.

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

diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js
index 5cdeca5b9b65ea1065e8148ccd8e4788cd076187..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 refresh_interval     = 5 * 60 * 1000;
+var refresh_interval     = 10 * 60 * 1000;
 
 function dayschart(element, title, days, xtickformat) {
        var chartdata;
@@ -30,6 +30,7 @@ function dayschart(element, title, days, xtickformat) {
                                        '0416a1bab9ff': 'mediumblue',
                                        '0316a2193bff': 'midnightblue'
                                },
+                               type: 'line', // default
                                /*
                                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'
-                               }
+                               },
+                               type: 'spline',
                };
        };
        var chart = c3.generate({
@@ -67,7 +69,6 @@ function dayschart(element, title, days, xtickformat) {
                        chart.resize({
                                width: getwidth(element)
                        });
-                       // chart.flush();
                },
                transition: {
                        duration: null
@@ -189,7 +190,7 @@ function loaddays(chart, element, days) {
                        unload: true
                });
        };
-       chart.flush();
+       setTimeout(function () { chart.flush(); }, 5000);
 }
 
 function beginend(days) {
@@ -218,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');
 
-// reload current values
+// reload current values + owm script
 setInterval(
        function() {
                var airvalue   = document.getElementById('currentairvalue');
@@ -243,6 +244,14 @@ setInterval(
                        .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
 );