From b6ab35a2eda5fe42130c049301205b9ce4f3b7eb Mon Sep 17 00:00:00 2001
From: Jens Hartlep <jens@hartlep.email>
Date: Wed, 26 Oct 2022 20:34:35 +0200
Subject: [PATCH] added null check for .SET state in GenerateThermoPage. In the
 tado adapter, the level.temperature DP can be null if AWAY or power is off.
 In this case, use the configured minValue.

---
 .gitignore                             |  3 +++
 ioBroker/NsPanelTs.ts                  | 19 +++++++++++++------
 ioBroker/NsPanelTs_without_Examples.ts | 19 +++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e187435..bbcc3968 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 __pycache__/
 # don't add nextion2text
 HMI/Nextion2Text.py
+
+# don't add Webstorm project stuff
+.idea
\ No newline at end of file
diff --git a/ioBroker/NsPanelTs.ts b/ioBroker/NsPanelTs.ts
index 934d5da4..06c9bbec 100644
--- a/ioBroker/NsPanelTs.ts
+++ b/ioBroker/NsPanelTs.ts
@@ -2124,22 +2124,29 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
             let o = getObject(id);
             let name = page.heading !== undefined ? page.heading : o.common.name.de;
             let currentTemp = 0;
-            if (existsState(id + '.ACTUAL'))
+            if (existsState(id + '.ACTUAL')) {
                 currentTemp = (Math.round(parseFloat(getState(id + '.ACTUAL').val) * 10) / 10);
+            }
+
+            let minTemp = page.items[0].minValue !== undefined ? page.items[0].minValue : 50;   //Min Temp 5°C
+            let maxTemp = page.items[0].maxValue !== undefined ? page.items[0].maxValue : 300;  //Max Temp 30°C
+            let stepTemp = 5 // 0,5° Schritte
 
             let destTemp = 0;
             if (existsState(id + '.SET')) {
-                destTemp = getState(id + '.SET').val.toFixed(2) * 10;
+                // using minValue, if .SET is null (e.g. for tado AWAY or tado is off)
+                let setValue = getState(id + '.SET').val;
+                if (setValue == null) {
+                    setValue = minTemp;
+                }
+
+                destTemp = setValue.toFixed(2) * 10;
             }
             let statusStr: String = 'MANU';
             let status = '';
             if (existsState(id + '.MODE'))
                 status = getState(id + '.MODE').val;
 
-            let minTemp = page.items[0].minValue !== undefined ? page.items[0].minValue : 50;   //Min Temp 5°C
-            let maxTemp = page.items[0].maxValue !== undefined ? page.items[0].maxValue : 300;  //Max Temp 30°C
-            let stepTemp = 5 // 0,5° Schritte
-
             //Attribute hinzufügen, wenn im Alias definiert
             let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
             if ((i_list.length - 3) != 0) {
diff --git a/ioBroker/NsPanelTs_without_Examples.ts b/ioBroker/NsPanelTs_without_Examples.ts
index ae164f1b..c4c6182b 100644
--- a/ioBroker/NsPanelTs_without_Examples.ts
+++ b/ioBroker/NsPanelTs_without_Examples.ts
@@ -1740,22 +1740,29 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
             let o = getObject(id);
             let name = page.heading !== undefined ? page.heading : o.common.name.de;
             let currentTemp = 0;
-            if (existsState(id + '.ACTUAL'))
+            if (existsState(id + '.ACTUAL')) {
                 currentTemp = (Math.round(parseFloat(getState(id + '.ACTUAL').val) * 10) / 10);
+            }
+
+            let minTemp = page.items[0].minValue !== undefined ? page.items[0].minValue : 50;   //Min Temp 5°C
+            let maxTemp = page.items[0].maxValue !== undefined ? page.items[0].maxValue : 300;  //Max Temp 30°C
+            let stepTemp = 5 // 0,5° Schritte
 
             let destTemp = 0;
             if (existsState(id + '.SET')) {
-                destTemp = getState(id + '.SET').val.toFixed(2) * 10;
+                // using minValue, if .SET is null (e.g. for tado AWAY or tado is off)
+                let setValue = getState(id + '.SET').val;
+                if (setValue == null) {
+                    setValue = minTemp;
+                }
+
+                destTemp = setValue.toFixed(2) * 10;
             }
             let statusStr: String = 'MANU';
             let status = '';
             if (existsState(id + '.MODE'))
                 status = getState(id + '.MODE').val;
 
-            let minTemp = page.items[0].minValue !== undefined ? page.items[0].minValue : 50;   //Min Temp 5°C
-            let maxTemp = page.items[0].maxValue !== undefined ? page.items[0].maxValue : 300;  //Max Temp 30°C
-            let stepTemp = 5 // 0,5° Schritte
-
             //Attribute hinzufügen, wenn im Alias definiert
             let i_list = Array.prototype.slice.apply($('[state.id="' + id + '.*"]'));
             if ((i_list.length - 3) != 0) {