From 79a7ec2fa3da2ca2762767ff1a1afab5bec2e7bf Mon Sep 17 00:00:00 2001 From: Ultrapingu Date: Mon, 25 Jan 2021 19:09:11 +0100 Subject: [PATCH 1/3] Fix issue #44 --- viewer/Smart Thermostats.html | 2 +- viewer/svt_viewer.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/viewer/Smart Thermostats.html b/viewer/Smart Thermostats.html index 7b557a1..56c7288 100644 --- a/viewer/Smart Thermostats.html +++ b/viewer/Smart Thermostats.html @@ -66,7 +66,7 @@ data: data.heater.historic.map(function (item) { return { x: +(new Date(item.Date)), - y: (item.Data=="On" || item.Data.startsWith("Set Level"))?((item.Level==undefined)?100:(item.Level>100?100:item.Level)):0 + y: (item.Data=="On" || item.Data.startsWith("Set Level"))?((!data.heater.isDimmer)?100:(item.Level>100?100:item.Level)):0 } }) }); diff --git a/viewer/svt_viewer.js b/viewer/svt_viewer.js index 4f4b154..b910b0a 100644 --- a/viewer/svt_viewer.js +++ b/viewer/svt_viewer.js @@ -15,6 +15,7 @@ class Thermostat { class Heater { constructor() { this.historic=undefined; + this.isDimmer=false; } } Date.prototype.yyyymmdd_hhmm = function() { @@ -92,6 +93,7 @@ function getThermostats() { success: function(resultTemp){ console.log(resultTemp); thermostat.heater = new Heater(); + thermostat.heater.isDimmer = resultTemp.HaveDimmer; thermostat.heater.historic = resultTemp.result.filter(item => new Date(item.Date).getTime() >= minDate).sort((a,b)=>new Date(a.Date).getTime()>new Date(b.Date).getTime()); } }); From c07dd4f1d2950f778cfd5db23e01f0eff1cb7283 Mon Sep 17 00:00:00 2001 From: Ultrapingu Date: Mon, 25 Jan 2021 19:09:11 +0100 Subject: [PATCH 2/3] Fix issue #44 --- viewer/Smart Thermostats.html | 4 ++-- viewer/svt_viewer.js | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/viewer/Smart Thermostats.html b/viewer/Smart Thermostats.html index 7b557a1..3886364 100644 --- a/viewer/Smart Thermostats.html +++ b/viewer/Smart Thermostats.html @@ -66,11 +66,11 @@ data: data.heater.historic.map(function (item) { return { x: +(new Date(item.Date)), - y: (item.Data=="On" || item.Data.startsWith("Set Level"))?((item.Level==undefined)?100:(item.Level>100?100:item.Level)):0 + y: (item.Data=="On" || item.Data.startsWith("Set Level"))?((!data.heater.isDimmer)?100:(item.Level>100?100:item.Level)):0 } }) }); - console.log(series); + //console.log(series); chartElement.highcharts({ chart: { zoomType: 'x' diff --git a/viewer/svt_viewer.js b/viewer/svt_viewer.js index 4f4b154..51ed15e 100644 --- a/viewer/svt_viewer.js +++ b/viewer/svt_viewer.js @@ -15,6 +15,7 @@ class Thermostat { class Heater { constructor() { this.historic=undefined; + this.isDimmer=false; } } Date.prototype.yyyymmdd_hhmm = function() { @@ -90,7 +91,7 @@ function getThermostats() { $.ajax({url: request, async: false, success: function(resultTemp){ - console.log(resultTemp); + //console.log(resultTemp); thermostat.heater = new Heater(); thermostat.heater.historic = resultTemp.result.filter(item => new Date(item.Date).getTime() >= minDate).sort((a,b)=>new Date(a.Date).getTime()>new Date(b.Date).getTime()); } @@ -109,7 +110,9 @@ function getThermostats() { thermostat.setpoint = resultTemp2.result; } }); - + } + if(heatIdxs[0] == resultTemp.result[j].idx) { + thermostat.heater.isDimmer = resultTemp.result[j].SwitchType == "Dimmer"; } } } From 5679f2ce5d952bdc743289031d15cf66054b3eb2 Mon Sep 17 00:00:00 2001 From: Ultrapingu Date: Tue, 26 Jan 2021 19:47:55 +0100 Subject: [PATCH 3/3] remove useless affectation --- viewer/svt_viewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/viewer/svt_viewer.js b/viewer/svt_viewer.js index 08d0757..56e0f2f 100644 --- a/viewer/svt_viewer.js +++ b/viewer/svt_viewer.js @@ -93,7 +93,7 @@ function getThermostats() { success: function(resultTemp){ //console.log(resultTemp); thermostat.heater = new Heater(); - thermostat.heater.isDimmer = resultTemp.HaveDimmer; + //thermostat.heater.isDimmer = resultTemp.HaveDimmer; // not working, HaveDimmer always true thermostat.heater.historic = resultTemp.result.filter(item => new Date(item.Date).getTime() >= minDate).sort((a,b)=>new Date(a.Date).getTime()>new Date(b.Date).getTime()); } });