From 8d1f0629a0bdb5ed171fbe3bf26b629447411ac0 Mon Sep 17 00:00:00 2001 From: Mark Crossley <1196094+mcrossley@users.noreply.github.com> Date: Sun, 29 Nov 2020 17:00:53 +0000 Subject: [PATCH 1/2] b3097 changes --- interface/airlink.html | 11 +- interface/alarmsettings.html | 62 +- interface/alltimerecseditor.html | 8 +- interface/calibrationsettings.html | 8 +- interface/charts.html | 11 +- interface/chartshistoric.html | 162 +++++ interface/currentcondeditor.html | 8 +- interface/datalogs.html | 8 +- interface/dayfileviewer.html | 8 +- interface/diaryeditor.html | 8 +- interface/extra.html | 13 +- interface/extradatalogs.html | 8 +- interface/extrasensorsettings.html | 8 +- interface/extrawebfiles.html | 8 +- interface/ftpnow.html | 8 +- interface/gauges.html | 8 +- interface/index.html | 10 +- interface/internetsettings.html | 8 +- interface/js/airlink.js | 24 + interface/js/alarmsettings.js | 16 +- interface/js/charts.js | 167 ++++- interface/js/chartshistoric.js | 876 +++++++++++++++++++++++++ interface/js/dashboard.js | 341 +++++++--- interface/js/extrasensors.js | 36 + interface/js/records.js | 31 +- interface/js/todayyest.js | 36 +- interface/json/ExtraSensorOptions.json | 42 +- interface/json/ExtraSensorSchema.json | 19 +- interface/json/InternetOptions.json | 111 ++-- interface/json/InternetSchema.json | 144 ++-- interface/json/StationOptions.json | 4 + interface/json/StationSchema.json | 3 + interface/monthlyrecseditor.html | 10 +- interface/mysqlsettings.html | 8 +- interface/noaamonthreport.html | 8 +- interface/noaasettings.html | 8 +- interface/noaayearreport.html | 8 +- interface/now.html | 63 +- interface/raintodayeditor.html | 8 +- interface/records.html | 13 +- interface/stationsettings.html | 8 +- interface/thismonthrecseditor.html | 8 +- interface/thisyearrecseditor.html | 8 +- interface/todayyest.html | 37 +- web/gaugesT.htm | 13 +- web/historicT.htm | 109 +++ web/indexT.htm | 12 +- web/monthlyrecordT.htm | 11 +- web/recordT.htm | 11 +- web/thismonthT.htm | 11 +- web/thisyearT.htm | 11 +- web/todayT.htm | 13 +- web/trendsT.htm | 66 +- web/yesterdayT.htm | 10 +- webfiles/js/cumuluscharts.js | 171 ++++- webfiles/js/historiccharts.js | 766 +++++++++++++++++++++ 56 files changed, 3129 insertions(+), 477 deletions(-) create mode 100644 interface/chartshistoric.html create mode 100644 interface/js/chartshistoric.js create mode 100644 web/historicT.htm create mode 100644 webfiles/js/historiccharts.js diff --git a/interface/airlink.html b/interface/airlink.html index c05efa5..a862eb8 100644 --- a/interface/airlink.html +++ b/interface/airlink.html @@ -27,6 +27,9 @@ th, td { width: 16%; } + .left {text-align:left;} + .center {text-align:center;} + .right {text-align:right;} @@ -46,7 +49,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/alarmsettings.html b/interface/alarmsettings.html index bcd96a9..485f987 100644 --- a/interface/alarmsettings.html +++ b/interface/alarmsettings.html @@ -27,6 +27,8 @@ @@ -45,7 +47,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • @@ -108,112 +116,134 @@

    Alarm Settings

    + + + + + + + + + + + - + - + + - - + + + - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -224,6 +254,7 @@

    Alarm Settings

    + @@ -234,6 +265,7 @@

    Alarm Settings

    + @@ -244,6 +276,7 @@

    Alarm Settings

    + @@ -254,6 +287,7 @@

    Alarm Settings

    + diff --git a/interface/alltimerecseditor.html b/interface/alltimerecseditor.html index 15b9912..fe69eb9 100644 --- a/interface/alltimerecseditor.html +++ b/interface/alltimerecseditor.html @@ -61,7 +61,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/calibrationsettings.html b/interface/calibrationsettings.html index a8c496e..c46c9df 100644 --- a/interface/calibrationsettings.html +++ b/interface/calibrationsettings.html @@ -60,7 +60,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/charts.html b/interface/charts.html index 04339c0..f54e960 100644 --- a/interface/charts.html +++ b/interface/charts.html @@ -54,7 +54,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • @@ -147,6 +153,9 @@ +
    diff --git a/interface/chartshistoric.html b/interface/chartshistoric.html new file mode 100644 index 0000000..7300789 --- /dev/null +++ b/interface/chartshistoric.html @@ -0,0 +1,162 @@ + + + + + Cumulus MX + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + +
    +
    + +
    +
    +
    + + +
    +
    +
    + +
    +
    + + + + + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +

    Cumulus MX  b

    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/interface/currentcondeditor.html b/interface/currentcondeditor.html index 3640bee..7ccd755 100644 --- a/interface/currentcondeditor.html +++ b/interface/currentcondeditor.html @@ -100,7 +100,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/datalogs.html b/interface/datalogs.html index f5c5f8e..e8eacea 100644 --- a/interface/datalogs.html +++ b/interface/datalogs.html @@ -55,7 +55,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/dayfileviewer.html b/interface/dayfileviewer.html index a52e250..7f559f0 100644 --- a/interface/dayfileviewer.html +++ b/interface/dayfileviewer.html @@ -54,7 +54,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/diaryeditor.html b/interface/diaryeditor.html index 3985310..19016c9 100644 --- a/interface/diaryeditor.html +++ b/interface/diaryeditor.html @@ -53,7 +53,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/extra.html b/interface/extra.html index 100d176..ac5aaf0 100644 --- a/interface/extra.html +++ b/interface/extra.html @@ -22,6 +22,11 @@ + @@ -39,7 +44,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/extradatalogs.html b/interface/extradatalogs.html index 0ccf254..1602c4a 100644 --- a/interface/extradatalogs.html +++ b/interface/extradatalogs.html @@ -57,7 +57,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/extrasensorsettings.html b/interface/extrasensorsettings.html index 3e4873a..b88ad90 100644 --- a/interface/extrasensorsettings.html +++ b/interface/extrasensorsettings.html @@ -66,7 +66,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/extrawebfiles.html b/interface/extrawebfiles.html index 37ff56c..b9d8424 100644 --- a/interface/extrawebfiles.html +++ b/interface/extrawebfiles.html @@ -84,7 +84,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/ftpnow.html b/interface/ftpnow.html index 0be53a5..d8cfceb 100644 --- a/interface/ftpnow.html +++ b/interface/ftpnow.html @@ -52,7 +52,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/gauges.html b/interface/gauges.html index d00a634..4bbbc3d 100644 --- a/interface/gauges.html +++ b/interface/gauges.html @@ -53,7 +53,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/index.html b/interface/index.html index 5379214..201e505 100644 --- a/interface/index.html +++ b/interface/index.html @@ -52,7 +52,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • @@ -195,7 +201,7 @@

    --:--:--

    Last station update

    -

    --:--:--

    +

    --:--:--

    diff --git a/interface/internetsettings.html b/interface/internetsettings.html index f8c7e64..2e863c0 100644 --- a/interface/internetsettings.html +++ b/interface/internetsettings.html @@ -60,7 +60,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/js/airlink.js b/interface/js/airlink.js index 4d7a846..744a18f 100644 --- a/interface/js/airlink.js +++ b/interface/js/airlink.js @@ -9,6 +9,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkCountsOut.json' }); @@ -17,6 +21,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkAqiOut.json' }); @@ -25,6 +33,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkPctOut.json' }); @@ -33,6 +45,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkCountsIn.json' }); @@ -41,6 +57,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkAqiIn.json' }); @@ -49,6 +69,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0]}, + {"className": "right", "targets": [1,2,3,4,5]} + ], "ajax": '../api/extra/airLinkPctIn.json' }); diff --git a/interface/js/alarmsettings.js b/interface/js/alarmsettings.js index 3864f6f..1d5affc 100644 --- a/interface/js/alarmsettings.js +++ b/interface/js/alarmsettings.js @@ -5,7 +5,7 @@ $(document).ready(function() { dataType:"json", success: function (result) { $.each(result.data, function(key, value) { - if (key.indexOf('Enabled') === -1 && key.indexOf('Latches') === -1) { + if (key.indexOf('Enabled') === -1 && key.indexOf('Latches') === -1 && key.indexOf('Notify') === -1) { $('#' + key).val(value); } else { $('#' + key).prop('checked', value); @@ -30,6 +30,7 @@ function updateAlarms() { tempBelowVal : parseFloat($('#tempBelowVal').val()), tempBelowSoundEnabled: $('#tempBelowSoundEnabled').prop('checked'), tempBelowSound : $('#tempBelowSound').val(), + tempBelowNotify : $('#tempBelowNotify').prop('checked'), tempBelowLatches : $('#tempBelowLatches').prop('checked'), tempBelowLatchHrs : $('#tempBelowLatchHrs').val(), @@ -37,6 +38,7 @@ function updateAlarms() { tempAboveVal : parseFloat($('#tempAboveVal').val()), tempAboveSoundEnabled: $('#tempAboveSoundEnabled').prop('checked'), tempAboveSound : $('#tempAboveSound').val(), + tempAboveNotify : $('#tempAboveNotify').prop('checked'), tempAboveLatches : $('#tempAboveLatches').prop('checked'), tempAboveLatchHrs : $('#tempAboveLatchHrs').val(), @@ -44,6 +46,7 @@ function updateAlarms() { tempChangeVal : parseFloat($('#tempChangeVal').val()), tempChangeSoundEnabled: $('#tempChangeSoundEnabled').prop('checked'), tempChangeSound : $('#tempChangeSound').val(), + tempChangeNotify : $('#tempChangeNotify').prop('checked'), tempChangeLatches : $('#tempChangeLatches').prop('checked'), tempChangeLatchHrs : $('#tempChangeLatchHrs').val(), @@ -51,6 +54,7 @@ function updateAlarms() { pressBelowVal : parseFloat($('#pressBelowVal').val()), pressBelowSoundEnabled: $('#pressBelowSoundEnabled').prop('checked'), pressBelowSound : $('#pressBelowSound').val(), + pressBelowNotify : $('#pressBelowNotify').prop('checked'), pressBelowLatches : $('#pressBelowLatches').prop('checked'), pressBelowLatchHrs : $('#pressBelowLatchHrs').val(), @@ -58,6 +62,7 @@ function updateAlarms() { pressAboveVal : parseFloat($('#pressAboveVal').val()), pressAboveSoundEnabled: $('#pressAboveSoundEnabled').prop('checked'), pressAboveSound : $('#pressAboveSound').val(), + pressAboveNotify : $('#pressAboveNotify').prop('checked'), pressAboveLatches : $('#pressAboveLatches').prop('checked'), pressAboveLatchHrs : $('#pressAboveLatchHrs').val(), @@ -65,6 +70,7 @@ function updateAlarms() { pressChangeVal : parseFloat($('#pressChangeVal').val()), pressChangeSoundEnabled: $('#pressChangeSoundEnabled').prop('checked'), pressChangeSound : $('#pressChangeSound').val(), + pressChangeNotify : $('#pressChangeNotify').prop('checked'), pressChangeLatches : $('#pressChangeLatches').prop('checked'), pressChangeLatchHrs : $('#pressChangeLatchHrs').val(), @@ -72,6 +78,7 @@ function updateAlarms() { rainAboveVal : parseFloat($('#rainAboveVal').val()), rainAboveSoundEnabled: $('#rainAboveSoundEnabled').prop('checked'), rainAboveSound : $('#rainAboveSound').val(), + rainAboveNotify : $('#rainAboveNotify').prop('checked'), rainAboveLatches : $('#rainAboveLatches').prop('checked'), rainAboveLatchHrs : $('#rainAboveLatchHrs').val(), @@ -79,6 +86,7 @@ function updateAlarms() { rainRateAboveVal : parseFloat($('#rainRateAboveVal').val()), rainRateAboveSoundEnabled: $('#rainRateAboveSoundEnabled').prop('checked'), rainRateAboveSound : $('#rainRateAboveSound').val(), + rainRateAboveNotify : $('#rainRateAboveNotify').prop('checked'), rainRateAboveLatches : $('#rainRateAboveLatches').prop('checked'), rainRateAboveLatchHrs : $('#rainRateAboveLatchHrs').val(), @@ -86,6 +94,7 @@ function updateAlarms() { gustAboveVal : parseFloat($('#gustAboveVal').val()), gustAboveSoundEnabled: $('#gustAboveSoundEnabled').prop('checked'), gustAboveSound : $('#gustAboveSound').val(), + gustAboveNotify : $('#gustAboveNotify').prop('checked'), gustAboveLatches : $('#gustAboveLatches').prop('checked'), gustAboveLatchHrs : $('#gustAboveLatchHrs').val(), @@ -93,30 +102,35 @@ function updateAlarms() { windAboveVal : parseFloat($('#windAboveVal').val()), windAboveSoundEnabled: $('#windAboveSoundEnabled').prop('checked'), windAboveSound : $('#windAboveSound').val(), + windAboveNotify : $('#windAboveNotify').prop('checked'), windAboveLatches : $('#windAboveLatches').prop('checked'), windAboveLatchHrs : $('#windAboveLatchHrs').val(), contactLostEnabled : $('#contactLostEnabled').prop('checked'), contactLostSoundEnabled: $('#contactLostSoundEnabled').prop('checked'), contactLostSound : $('#contactLostSound').val(), + contactLostNotify : $('#contactLostNotify').prop('checked'), contactLostLatches : $('#contactLostLatches').prop('checked'), contactLostLatchHrs : $('#contactLostLatchHrs').val(), dataStoppedEnabled : $('#dataStoppedEnabled').prop('checked'), dataStoppedSoundEnabled: $('#dataStoppedSoundEnabled').prop('checked'), dataStoppedSound : $('#dataStoppedSound').val(), + dataStoppedNotify : $('#dataStoppedNotify').prop('checked'), dataStoppedLatches : $('#dataStoppedLatches').prop('checked'), dataStoppedLatchHrs : $('#dataStoppedLatchHrs').val(), batteryLowEnabled : $('#batteryLowEnabled').prop('checked'), batteryLowSoundEnabled: $('#batteryLowSoundEnabled').prop('checked'), batteryLowSound : $('#batteryLowSound').val(), + batteryLowNotify : $('#batteryLowNotify').prop('checked'), batteryLowLatches : $('#batteryLowLatches').prop('checked'), batteryLowLatchHrs : $('#batteryLowLatchHrs').val(), spikeEnabled : $('#spikeEnabled').prop('checked'), spikeSoundEnabled: $('#spikeSoundEnabled').prop('checked'), spikeSound : $('#spikeSound').val(), + spikeNotify : $('#spikeNotify').prop('checked'), spikeLatches : $('#spikeLatches').prop('checked'), spikeLatchHrs : $('#spikeLatchHrs').val(), }) diff --git a/interface/js/charts.js b/interface/js/charts.js index d6ed7a1..968d12b 100644 --- a/interface/js/charts.js +++ b/interface/js/charts.js @@ -37,6 +37,9 @@ $(document).ready(function () { case 'sunhours': doSunHours(); break; + case 'airquality': + doAirQuality(); + break; } }); @@ -51,7 +54,6 @@ $(document).ready(function () { }}); }); - var doTemp = function () { var freezing = config.temp.units === 'C' ? 0 : 32; var options = { @@ -94,12 +96,11 @@ var doTemp = function () { // right gridLineWidth: 0, opposite: true, - linkedTo: 0, labels: { align: 'left', x: 5, formatter: function () { - return '' + this.value + ''; + return '' + this.value + ''; } } }], @@ -134,7 +135,6 @@ var doTemp = function () { tooltip: { shared: true, split: false, - valueSuffix: '°' + config.temp.units, valueDecimals: config.temp.decimals, xDateFormat: "%A, %b %e, %H:%M" }, @@ -175,25 +175,34 @@ var doTemp = function () { }; var idxs = ['temp', 'dew', 'apptemp', 'feelslike', 'wchill', 'heatindex', 'humidex', 'intemp']; var cnt = 0; + var yaxis = 0; + + // Do we link the yAxes? Yes if no Humidex, or we have Humidex and we are using Celcius + if (resp.humidex == null || (resp.humidex != null && config.temp.units == 'C')) { + chart.yAxis[1].options.linkedTo = 0; + chart.yAxis[1].isLinked = true; + } + idxs.forEach(function(idx) { - if (idx in resp) { - chart.addSeries({ - name: titles[idx], - data: resp[idx] - }, false); + var valueSuffix = '°' + config.temp.units; + yaxis = 0; + if (idx in resp) { if (idx === 'humidex') { - chart.series[cnt].tooltipOptions.valueSuffix = ''; - // Link Humidex and temp scales if using Celsius - // For fahrenheit use separate scales - if (config.temp.units = 'C') { - chart.yAxis[1].options.title.text = ''; - } else { - chart.yAxis[1].options.linkedTo = null; - chart.series[cnt].yAxis = 1; + valueSuffix = null; + if (config.temp.units == 'F') { + chart.yAxis[1].options.title.text = 'Humidex'; + yaxis = 1 } } + chart.addSeries({ + name: titles[idx], + data: resp[idx], + yAxis: yaxis, + tooltip: {valueSuffix: valueSuffix} + }, false); + if (idx === 'temp') { chart.series[cnt].options.zIndex = 99; } @@ -441,7 +450,6 @@ var doWindDir = function () { }); }; - var doWind = function () { var options = { chart: { @@ -1257,3 +1265,126 @@ var doDailyTemp = function () { }); }; +var doAirQuality = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Air Quality'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'µg/m³'}, + opposite: false, + min: 0, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: 'µg/m³', + valueDecimals: 1, + xDateFormat: "%A, %b %e, %H:%M" + }, + series: [], + rangeSelector: { + buttons: [{ + count: 6, + type: 'hour', + text: '6h' + }, { + count: 12, + type: 'hour', + text: '12h' + }, { + type: 'all', + text: 'All' + }], + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/graphdata/airqualitydata.json', + dataType: 'json', + success: function (resp) { + var titles = { + 'pm2p5': 'PM 2.5', + 'pm10' : 'PM 10' + } + var idxs = ['pm2p5', 'pm10']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx] + }, false); + + cnt++; + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; diff --git a/interface/js/chartshistoric.js b/interface/js/chartshistoric.js new file mode 100644 index 0000000..95e9bc8 --- /dev/null +++ b/interface/js/chartshistoric.js @@ -0,0 +1,876 @@ +var chart, config; + +$(document).ready(function () { + $('.btn').change(function () { + + var myRadio = $('input[name=options]'); + var checkedValue = myRadio.filter(':checked').val(); + + switch (checkedValue) { + case 'temp': + doTemp(); + break; + case 'press': + doPress(); + break; + case 'wind': + doWind(); + break; + case 'windDir': + doWindDir(); + break; + case 'rain': + doRain(); + break; + case 'humidity': + doHum(); + break; + case 'solar': + doSolar(); + break; + } + }); + + $.ajax({url: "api/settings/version.json", dataType: "json", success: function (result) { + $('#Version').text(result.Version); + $('#Build').text(result.Build); + }}); + + $.ajax({url: "api/graphdata/graphconfig.json", success: function (result) { + config = result; + doTemp(); + }}); +}); + + +var doTemp = function () { + var freezing = config.temp.units === 'C' ? 0 : 32; + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Temperature'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Temperature (°' + config.temp.units + ')'}, + opposite: false, + labels: { + align: 'right', + x: -5, + formatter: function () { + return '' + this.value + ''; + } + }, + plotLines: [{ + // freezing line + value: freezing, + color: 'rgb(0, 0, 180)', + width: 1, + zIndex: 2 + }] + }, { + // right + gridLineWidth: 0, + opposite: true, + linkedTo: 0, + labels: { + align: 'left', + x: 5, + formatter: function () { + return '' + this.value + ''; + } + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: '°' + config.temp.units, + valueDecimals: config.temp.decimals, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/tempdata.json', + dataType: 'json', + success: function (resp) { + var titles = { + 'minTemp' : 'Min Temp', + 'maxTemp' : 'Max Temp', + 'avgTemp' : 'Avg Temp', + 'heatIndex': 'Heat Index', + 'minApp' : 'Min Apparent', + 'maxApp' : 'Max Apparent', + 'minDew' : 'Min Dewpoint', + 'maxDew' : 'Max Dewpoint', + 'minFeels' : 'Min Feels', + 'maxFeels' : 'Max Feels', + 'humidex' : 'Humidex' + }; + var visibility = { + 'minTemp' : true, + 'maxTemp' : true, + 'avgTemp' : false, + 'heatIndex': false, + 'minApp' : false, + 'maxApp' : false, + 'minDew' : false, + 'maxDew' : false, + 'minFeels' : false, + 'maxFeels' : false, + 'humidex' : false + }; + var idxs = ['minTemp', 'maxTemp', 'avgTemp', 'heatIndex', 'minApp', 'maxApp', 'minDew', 'maxDew', 'minFeels', 'maxFeels', 'humidex']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx], + visible: visibility[idx] + }, false); + + if (idx === 'humidex') { + chart.series[cnt].tooltipOptions.valueSuffix = ''; + // Link Humidex and temp scales if using Celsius + // For fahrenheit use separate scales + if (config.temp.units = 'C') { + chart.yAxis[1].options.title.text = ''; + } else { + chart.yAxis[1].options.linkedTo = null; + chart.series[cnt].yAxis = 1; + } + } + cnt++; + } + }); + chart.hideLoading(); + chart.redraw(); + } + }); +}; + +var doPress = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Pressure'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Pressure (' + config.press.units + ')'}, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: config.press.units, + valueDecimals: config.press.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'High Pressure' + }, { + name: 'Low Pressure' + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/pressdata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxBaro); + chart.series[1].setData(resp.minBaro); + } + }); +}; + +var compassP = function (deg) { + var a = ['N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW']; + return a[Math.floor((deg + 22.5) / 45) % 8]; +}; + +// var doWindDir = function () { +// var options = { +// chart: { +// renderTo: 'chartcontainer', +// type: 'scatter', +// alignTicks: false +// }, +// title: {text: 'Dominant Wind Direction'}, +// credits: {enabled: true}, +// boost: { +// useGPUTranslations: false, +// usePreAllocated: true +// }, +// xAxis: { +// type: 'datetime', +// ordinal: false, +// dateTimeLabelFormats: { +// day: '%e %b %y', +// week: '%e %b %y', +// month: '%b %y', +// year: '%Y' +// } +// }, +// yAxis: [{ +// // left +// title: {text: 'Bearing'}, +// opposite: false, +// min: 0, +// max: 360, +// tickInterval: 45, +// labels: { +// align: 'right', +// x: -5, +// formatter: function () { +// return compassP(this.value); +// } +// } +// }, { +// // right +// linkedTo: 0, +// gridLineWidth: 0, +// opposite: true, +// title: {text: null}, +// min: 0, +// max: 360, +// tickInterval: 45, +// labels: { +// align: 'left', +// x: 5, +// formatter: function () { +// return compassP(this.value); +// } +// } +// }], +// legend: {enabled: true}, +// plotOptions: { +// scatter: { +// animationLimit: 1, +// cursor: 'pointer', +// enableMouseTracking: false, +// boostThreshold: 200, +// marker: { +// states: { +// hover: {enabled: false}, +// select: {enabled: false}, +// normal: {enabled: false} +// } +// }, +// shadow: false, +// label: {enabled: false} +// } +// }, +// tooltip: { +// enabled: false +// }, +// series: [{ +// name: 'Bearing', +// type: 'scatter', +// marker: { +// symbol: 'circle', +// radius: 2 +// } +// }], +// rangeSelector: { +// inputEnabled: false, +// selected: 1 +// } +// }; + +// chart = new Highcharts.StockChart(options); +// chart.showLoading(); + +// $.ajax({ +// url: 'api/dailygraphdata/wdirdata.json', +// dataType: 'json', +// success: function (resp) { +// chart.hideLoading(); +// chart.series[0].setData(resp.windDir); +// } +// }); +// }; + +var doWind = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Wind Speed'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Wind Speed (' + config.wind.units + ')'}, + opposite: false, + min: 0, + labels: { + align: 'right', + x: -5 + } + }, { + // right + //linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + title: {text: 'Wind Run (' + config.wind.rununits + ')'}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: config.wind.units, + valueDecimals: config.wind.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'Wind Speed' + }, { + name: 'Wind Gust' + }, { + name: 'Wind Run', + yAxis: 1, + visible: false + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/winddata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxWind); + chart.series[1].setData(resp.maxGust); + chart.series[2].setData(resp.windRun); + } + }); +}; + +var doRain = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'column', + alignTicks: true + }, + title: {text: 'Rainfall'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Rainfall rate (' + config.rain.units + '/hr)'}, + min: 0, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }, { + // right + opposite: true, + title: {text: 'Rainfall (' + config.rain.units + ')'}, + min: 0, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + pointPadding: 0, + groupPadding: 0.1, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueDecimals: config.rain.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'Daily rain', + type: 'column', + yAxis: 1, + tooltip: {valueSuffix: config.rain.units} + }, { + name: 'Rain rate', + type: 'column', + yAxis: 0, + tooltip: {valueSuffix: config.rain.units + '/hr'}, + visible: false + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/raindata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxRainRate); + chart.series[1].setData(resp.rain); + } + }); +}; + +var doHum = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Relative Humidity'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Humidity (%)'}, + opposite: false, + min: 0, + max: 100, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + max: 100, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: '%', + valueDecimals: config.hum.decimals, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/humdata.json', + dataType: 'json', + success: function (resp) { + var titles = { + 'minHum' : 'Minimum Humidity', + 'maxHum': 'Maximum Humidity' + } + var idxs = ['minHum', 'maxHum']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx] + }, false); + + cnt++; + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; + +var doSolar = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: true + }, + title: {text: 'Solar'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'api/dailygraphdata/solardata.json', + dataType: 'json', + success: function (resp) { + var titles = { + solarRad: 'Solar Radiation', + uvi : 'UV Index', + sunHours: 'Sunshine Hours' + }; + var types = { + solarRad: 'area', + uvi : 'line', + sunHours: 'bar' + }; + var yAxes = { + solarRad: 'solar', + uvi : 'UV', + sunHours: 'sunHrs' + }; + var tooltips = { + solarRad: { + valueSuffix: 'W/m\u00B2', + valueDecimals: 0 + }, + uvi: { + valueSuffix: '', + valueDecimals: config.uv.decimals + }, + sunHours: { + valueSuffix: 'hours', + valueDecimals: 0 + } + }; + var idxs = ['solarRad', 'uvi', 'sunHours']; + idxs.forEach(function(idx) { + if (idx in resp) { + if (idx === 'uvi') { + chart.addAxis({ + id: 'UV', + title: {text: 'UV Index'}, + opposite: true, + min: 0, + labels: { + align: 'left' + } + }); + } else if (idx === 'sunHours') { + chart.addAxis({ + id: 'sunHrs', + title: {text: 'Sunshine Hours'}, + opposite: true, + min: 0, + labels: { + align: 'left' + } + }); + } else if (idx === 'solarRad') { + chart.addAxis({ + id: 'solar', + title: {text: 'Solar Radiation (W/m\u00B2)'}, + min: 0, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }); + } + chart.addSeries({ + name: titles[idx], + type: types[idx], + yAxis: yAxes[idx], + tooltip: tooltips[idx], + data: resp[idx] + }, false); + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; + diff --git a/interface/js/dashboard.js b/interface/js/dashboard.js index 48f08d1..bf09a4a 100644 --- a/interface/js/dashboard.js +++ b/interface/js/dashboard.js @@ -1,10 +1,10 @@ // Configuration section -var useWebSockets = true; // set to false to use Ajax updating -var updateInterval = 3; // update interval in seconds, if Ajax updating is used +let useWebSockets = true; // set to false to use Ajax updating +let updateInterval = 3; // update interval in seconds, if Ajax updating is used // End of configuration section -var alarmSettings; -var alarmTranslate = { +let alarmSettings; +let alarmTranslate = { AlarmGust: 'gustAbove', AlarmHighPress: 'pressAbove', AlarmHighTemp: 'tempAbove', @@ -22,7 +22,7 @@ var alarmTranslate = { AlarmBattery: 'batteryLow', AlarmSpike: 'spike' }; -var alarmState = { +let alarmState = { AlarmGust: false, AlarmHighPress: false, AlarmHighTemp: false, @@ -40,13 +40,31 @@ var alarmState = { AlarmBattery: false, AlarmSpike: false } -var playList = []; +let alarmDisplay = { + AlarmGust: 'Wind gust above', + AlarmHighPress: 'Pressure above', + AlarmHighTemp: 'Temperature above', + AlarmLowPress: 'Pressure below', + AlarmLowTemp: 'Temperature below', + AlarmPressDn: 'Pressure decrease >', + AlarmPressUp: 'Pressure increase >', + AlarmRain: 'Rain above', + AlarmRainRate: 'Rain Rate above', + AlarmSensor: 'Sensor contact lost', + AlarmTempDn: 'Temperature decrease >', + AlarmTempUp: 'Temperature increase >', + AlarmWind: 'Average wind speed above', + AlarmData: 'Data Stopped', + AlarmBattery: 'Battery Low', + AlarmSpike: 'Data Spike' +}; +let playList = []; $(document).ready(function () { - var lastUpdateTimer, ws; + let lastUpdateTimer, ws; - var audioElement = document.createElement('audio'); + let audioElement = document.createElement('audio'); function playSnd() { if (playList.length) { @@ -54,7 +72,7 @@ $(document).ready(function () { playList.shift(); playSnd() }); - var promise = playList[0].play(); + let promise = playList[0].play(); if (promise !== undefined) { promise.then(function(_){}).catch(function(_error) { // Autoplay prevented, ask user to enable it @@ -68,6 +86,16 @@ $(document).ready(function () { } } + function createNotification(text) { + // Create and show the notification + let img = '/img/logo30.png'; + let title = 'Cumulus MX Alarm'; + if ((text.match(/\n/g)).length > 1) { + title += 's'; + } + let notification = new Notification(title, { body: text, icon: img }); + } + function OpenWebSocket(wsport) { if ('WebSocket' in window) { // Open the web socket @@ -102,7 +130,7 @@ $(document).ready(function () { } function onMessage(evt) { - var data = JSON.parse(evt.data); + let data = JSON.parse(evt.data); updateDisplay(data); } @@ -114,7 +142,7 @@ $(document).ready(function () { $('#LastUpdateIcon').attr('src', 'img/up.png'); - var dataStopped = data.DataStopped; + let dataStopped = data.DataStopped; // Add an alarm value for dataStopped data.AlarmData = data.DataStopped; @@ -124,10 +152,15 @@ $(document).ready(function () { $('#DataStoppedIcon').attr('src', 'img/up.png'); } + + // Firefox gets arsy about multiple notifications so roll them up into one + let sendNotification = false; + let notificationMessage = ""; + // Get the keys from the object and set // the element with the same id to the value Object.keys(data).forEach(function (key) { - var id = '#' + key; + let id = '#' + key; if (key.indexOf('Alarm') == -1) { if ($(id).length) { $(id).text(data[key]); @@ -139,8 +172,17 @@ $(document).ready(function () { if (!alarmState[key]) { // make a sound? if (alarmSettings[alarmTranslate[key] + 'SoundEnabled']) { - var sndFile = 'sounds/'+ alarmSettings[alarmTranslate[key] + 'Sound'] - playList.push(new Audio(sndFile)); + let sndFile = 'sounds/'+ alarmSettings[alarmTranslate[key] + 'Sound'] + playList.push(new Audio(sndFile)); + } + if (alarmSettings[alarmTranslate[key] + 'Notify']) { + sendNotification = true; + let message = '‣ ' + alarmDisplay[key]; + if (alarmTranslate[key] + 'Val' in alarmSettings) { + message += ' ' + alarmSettings[alarmTranslate[key] + 'Val']; + } + console.log('Notify: ' + message); + notificationMessage += message + "\n"; } alarmState[key] = true; } @@ -151,6 +193,10 @@ $(document).ready(function () { } }); + if (sendNotification) { + createNotification(notificationMessage); + } + playSnd(); $('.WindUnit').text(data.WindUnit); @@ -172,7 +218,7 @@ $(document).ready(function () { wrData = data.WindRoseData.split(','); // convert array to numbers - for (var i = 0; i < wrData.length; i++) { + for (let i = 0; i < wrData.length; i++) { wrData[i] = +wrData[i]; } data.WindRoseData = wrData; @@ -180,28 +226,28 @@ $(document).ready(function () { gauges.processData(convertJson(data)); - var lastupdatetime = new Date(); - var hours = pad(lastupdatetime.getHours()); - var minutes = pad(lastupdatetime.getMinutes()); - var seconds = pad(lastupdatetime.getSeconds()); + let lastupdatetime = new Date(); + let hours = pad(lastupdatetime.getHours()); + let minutes = pad(lastupdatetime.getMinutes()); + let seconds = pad(lastupdatetime.getSeconds()); - var time = [hours, minutes, seconds].join(':'); + let time = [hours, minutes, seconds].join(':'); $('#lastupdatetime').text(time); } - var pad = function (x) { + let pad = function (x) { return x < 10 ? '0' + x : x; }; - var ticktock = function () { - var d = new Date(); + let ticktock = function () { + let d = new Date(); - var h = pad(d.getHours()); - var m = pad(d.getMinutes()); - var s = pad(d.getSeconds()); + let h = pad(d.getHours()); + let m = pad(d.getMinutes()); + let s = pad(d.getSeconds()); - var current_time = [h, m, s].join(':'); + let current_time = [h, m, s].join(':'); $('.digiclock').text(current_time); @@ -321,105 +367,182 @@ $(document).ready(function () { } // Get the alarm settings - only do this on page load - $.ajax({ - url: 'api/settings/alarms.json', - dataType: 'json', - success: function (result) { - var data = result.data; - var playSnd = false; - // save the setting for later - alarmSettings = data; - // set enabled alarm indicators to the off state - if (data.tempBelowEnabled) { - $('#AlarmLowTemp').addClass('indicatorOff'); - if (data.tempBelowSoundEnabled) { - playSnd = true; - } + $.ajax({ + url: 'api/settings/alarms.json', + dataType: 'json', + success: function (result) { + let data = result.data; + let playSnd = false; + let notify = false; + + // save the setting for later + alarmSettings = data; + // set enabled alarm indicators to the off state + if (data.tempBelowEnabled) { + $('#AlarmLowTemp').addClass('indicatorOff'); + if (data.tempBelowSoundEnabled) { + playSnd = true; } - if (data.tempAboveEnabled) { - $('#AlarmHighTemp').addClass('indicatorOff'); - if (data.tempAboveSoundEnabled) { - playSnd = true; - } + if (data.tempBelowNotify) { + notify = true; } - if (data.tempChangeEnabled) { - $('#AlarmTempUp').addClass('indicatorOff'); - $('#AlarmTempDn').addClass('indicatorOff'); - if (data.tempChangeSoundEnabled) { - playSnd = true; - } + } + if (data.tempAboveEnabled) { + $('#AlarmHighTemp').addClass('indicatorOff'); + if (data.tempAboveSoundEnabled) { + playSnd = true; } - if (data.pressBelowEnabled) { - $('#AlarmLowPress').addClass('indicatorOff'); - if (data.pressBelowSoundEnabled) { - playSnd = true; - } + if (data.tempAboveNotify) { + notify = true; } - if (data.pressAboveEnabled) { - $('#AlarmHighPress').addClass('indicatorOff'); - if (data.pressAboveSoundEnabled) { - playSnd = true; - } - } - if (data.pressChangeEnabled) { - $('#AlarmPressUp').addClass('indicatorOff'); - $('#AlarmPressDn').addClass('indicatorOff'); - if (data.pressChangeSoundEnabled) { - playSnd = true; - } + } + if (data.tempChangeEnabled) { + $('#AlarmTempUp').addClass('indicatorOff'); + $('#AlarmTempDn').addClass('indicatorOff'); + if (data.tempChangeSoundEnabled) { + playSnd = true; } - if (data.rainAboveEnabled) { - $('#AlarmRain').addClass('indicatorOff'); - if (data.rainAboveSoundEnabled) { - playSnd = true; - } + if (data.tempChangeNotify) { + notify = true; } - if (data.rainRateAboveEnabled) { - $('#AlarmRainRate').addClass('indicatorOff'); - if (data.rainRateAboveSoundEnabled) { - playSnd = true; - } + } + if (data.pressBelowEnabled) { + $('#AlarmLowPress').addClass('indicatorOff'); + if (data.pressBelowSoundEnabled) { + playSnd = true; } - if (data.gustAboveEnabled) { - $('#AlarmGust').addClass('indicatorOff'); - if (data.gustAboveSoundEnabled) { - playSnd = true; - } + if (data.pressBelowNotify) { + notify = true; } - if (data.windAboveEnabled) { - $('#AlarmWind').addClass('indicatorOff'); - if (data.windAboveSoundEnabled) { - playSnd = true; - } + } + if (data.pressAboveEnabled) { + $('#AlarmHighPress').addClass('indicatorOff'); + if (data.pressAboveSoundEnabled) { + playSnd = true; } - if (data.contactLostEnabled) { - $('#AlarmSensor').addClass('indicatorOff'); - if (data.contactLostSoundEnabled) { - playSnd = true; - } + if (data.pressAboveNotify) { + notify = true; } - if (data.dataStoppedEnabled) { - $('#AlarmData').addClass('indicatorOff'); - if (data.dataStoppedSoundEnabled) { - playSnd = true; - } + } + if (data.pressChangeEnabled) { + $('#AlarmPressUp').addClass('indicatorOff'); + $('#AlarmPressDn').addClass('indicatorOff'); + if (data.pressChangeSoundEnabled) { + playSnd = true; + } + if (data.pressChangeNotify) { + notify = true; + } + } + if (data.rainAboveEnabled) { + $('#AlarmRain').addClass('indicatorOff'); + if (data.rainAboveSoundEnabled) { + playSnd = true; } - if (data.batteryLowEnabled) { - $('#AlarmBattery').addClass('indicatorOff'); - if (data.batteryLowSoundEnabled) { - playSnd = true; + if (data.rainAboveNotify) { + notify = true; + } + } + if (data.rainRateAboveEnabled) { + $('#AlarmRainRate').addClass('indicatorOff'); + if (data.rainRateAboveSoundEnabled) { + playSnd = true; + } + if (data.rainAboveNotify) { + notify = true; + } + } + if (data.gustAboveEnabled) { + $('#AlarmGust').addClass('indicatorOff'); + if (data.gustAboveSoundEnabled) { + playSnd = true; + } + if (data.gustAboveNotify) { + notify = true; + } + } + if (data.windAboveEnabled) { + $('#AlarmWind').addClass('indicatorOff'); + if (data.windAboveSoundEnabled) { + playSnd = true; + } + if (data.windAboveNotify) { + notify = true; + } + } + if (data.contactLostEnabled) { + $('#AlarmSensor').addClass('indicatorOff'); + if (data.contactLostSoundEnabled) { + playSnd = true; + } + if (data.contactLostNotify) { + notify = true; + } + } + if (data.dataStoppedEnabled) { + $('#AlarmData').addClass('indicatorOff'); + if (data.dataStoppedSoundEnabled) { + playSnd = true; + } + if (data.dataStoppedNotify) { + notify = true; + } + } + if (data.batteryLowEnabled) { + $('#AlarmBattery').addClass('indicatorOff'); + if (data.batteryLowSoundEnabled) { + playSnd = true; + } + if (data.batteryLowNotify) { + notify = true; + } + } + if (data.spikeEnabled) { + $('#AlarmSpike').addClass('indicatorOff'); + if (data.spikeSoundEnabled) { + playSnd = true; + } + if (data.spikeSoundNotify) { + notify = true; + } + } + if (playSnd) { + } + if (notify) { + // Request notification permission + function handlePermission(permission) { + // Whatever the user answers, we make sure Chrome stores the information + if (!('permission' in Notification)) { + Notification.permission = permission; } } - if (data.spikeEnabled) { - $('#AlarmSpike').addClass('indicatorOff'); - if (data.spikeSoundEnabled) { - playSnd = true; + + function checkNotificationPromise() { + try { + Notification.requestPermission().then(); + } catch(e) { + return false; } + return true; } - if (playSnd) { + + if (!('Notification' in window)) { + console.log("This browser does not support notifications."); + } else { + if (checkNotificationPromise()) { + Notification.requestPermission() + .then((permission) => { + handlePermission(permission); + }) + } else { + Notification.requestPermission(function(permission) { + handlePermission(permission); + }); + } } } - }); + } + }); ticktock(); diff --git a/interface/js/extrasensors.js b/interface/js/extrasensors.js index 55b0f2a..55a0476 100644 --- a/interface/js/extrasensors.js +++ b/interface/js/extrasensors.js @@ -9,6 +9,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/temp.json' }); @@ -17,6 +21,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/hum.json' }); @@ -25,6 +33,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/dew.json' }); @@ -33,6 +45,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/soiltemp.json' }); @@ -41,6 +57,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/soilmoisture.json' }); @@ -49,6 +69,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/leaf.json' }); @@ -57,6 +81,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/airqual.json' }); @@ -65,6 +93,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/lightning.json' }); @@ -73,6 +105,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/extra/usertemp.json' }); diff --git a/interface/js/records.js b/interface/js/records.js index 326af07..1215f18 100644 --- a/interface/js/records.js +++ b/interface/js/records.js @@ -5,6 +5,10 @@ $(document).ready(function () { "info": false, "ordering": false, "columns": [{"width": "50%"}, {"width": "20%"}, null], + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/records/alltime/temperature.json' }); @@ -14,6 +18,10 @@ $(document).ready(function () { "info": false, "ordering": false, "columns": [{"width": "50%"}, {"width": "20%"}, null], + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/records/alltime/humidity.json' }); @@ -23,6 +31,10 @@ $(document).ready(function () { "info": false, "ordering": false, "columns": [{"width": "50%"}, {"width": "20%"}, null], + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/records/alltime/pressure.json' }); @@ -32,6 +44,10 @@ $(document).ready(function () { "info": false, "ordering": false, "columns": [{"width": "50%"}, {"width": "20%"}, null], + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/records/alltime/wind.json' }); @@ -41,20 +57,24 @@ $(document).ready(function () { "info": false, "ordering": false, "columns": [{"width": "50%"}, {"width": "20%"}, null], + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1]} + ], "ajax": '../api/records/alltime/rain.json' }); - + $.ajax({url: "api/settings/version.json", dataType:"json", success: function (result) { $('#Version').text(result.Version); - $('#Build').text(result.Build); + $('#Build').text(result.Build); }}); $(document).ready(function () { $('.btn').change(function () { - + var myRadio = $('input[name=options]'); var checkedValue = myRadio.filter(':checked').val(); - + var urlPrefix; if (checkedValue === 'alltime') { urlPrefix = "../api/records/alltime/"; @@ -65,7 +85,7 @@ $(document).ready(function () { } else { urlPrefix = "../api/records/month/"+checkedValue+"/"; } - + tempTable.api().ajax.url( urlPrefix+'temperature.json' ).load(); humTable.api().ajax.url( urlPrefix+'humidity.json' ).load(); pressTable.api().ajax.url( urlPrefix+'pressure.json' ).load(); @@ -74,4 +94,3 @@ $(document).ready(function () { }); }); }); - \ No newline at end of file diff --git a/interface/js/todayyest.js b/interface/js/todayyest.js index 58f09a5..dc27e07 100644 --- a/interface/js/todayyest.js +++ b/interface/js/todayyest.js @@ -1,14 +1,18 @@ $(document).ready(function () { $.ajax({url: "api/settings/version.json", dataType:"json", success: function (result) { $('#Version').text(result.Version); - $('#Build').text(result.Build); + $('#Build').text(result.Build); }}); - + var tempTable = $('#TempTable').DataTable({ "paging": false, "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], "ajax": '../api/todayyest/temp.json' }); @@ -17,7 +21,11 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, - "ajax": '../api/todayyest/rain.json' + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], + "ajax": '../api/todayyest/rain.json' }); var windTable = $('#WindTable').DataTable({ @@ -25,7 +33,11 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, - "ajax": '../api/todayyest/wind.json' + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], + "ajax": '../api/todayyest/wind.json' }); var humidityTable = $('#HumidityTable').DataTable({ @@ -33,6 +45,10 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], "ajax": '../api/todayyest/hum.json' }); @@ -41,7 +57,11 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, - "ajax": '../api/todayyest/pressure.json' + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], + "ajax": '../api/todayyest/pressure.json' }); var solarTable = $('#SolarTable').DataTable({ @@ -49,7 +69,11 @@ $(document).ready(function () { "searching": false, "info": false, "ordering": false, - "ajax": '../api/todayyest/solar.json' + "columnDefs": [ + {"className": "left", "targets": [0,2]}, + {"className": "right", "targets": [1,3]} + ], + "ajax": '../api/todayyest/solar.json' }); setInterval(function () { diff --git a/interface/json/ExtraSensorOptions.json b/interface/json/ExtraSensorOptions.json index 05a1e6d..f4d18a7 100644 --- a/interface/json/ExtraSensorOptions.json +++ b/interface/json/ExtraSensorOptions.json @@ -1,5 +1,31 @@ { "fields": { + "primaryaqsensor": { + "optionLabels": [ + "Undefined", + "Davis AirLink Outdoor", + "Ecowitt Sensor 1", + "Ecowitt Sensor 2", + "Ecowitt Sensor 3", + "Ecowitt Sensor 4" + ], + "removeDefaultNone": true, + "helper": "Sets the Air Quality sensor to use for graphing and sending to third parties, leave undefined to suppress AQ graph data generation" + }, + "aqi": { + "helper": "Select the AQI index calcuation method you want to use", + "optionLabels": [ + "USA - EPA", + "UK - COMEAP", + "EU - AQI", + "EU - CAQI", + "Canada - AQHI", + "Australia - NEPM", + "Netherlands - LKI", + "Belgium - BelAQI" + ], + "removeDefaultNone": true + }, "airLink": { "collapsible":true, "collapsed": true, @@ -29,7 +55,7 @@ "ipAddress": { }, "stationId": { - "helper": "Enter the wetherlink.com Station ID - you can leave this blank if you already entered it for your WLL device and this AirLink has been added as a node to the same station, it will be copied automatically" + "helper": "Enter the weatherlink.com Station ID - you can leave this blank if you already entered it for your WLL device and this AirLink has been added as a node to the same station, it will be completed automatically" } } }, @@ -51,20 +77,6 @@ "helper": "Enter the wetherlink.com Station ID - you can leave this blank if you already entered it for your WLL device and this AirLink has been added as a node to the same station, it will be copied automatically" } } - }, - "aqi": { - "helper": "Select the AQI index calcuation method you want to use", - "optionLabels": [ - "USA - EPA", - "UK - COMEAP", - "EU - AQI", - "EU - CAQI", - "Canada - AQHI", - "Australia - NEPM", - "Netherlands - LKI", - "Belgium - BelAQI" - ], - "removeDefaultNone": true } } }, diff --git a/interface/json/ExtraSensorSchema.json b/interface/json/ExtraSensorSchema.json index 294abf6..b45f5a3 100644 --- a/interface/json/ExtraSensorSchema.json +++ b/interface/json/ExtraSensorSchema.json @@ -1,6 +1,21 @@ { "type": "object", "properties": { + "primaryaqsensor": { + "title": "Primary Air Quality Sesnor", + "enum": [ + -1, + 0, + 1, + 2, + 3, + 4 + ] + }, + "aqi": { + "title": "Air Quality Index", + "enum": [0, 1, 2, 3, 4, 5, 6, 7] + }, "airLink": { "title": "Davis AirLink", "type": "object", @@ -49,10 +64,6 @@ "title": "Station ID" } } - }, - "aqi": { - "title": "Air Quality Index", - "enum": [0, 1, 2, 3, 4, 5, 6, 7] } } }, diff --git a/interface/json/InternetOptions.json b/interface/json/InternetOptions.json index a66616e..03c59af 100644 --- a/interface/json/InternetOptions.json +++ b/interface/json/InternetOptions.json @@ -125,15 +125,15 @@ "enabled": { "rightLabel": "Enabled" }, - "sendlocation": { - "rightLabel": "Send location", - "helper": "Send your location with each update" - }, "password": { "type": "password" }, "interval": { "helper": "Interval between updates in minutes" + }, + "sendlocation": { + "rightLabel": "Send location", + "helper": "Send your location with each update" } } }, @@ -144,6 +144,13 @@ "enabled": { "rightLabel": "Enabled" }, + "password": { + "type": "password", + "helper": "Used to be your password, but changed to the Station Key (case sensitive)" + }, + "interval": { + "helper": "Interval in minutes between updates. Not used if rapid fire is enabled (5 seconds is used)" + }, "includeindoor": { "rightLabel": "Include indoor data", "helper": "Include indoor temperature and humidity in the update" @@ -163,15 +170,13 @@ "rightLabel": "Send average wind speed", "helper": "Send the average wind speed for the current speed" }, + "includeaq": { + "rightLabel": "Include air quality data", + "helper": "Include the pm2.5 (and pm10 if available) data. You also need to set the Primary AQ sensor in Station Options settings" + }, "catchup": { "rightLabel": "Catch up", "helper": "When Cumulus starts, send each entry read from the station logger" - }, - "interval": { - "helper": "Interval in minutes between updates. Not used if rapid fire is enabled (5 seconds is used)" - }, - "password": { - "type": "password" } } }, @@ -182,6 +187,15 @@ "enabled": { "rightLabel": "Enabled" }, + "apikey": { + "helper": "This is a very long string and is used for all your Windy.com stations" + }, + "stationidx": { + "helper": "Defines which station to upload to. The first station you define is 0 (default), the next 1 etc." + }, + "interval": { + "helper": "Interval in minutes between updates (min value = 5)." + }, "includeuv": { "rightLabel": "Include UV", "helper": "Include UV index in the update" @@ -189,15 +203,6 @@ "catchup": { "rightLabel": "Catch up", "helper": "When Cumulus starts, send each entry read from the station logger" - }, - "interval": { - "helper": "Interval in minutes between updates (min value = 5)." - }, - "apikey": { - "helper": "This is a very long string and is used for all your Windy.com stations" - }, - "stationidx": { - "helper": "Defines which station to upload to. The first station you define is 0 (default), the next 1 etc." } } }, @@ -208,6 +213,12 @@ "enabled": { "rightLabel": "Enabled" }, + "password": { + "type": "password" + }, + "interval": { + "helper": "Interval between updates in minutes" + }, "includeuv": { "rightLabel": "Include UV", "helper": "Include UV index in the update" @@ -219,12 +230,6 @@ "catchup": { "rightLabel": "Catch up", "helper": "When Cumulus starts, send each entry read from the station logger" - }, - "password": { - "type": "password" - }, - "interval": { - "helper": "Interval between updates in minutes" } } }, @@ -235,6 +240,12 @@ "enabled": { "rightLabel": "Enabled" }, + "password": { + "type": "password" + }, + "interval": { + "helper": "Interval between updates in minutes" + }, "includeuv": { "rightLabel": "Include UV", "helper": "Include UV index in the update" @@ -246,12 +257,6 @@ "catchup": { "rightLabel": "Catch up", "helper": "When Cumulus starts, send each entry read from the station logger" - }, - "password": { - "type": "password" - }, - "interval": { - "helper": "Interval between updates in minutes" } } }, @@ -262,12 +267,12 @@ "enabled": { "rightLabel": "Enabled" }, + "password": { + "helper": "Leave at -1 unless you are using an amateur radio callsign" + }, "includesolar": { "rightLabel": "Include solar radiation", "helper": "Include the solar radiation reading in the update" - }, - "password": { - "helper": "Leave at -1 unless you are using an amateur radio callsign" } } }, @@ -278,6 +283,17 @@ "enabled": { "rightLabel": "Enabled" }, + "password": { + "type": "password" + }, + "lang": { + "optionLabels": ["English", "German", "French", "Italain", "Dutch"], + "removeDefaultNone": true, + "helper": "One of fr/de/en/it/nl" + }, + "interval": { + "helper": "Update interval in seconds. Min value 15 seconds" + }, "includeuv": { "rightLabel": "Include UV", "helper": "Include UV index in the update" @@ -302,16 +318,9 @@ "rightLabel": "Include indoor data", "helper": "Include indoor temperature and humidity in the update" }, - "lang": { - "optionLabels": ["English", "German", "French", "Italain", "Dutch"], - "removeDefaultNone": true, - "helper": "One of fr/de/en/it/nl" - }, - "interval": { - "helper": "Update interval in seconds. Min value 15 seconds" - }, - "password": { - "type": "password" + "includeaq": { + "rightLabel": "Include air quality data", + "helper": "Include the pm2.5 (and pm10 if available). You also need to set the Primary AQ sensor in Station Options settings" } } }, @@ -358,14 +367,15 @@ "enabled": { "rightLabel": "Enabled" }, + "retained": { + "rightLabel": "Message retained on server", + "helper": "The broker stores the last retained message and the corresponding QoS for the topic. Enabling this means stale data may be avialable to clients" + }, "topic": { "helper": "Enter the topic name for these messages" }, "template": { "helper": "Specify the name of the template file in the /mqtt folder to format the content of these messages" - }, - "retained": { - "rightLabel": "Message retained on server" } } }, @@ -375,6 +385,10 @@ "enabled": { "rightLabel": "Enabled" }, + "retained": { + "rightLabel": "Message retained on server", + "helper": "The broker stores the last retained message and the corresponding QoS for the topic. Enabling this means stale data may be avialable to clients" + }, "time": { "helper": "Enter the time in seconds between sending messages" }, @@ -383,9 +397,6 @@ }, "template": { "helper": "Specify the name of the template file in the /mqtt folder to format the content of these messages" - }, - "retained": { - "rightLabel": "Message retained on server" } } } diff --git a/interface/json/InternetSchema.json b/interface/json/InternetSchema.json index 3d58c89..ed9c0c5 100644 --- a/interface/json/InternetSchema.json +++ b/interface/json/InternetSchema.json @@ -137,18 +137,18 @@ "enabled": { "type": "boolean" }, - "sendlocation": { - "type": "boolean" - }, - "interval": { - "title": "Interval", - "type": "integer" - }, "user": { "title": "User" }, "password": { "title": "Password" + }, + "interval": { + "title": "Interval", + "type": "integer" + }, + "sendlocation": { + "type": "boolean" } } }, @@ -159,6 +159,20 @@ "enabled": { "type": "boolean" }, + "stationid": { + "title": "Device ID" + }, + "password": { + "title": "Station Key" + }, + "interval": { + "title": "Interval", + "type": "integer", + "minimum": 1 + }, + "rapidfire": { + "type": "boolean" + }, "includeindoor": { "type": "boolean" }, @@ -168,25 +182,14 @@ "includesolar": { "type": "boolean" }, - "rapidfire": { - "type": "boolean" - }, "sendavgwind": { "type": "boolean" }, + "includeaq": { + "type":"boolean" + }, "catchup": { "type": "boolean" - }, - "stationid": { - "title": "Station ID" - }, - "password": { - "title": "Password" - }, - "interval": { - "title": "Interval", - "type": "integer", - "minimum": 1 } } }, @@ -197,12 +200,6 @@ "enabled": { "type": "boolean" }, - "includeuv": { - "type": "boolean" - }, - "catchup": { - "type": "boolean" - }, "stationidx": { "title": "Station Index", "type": "integer", @@ -216,6 +213,12 @@ "title": "Interval", "type": "integer", "minimum": 5 + }, + "includeuv": { + "type": "boolean" + }, + "catchup": { + "type": "boolean" } } }, @@ -226,15 +229,6 @@ "enabled": { "type": "boolean" }, - "includeuv": { - "type": "boolean" - }, - "includesolar": { - "type": "boolean" - }, - "catchup": { - "type": "boolean" - }, "stationid": { "title": "Station ID" }, @@ -245,15 +239,6 @@ "title": "Interval", "type": "integer", "minimum": 1 - } - } - }, - "wow": { - "title": "Met Office WOW", - "type": "object", - "properties": { - "enabled": { - "type": "boolean" }, "includeuv": { "type": "boolean" @@ -263,6 +248,15 @@ }, "catchup": { "type": "boolean" + } + } + }, + "wow": { + "title": "Met Office WOW", + "type": "object", + "properties": { + "enabled": { + "type": "boolean" }, "stationid": { "title": "Site ID" @@ -274,6 +268,15 @@ "title": "Interval", "type": "integer", "minimum": 1 + }, + "includeuv": { + "type": "boolean" + }, + "includesolar": { + "type": "boolean" + }, + "catchup": { + "type": "boolean" } } }, @@ -284,10 +287,6 @@ "enabled": { "type": "boolean" }, - "includesolar": { - "title": "", - "type": "boolean" - }, "id": { "title": "ID" }, @@ -306,6 +305,10 @@ "title": "Interval", "type": "integer", "minimum": 1 + }, + "includesolar": { + "title": "", + "type": "boolean" } } }, @@ -316,6 +319,21 @@ "enabled": { "type": "boolean" }, + "user": { + "title": "User" + }, + "password": { + "title": "Password" + }, + "lang": { + "title": "Language", + "enum": ["en", "de", "fr", "it", "nl"] + }, + "interval": { + "title": "Interval (seconds)", + "type": "integer", + "minimum": 15 + }, "includeuv": { "type": "boolean" }, @@ -334,20 +352,8 @@ "includeindoor": { "type": "boolean" }, - "user": { - "title": "User" - }, - "password": { - "title": "Password" - }, - "lang": { - "title": "Language", - "enum": ["en", "de", "fr", "it", "nl"] - }, - "interval": { - "title": "Interval (seconds)", - "type": "integer", - "minimum": 15 + "includeaq": { + "type": "boolean" } } }, @@ -358,17 +364,17 @@ "enabled": { "type": "boolean" }, - "includeuv": { - "type": "boolean" - }, - "includesolar": { - "type": "boolean" - }, "wid": { "title": "Wid" }, "key": { "title": "Key" + }, + "includeuv": { + "type": "boolean" + }, + "includesolar": { + "type": "boolean" } } }, diff --git a/interface/json/StationOptions.json b/interface/json/StationOptions.json index 84f3466..caa765a 100644 --- a/interface/json/StationOptions.json +++ b/interface/json/StationOptions.json @@ -639,6 +639,10 @@ "graphSolarVis": { "rightLabel": "Show Solar data on graphs", "helper": "Add solar data to the graph data files and display it on the interface" + }, + "graphSunshineVis": { + "rightLabel": "Show Sunshine hours data on graphs", + "helper": "Add sunshine data to the graph data files and display it on the interface" } } } diff --git a/interface/json/StationSchema.json b/interface/json/StationSchema.json index cbd9f87..b144421 100644 --- a/interface/json/StationSchema.json +++ b/interface/json/StationSchema.json @@ -692,6 +692,9 @@ }, "graphSolarVis": { "type": "boolean" + }, + "graphSunshineVis": { + "type": "boolean" } } } diff --git a/interface/monthlyrecseditor.html b/interface/monthlyrecseditor.html index 32be96e..22c1adf 100644 --- a/interface/monthlyrecseditor.html +++ b/interface/monthlyrecseditor.html @@ -73,8 +73,14 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • -
  • Today/Yesterday
    • +
  • + + +
    • +
  • Today/Yesterday
  • Records
  • diff --git a/interface/mysqlsettings.html b/interface/mysqlsettings.html index 0bd9dcb..622d660 100644 --- a/interface/mysqlsettings.html +++ b/interface/mysqlsettings.html @@ -68,7 +68,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/noaamonthreport.html b/interface/noaamonthreport.html index 7c025c1..d537078 100644 --- a/interface/noaamonthreport.html +++ b/interface/noaamonthreport.html @@ -100,7 +100,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/noaasettings.html b/interface/noaasettings.html index 0f414f4..5c35837 100644 --- a/interface/noaasettings.html +++ b/interface/noaasettings.html @@ -64,7 +64,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/noaayearreport.html b/interface/noaayearreport.html index b0fb7c9..b3c132b 100644 --- a/interface/noaayearreport.html +++ b/interface/noaayearreport.html @@ -97,7 +97,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/now.html b/interface/now.html index cecb0b0..17c0501 100644 --- a/interface/now.html +++ b/interface/now.html @@ -21,6 +21,11 @@ + @@ -38,7 +43,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • @@ -113,42 +124,42 @@

    Current data

    • - + - + - + - + - + - + - + - + @@ -165,32 +176,32 @@

    Current data

    Rain Today - -- + -- -- Rain Rate - -- + -- --/hr Rain Last Hour - -- + -- -- Rain This Month - -- + -- -- Rain This Year - -- + -- -- Rain Yesterday - -- + -- -- @@ -207,27 +218,27 @@

    Current data

    Latest - -- + -- -- Bearing - --° + --° Average Speed - -- + -- -- Average Bearing - --° + --° Peak Gust - -- + -- -- @@ -246,12 +257,12 @@

    Current data

    Outdoor Humidity - -- + -- % Indoor Humidity - -- + -- % @@ -267,12 +278,12 @@

    Current data

    Pressure - -- + -- -- Trend - -- + -- --/hr @@ -289,12 +300,12 @@

    Current data

    Solar Radiation - -- + -- W/m2 Sunshine Today - -- + -- hrs @@ -38,7 +43,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/stationsettings.html b/interface/stationsettings.html index f262cd6..fc6897b 100644 --- a/interface/stationsettings.html +++ b/interface/stationsettings.html @@ -66,7 +66,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/thismonthrecseditor.html b/interface/thismonthrecseditor.html index d71dc2a..b6bcdcc 100644 --- a/interface/thismonthrecseditor.html +++ b/interface/thismonthrecseditor.html @@ -61,7 +61,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/thisyearrecseditor.html b/interface/thisyearrecseditor.html index 439854e..40b3499 100644 --- a/interface/thisyearrecseditor.html +++ b/interface/thisyearrecseditor.html @@ -61,7 +61,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • diff --git a/interface/todayyest.html b/interface/todayyest.html index 19cb369..6f7a723 100644 --- a/interface/todayyest.html +++ b/interface/todayyest.html @@ -21,6 +21,11 @@ + @@ -38,7 +43,13 @@
  • Dashboard
  • Now
  • Gauges
    • -
  • Charts
    • +
  • + + +
  • Today/Yesterday
  • Records
  • @@ -114,8 +125,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday @@ -176,8 +187,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday @@ -202,8 +213,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday @@ -229,8 +240,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday @@ -267,8 +278,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday @@ -317,8 +328,8 @@

    Today and yesterday

      - Today - Yesterday + Today + Yesterday diff --git a/web/gaugesT.htm b/web/gaugesT.htm index 4bad329..7353a31 100644 --- a/web/gaugesT.htm +++ b/web/gaugesT.htm @@ -162,19 +162,14 @@

    >>This pages requires JavaScript

    • - - - - -
    - :now::gauges::today::yesterday::this month::this year::records::trends:<#forum> <#webcam> -
    +
    + :now::gauges::today::yesterday::this month::this year::records::monthly records::trends::historic:<#forum><#webcam> +


    - Page updated <#update> -
    + Page updated <#update>
    powered by v (b)

    diff --git a/web/historicT.htm b/web/historicT.htm new file mode 100644 index 0000000..e13821a --- /dev/null +++ b/web/historicT.htm @@ -0,0 +1,109 @@ + + + + + + + <#location> weather + + + + + + +
    +

    <#location> weather

    +

     Latitude <#latitude>     Longitude <#longitude>     Elevation <#altitude>

    +

    Click on a button to display the corresponding daily data chart.

    +

    Mouse over the chart to see the values at any given time.

    +

    You can add or remove data sets from the chart by clicking the entry on the chart legend.

    + +
    +
    +
    Click on a button to show the corresponding graph above.
    +
    + + + + + + +
    +
    + :now::gauges::today::yesterday::this month::this year::records::monthly records::trends::historic:<#forum><#webcam> +
    +


    + charts by Highcharts
    + page updated <#update>
    + powered by Cumulus v<#version> (<#build>) +

    +
    + + + + + + + \ No newline at end of file diff --git a/web/indexT.htm b/web/indexT.htm index 7da70a6..f79f16a 100644 --- a/web/indexT.htm +++ b/web/indexT.htm @@ -142,15 +142,13 @@

     Latitude <#latit <#presstrend> <#presstrendval> <#pressunit>/hr - - :now::gauges::today::yesterday::this month::this year::records::monthly records::trends:<#forum><#webcam> - +
    + :now::gauges::today::yesterday::this month::this year::records::monthly records::trends::historic:<#forum><#webcam> +


    -Page updated <#update>
    -powered by -Cumulus -v<#version> (<#build>) + Page updated <#update>
    + powered by Cumulus v<#version> (<#build>)

    diff --git a/web/monthlyrecordT.htm b/web/monthlyrecordT.htm index a13fd1b..6c94ffc 100644 --- a/web/monthlyrecordT.htm +++ b/web/monthlyrecordT.htm @@ -165,14 +165,13 @@

     Latitude <#latitu <#ByMonthPressH mon=1> <#pressunit> <#ByMonthPressHT mon=1> - - :now::gauges::today::yesterday::this month::this year::records::monthly records::trends:<#forum><#webcam> - +
    + :now::gauges::today::yesterday::this month::this year::records::monthly records::trends::historic:<#forum><#webcam> +


    -Page updated <#update>
    -powered by -Cumulus v<#version> (<#build>) + Page updated <#update>
    + powered by Cumulus v<#version> (<#build>)

    diff --git a/web/yesterdayT.htm b/web/yesterdayT.htm index 6bd3b22..25f35e4 100644 --- a/web/yesterdayT.htm +++ b/web/yesterdayT.htm @@ -133,16 +133,14 @@

     Latitude <#latitu <#pressYL> <#pressunit> at <#TpressYL> - - :now::gauges::today::yesterday::this month::this year::records::monthly records::trends:<#forum><#webcam> - - +
    + :now::gauges::today::yesterday::this month::this year::records::monthly records::trends::historic:<#forum><#webcam> +


    Page updated <#update>
    -powered by -Cumulus v<#version> (<#build>) +powered by Cumulus v<#version> (<#build>)

    diff --git a/webfiles/js/cumuluscharts.js b/webfiles/js/cumuluscharts.js index 3ad498a..be435d3 100644 --- a/webfiles/js/cumuluscharts.js +++ b/webfiles/js/cumuluscharts.js @@ -44,6 +44,9 @@ function changeGraph(graph) { case 'sunhours': doSunHours(); break; + case 'airquality': + doAirQuality(); + break; } } @@ -93,15 +96,13 @@ var doTemp = function () { }] }, { // right - linkedTo: 0, gridLineWidth: 0, opposite: true, - title: {text: "Humidex"}, labels: { align: 'left', x: 5, formatter: function () { - return '' + this.value + ''; + return '' + this.value + ''; } } }], @@ -139,7 +140,6 @@ var doTemp = function () { tooltip: { shared: true, crosshairs: true, - valueSuffix: '°' + config.temp.units, valueDecimals: config.temp.decimals, xDateFormat: "%A, %b %e, %H:%M" }, @@ -181,31 +181,41 @@ var doTemp = function () { } var idxs = ['temp', 'dew', 'apptemp', 'feelslike', 'wchill', 'heatindex', 'humidex', 'intemp']; var cnt = 0; + var yaxis = 0; + + // Do we link the yAxes? Yes if no Humidex, or we have Huidex and we are using Celcius + if (config.temp.units == 'C' || resp.humidex == null) { + chart.yAxis[1].options.linkedTo = 0; + chart.yAxis[1].isLinked = true; + } + idxs.forEach(function(idx) { - if (idx in resp) { - chart.addSeries({ - name: titles[idx], - data: resp[idx] - }, false); + var valueSuffix = '°' + config.temp.units; + yaxis = 0; + if (idx in resp) { if (idx === 'humidex') { - chart.series[cnt].tooltipOptions.valueSuffix = ''; - // Link Humidex and temp scales if using Celsius - // For fahrenheit use separate scales - if (config.temp.units = 'C') { - chart.yAxis[1].options.title.text = ''; - } else { - chart.yAxis[1].options.linkedTo = null; - chart.series[cnt].yAxis = 1; + valueSuffix = null; + if (config.temp.units == 'F') { + chart.yAxis[1].options.title.text = 'Humidex'; + yaxis = 1 } } + chart.addSeries({ + name: titles[idx], + data: resp[idx], + yAxis: yaxis, + tooltip: {valueSuffix: valueSuffix} + }, false); + if (idx === 'temp') { chart.series[cnt].options.zIndex = 99; } cnt++; } }); + chart.hideLoading(); chart.redraw(); } @@ -1370,4 +1380,129 @@ var doDailyTemp = function () { chart.series[2].setData(resp.maxtemp); } }); -}; \ No newline at end of file +}; + +var doAirQuality = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Air Quality'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'µg/m³'}, + opposite: false, + min: 0, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: 'µg/m³', + valueDecimals: 1, + xDateFormat: "%A, %b %e, %H:%M" + }, + series: [], + rangeSelector: { + buttons: [{ + count: 6, + type: 'hour', + text: '6h' + }, { + count: 12, + type: 'hour', + text: '12h' + }, { + type: 'all', + text: 'All' + }], + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'airquality.json', + dataType: 'json', + cache: false, + success: function (resp) { + var titles = { + 'pm2p5': 'PM 2.5', + 'pm10' : 'PM 10' + } + var idxs = ['pm2p5', 'pm10']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx] + }, false); + + cnt++; + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; diff --git a/webfiles/js/historiccharts.js b/webfiles/js/historiccharts.js new file mode 100644 index 0000000..3ad18bf --- /dev/null +++ b/webfiles/js/historiccharts.js @@ -0,0 +1,766 @@ +var chart, config; + +$(document).ready(function () { + $.ajax({ + url: "graphconfig.json", + dataType: "json", + success: function (result) { + config = result; + doTemp(); + } + }); +}); + + +function changeGraph(graph) { + switch (graph) { + case 'temp': + doTemp(); + break; + case 'press': + doPress(); + break; + case 'wind': + doWind(); + break; + case 'rain': + doRain(); + break; + case 'humidity': + doHum(); + break; + case 'solar': + doSolar(); + break; + } +} + +var doTemp = function () { + var freezing = config.temp.units === 'C' ? 0 : 32; + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Temperature'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Temperature (°' + config.temp.units + ')'}, + opposite: false, + labels: { + align: 'right', + x: -5, + formatter: function () { + return '' + this.value + ''; + } + }, + plotLines: [{ + // freezing line + value: freezing, + color: 'rgb(0, 0, 180)', + width: 1, + zIndex: 2 + }] + }, { + // right + gridLineWidth: 0, + opposite: true, + linkedTo: 0, + labels: { + align: 'left', + x: 5, + formatter: function () { + return '' + this.value + ''; + } + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: '°' + config.temp.units, + valueDecimals: config.temp.decimals, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailytempdata.json', + dataType: 'json', + success: function (resp) { + var titles = { + 'minTemp' : 'Min Temp', + 'maxTemp' : 'Max Temp', + 'avgTemp' : 'Avg Temp', + 'heatIndex': 'Heat Index', + 'minApp' : 'Min Apparent', + 'maxApp' : 'Max Apparent', + 'minDew' : 'Min Dewpoint', + 'maxDew' : 'Max Dewpoint', + 'minFeels' : 'Min Feels', + 'maxFeels' : 'Max Feels', + 'humidex' : 'Humidex' + }; + var visibility = { + 'minTemp' : true, + 'maxTemp' : true, + 'avgTemp' : false, + 'heatIndex': false, + 'minApp' : false, + 'maxApp' : false, + 'minDew' : false, + 'maxDew' : false, + 'minFeels' : false, + 'maxFeels' : false, + 'humidex' : false + }; + var idxs = ['minTemp', 'maxTemp', 'avgTemp', 'heatIndex', 'minApp', 'maxApp', 'minDew', 'maxDew', 'minFeels', 'maxFeels', 'humidex']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx], + visible: visibility[idx] + }, false); + + if (idx === 'humidex') { + chart.series[cnt].tooltipOptions.valueSuffix = ''; + // Link Humidex and temp scales if using Celsius + // For fahrenheit use separate scales + if (config.temp.units = 'C') { + chart.yAxis[1].options.title.text = ''; + } else { + chart.yAxis[1].options.linkedTo = null; + chart.series[cnt].yAxis = 1; + } + } + cnt++; + } + }); + chart.hideLoading(); + chart.redraw(); + } + }); +}; + +var doPress = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Pressure'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Pressure (' + config.press.units + ')'}, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: config.press.units, + valueDecimals: config.press.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'High Pressure' + }, { + name: 'Low Pressure' + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailypressdata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxBaro); + chart.series[1].setData(resp.minBaro); + } + }); +}; + +var compassP = function (deg) { + var a = ['N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW']; + return a[Math.floor((deg + 22.5) / 45) % 8]; +}; + +var doWind = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Wind Speed'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Wind Speed (' + config.wind.units + ')'}, + opposite: false, + min: 0, + labels: { + align: 'right', + x: -5 + } + }, { + // right + //linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + title: {text: 'Wind Run (' + config.wind.rununits + ')'}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: config.wind.units, + valueDecimals: config.wind.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'Wind Speed' + }, { + name: 'Wind Gust' + }, { + name: 'Wind Run', + yAxis: 1, + visible: false + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailywinddata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxWind); + chart.series[1].setData(resp.maxGust); + chart.series[2].setData(resp.windRun); + } + }); +}; + +var doRain = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'column', + alignTicks: true + }, + title: {text: 'Rainfall'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Rainfall rate (' + config.rain.units + '/hr)'}, + min: 0, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }, { + // right + opposite: true, + title: {text: 'Rainfall (' + config.rain.units + ')'}, + min: 0, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + pointPadding: 0, + groupPadding: 0.1, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueDecimals: config.rain.decimals, + xDateFormat: '%e %b %y' + }, + series: [{ + name: 'Daily rain', + type: 'column', + yAxis: 1, + tooltip: {valueSuffix: config.rain.units} + }, { + name: 'Rain rate', + type: 'column', + yAxis: 0, + tooltip: {valueSuffix: config.rain.units + '/hr'}, + visible: false + }], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailyraindata.json', + dataType: 'json', + success: function (resp) { + chart.hideLoading(); + chart.series[0].setData(resp.maxRainRate); + chart.series[1].setData(resp.rain); + } + }); +}; + +var doHum = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: false + }, + title: {text: 'Relative Humidity'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [{ + // left + title: {text: 'Humidity (%)'}, + opposite: false, + min: 0, + max: 100, + labels: { + align: 'right', + x: -5 + } + }, { + // right + linkedTo: 0, + gridLineWidth: 0, + opposite: true, + min: 0, + max: 100, + title: {text: null}, + labels: { + align: 'left', + x: 5 + } + }], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + valueSuffix: '%', + valueDecimals: config.hum.decimals, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailyhumdata.json', + dataType: 'json', + success: function (resp) { + var titles = { + 'minHum' : 'Minimum Humidity', + 'maxHum': 'Maximum Humidity' + } + var idxs = ['minHum', 'maxHum']; + var cnt = 0; + idxs.forEach(function(idx) { + if (idx in resp) { + chart.addSeries({ + name: titles[idx], + data: resp[idx] + }, false); + + cnt++; + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; + +var doSolar = function () { + var options = { + chart: { + renderTo: 'chartcontainer', + type: 'line', + alignTicks: true + }, + title: {text: 'Solar'}, + credits: {enabled: true}, + xAxis: { + type: 'datetime', + ordinal: false, + dateTimeLabelFormats: { + day: '%e %b %y', + week: '%e %b %y', + month: '%b %y', + year: '%Y' + } + }, + yAxis: [], + legend: {enabled: true}, + plotOptions: { + series: { + dataGrouping: { + enabled: false + }, + states: { + hover: { + halo: { + size: 5, + opacity: 0.25 + } + + } + }, + cursor: 'pointer', + marker: { + enabled: false, + states: { + hover: { + enabled: true, + radius: 0.1 + } + } + } + }, + line: {lineWidth: 2} + }, + tooltip: { + shared: true, + split: false, + xDateFormat: '%e %b %y' + }, + series: [], + rangeSelector: { + inputEnabled: false, + selected: 1 + } + }; + + chart = new Highcharts.StockChart(options); + chart.showLoading(); + + $.ajax({ + url: 'alldailysolardata.json', + dataType: 'json', + success: function (resp) { + var titles = { + solarRad: 'Solar Radiation', + uvi : 'UV Index', + sunHours: 'Sunshine Hours' + }; + var types = { + solarRad: 'area', + uvi : 'line', + sunHours: 'bar' + }; + var yAxes = { + solarRad: 'solar', + uvi : 'UV', + sunHours: 'sunHrs' + }; + var tooltips = { + solarRad: { + valueSuffix: 'W/m\u00B2', + valueDecimals: 0 + }, + uvi: { + valueSuffix: '', + valueDecimals: config.uv.decimals + }, + sunHours: { + valueSuffix: 'hours', + valueDecimals: 0 + } + }; + var idxs = ['solarRad', 'uvi', 'sunHours']; + idxs.forEach(function(idx) { + if (idx in resp) { + if (idx === 'uvi') { + chart.addAxis({ + id: 'UV', + title: {text: 'UV Index'}, + opposite: true, + min: 0, + labels: { + align: 'left' + } + }); + } else if (idx === 'sunHours') { + chart.addAxis({ + id: 'sunHrs', + title: {text: 'Sunshine Hours'}, + opposite: true, + min: 0, + labels: { + align: 'left' + } + }); + } else if (idx === 'solarRad') { + chart.addAxis({ + id: 'solar', + title: {text: 'Solar Radiation (W/m\u00B2)'}, + min: 0, + opposite: false, + labels: { + align: 'right', + x: -5 + } + }); + } + chart.addSeries({ + name: titles[idx], + type: types[idx], + yAxis: yAxes[idx], + tooltip: tooltips[idx], + data: resp[idx] + }, false); + } + }); + + chart.hideLoading(); + chart.redraw(); + } + }); +}; + From b72fbeb4919828bad8e2b5fb7e18cde09b17d38c Mon Sep 17 00:00:00 2001 From: Mark Crossley <1196094+mcrossley@users.noreply.github.com> Date: Tue, 1 Dec 2020 11:27:37 +0000 Subject: [PATCH 2/2] b3097 final --- interface/json/ExtraSensorSchema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/json/ExtraSensorSchema.json b/interface/json/ExtraSensorSchema.json index b45f5a3..23a5016 100644 --- a/interface/json/ExtraSensorSchema.json +++ b/interface/json/ExtraSensorSchema.json @@ -2,7 +2,7 @@ "type": "object", "properties": { "primaryaqsensor": { - "title": "Primary Air Quality Sesnor", + "title": "Primary Air Quality Sensor", "enum": [ -1, 0,