diff --git a/viewer/Smart Thermostats.html b/viewer/Smart Thermostats.html index 920f290..c3d3550 100644 --- a/viewer/Smart Thermostats.html +++ b/viewer/Smart Thermostats.html @@ -67,11 +67,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 58f479c..474a26c 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,8 +91,9 @@ function getThermostats() { $.ajax({url: request, async: false, success: function(resultTemp){ - console.log(resultTemp); + //console.log(resultTemp); thermostat.heater = new Heater(); + //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()); } }); @@ -109,7 +111,9 @@ function getThermostats() { thermostat.setpoint = resultTemp2.result; } }); - + } + if(heatIdxs[0] == resultTemp.result[j].idx) { + thermostat.heater.isDimmer = resultTemp.result[j].SwitchType == "Dimmer"; } } }