X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/0851c4f3b1edeae5f12107cd38a2fb241c724244..031007b29dd155ff0ff46d2f0d277d442e78b9fa:/web/static/seepark_web.js diff --git a/web/static/seepark_web.js b/web/static/seepark_web.js index 816b6a5..85b62db 100644 --- a/web/static/seepark_web.js +++ b/web/static/seepark_web.js @@ -8,17 +8,20 @@ function dayschart(element, title, days, xtickformat) { url: api_base_url_sensors + beginend(days), mimeType: 'json', xs: { - '0316a2193bff': '0316a2193bff_x', - '0316a21383ff': '0316a21383ff_x' + '0416a1ac66ff': '0416a1ac66ff_x', + '0516a207a4ff': '0516a207a4ff_x', + '0416a1bab9ff': '0416a1bab9ff_x' }, names: { - '0316a2193bff': 'Wassertemperatur in 4 m Tiefe', - '0316a21383ff': 'Wassertemperatur in 5 m Tiefe' + '0416a1ac66ff': 'Wassertemperatur in 50 cm Tiefe', + '0516a207a4ff': 'Wassertemperatur in 1 m Tiefe', + '0416a1bab9ff': 'Wassertemperatur in 2 m Tiefe' }, xFormat: '%Y-%m-%d %H:%M:%S', colors: { - '0316a2193bff': 'lightblue', - '0316a21383ff': 'darkblue' + '0416a1ac66ff': 'lightblue', + '0516a207a4ff': 'middleblue', + '0416a1bab9ff': 'darkblue' } }; } else { @@ -49,6 +52,9 @@ function dayschart(element, title, days, xtickformat) { text: title }, data: chartdata, + point: { + r: 1.5 // default 2.5 + }, axis: { x: { type: 'timeseries', @@ -92,7 +98,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 m/; + var re = /\d+ c?m/; prefix = 'Wasser '; } else { var re = /Luft/; @@ -145,9 +151,9 @@ function beginend(days) { 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'); +dayschart('chart_water_365', 'Der See (Jahr)', 365, '%b %Y'); dayschart('chart_air_1', 'Die Luft (Tag)', 1, '%H:%M'); dayschart('chart_air_7', 'Die Luft (Woche)', 7, '%a %d'); dayschart('chart_air_31', 'Die Luft (Monat)', 31, 'Woche %V'); -dayschart('chart_air_365', 'Die Luft (Jahr)', 365, '%b %d'); +dayschart('chart_air_365', 'Die Luft (Jahr)', 365, '%b %Y');