Version 3.73

Nall-chan · Jan 21, 2024 · ffd9b9f · ffd9b9f
1 parent daf6d20
commit ffd9b9f
Show file tree

Hide file tree

Showing 40 changed files with 260 additions and 121 deletions.
diff --git a/ClimacontrolRegulator/form.json b/ClimacontrolRegulator/form.json
@@ -23,10 +23,51 @@
             "expanded": true,
             "items": [
                 {
-                    "name": "enable_SCHEDULE",
-                    "type": "CheckBox",
-                    "caption": "Schedule",
-                    "width": "250px"
+                    "type": "RowLayout",
+                    "items": [
+                        {
+                            "name": "enable_SCHEDULE",
+                            "type": "CheckBox",
+                            "caption": "Schedule",
+                            "width": "250px"
+                        },
+                        {
+                            "type": "PopupButton",
+                            "caption": "Edit temperatures",
+                            "popup": {
+                                "caption": "Temperatures always displayed in the weekly schedule",
+                                "items": [
+                                    {
+                                        "type": "List",
+                                        "name": "ScheduleTemps",
+                                        "caption": "Temperatures",
+                                        "rowCount": 10,
+                                        "add": true,
+                                        "delete": true,
+                                        "sort": {
+                                            "column": "TemperatureValue",
+                                            "direction": "ascending"
+                                        },
+                                        "columns": [
+                                            {
+                                                "caption": "Temperature",
+                                                "name": "TemperatureValue",
+                                                "width": "auto",
+                                                "add": 21,
+                                                "edit": {
+                                                    "type": "NumberSpinner",
+                                                    "digits": 1,
+                                                    "minimum": 5,
+                                                    "maximum": 30,
+                                                    "suffix": " °C"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    ]
                 }
             ]
         },

diff --git a/ClimacontrolRegulator/locale.json b/ClimacontrolRegulator/locale.json
@@ -4,6 +4,9 @@
             "Address": "Adresse",
             "General": "Allgemein",
             "Changing the target temperature sets the mode to manual": "Verändern der Solltemperatur setzt Modus auf Manuell",
+            "Edit temperatures": "Temperaturen anpassen",
+            "Temperatures always displayed in the weekly schedule": "Immer im Wochenplan angezeigte Temperaturen",
+            "Temperatures": "Temperaturen",
             "Optional status variables": "Optionale Statusvariablen",
             "Schedule": "Zeitplan",
             "Schedule save": "Zeitplan speichern",

diff --git a/ClimacontrolRegulator/module.php b/ClimacontrolRegulator/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMHeatingDevice.php';  // HMBase Klasse
 

diff --git a/DisplayStatusAnzeige/README.md b/DisplayStatusAnzeige/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20version-3.71-blue.svg)]()
+[![Version](https://img.shields.io/badge/Modul%20version-3.73-blue.svg)]()
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)  
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://community.symcon.de/t/ip-symcon-6-1-stable-changelog/40276-IP-Symcon-5-1-%28Stable%29-Changelog)
 [![Check Style](https://github.com/Nall-chan/HomematicExtended/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions) [![Run Tests](https://github.com/Nall-chan/HomematicExtended/workflows/Run%20Tests/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions)  

diff --git a/DisplayStatusAnzeige/module.php b/DisplayStatusAnzeige/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMBase.php';  // HMBase Klasse
 

diff --git a/ExtendedConfigurator/README.md b/ExtendedConfigurator/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20version-3.71-blue.svg)]()
+[![Version](https://img.shields.io/badge/Modul%20version-3.73-blue.svg)]()
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)  
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://community.symcon.de/t/ip-symcon-6-1-stable-changelog/40276-IP-Symcon-5-1-%28Stable%29-Changelog)
 [![Check Style](https://github.com/Nall-chan/HomematicExtended/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions) [![Run Tests](https://github.com/Nall-chan/HomematicExtended/workflows/Run%20Tests/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions)   

diff --git a/ExtendedConfigurator/module.php b/ExtendedConfigurator/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMBase.php';  // HMBase Klasse
 require_once __DIR__ . '/../libs/HMTypes.php';  // HMTypes Data

diff --git a/HeatingDevice/form.json b/HeatingDevice/form.json
@@ -30,6 +30,42 @@
                             "type": "CheckBox",
                             "caption": "Schedule",
                             "width": "250px"
+                        },
+                        {
+                            "type": "PopupButton",
+                            "caption": "Edit temperatures",
+                            "popup": {
+                                "caption": "Temperatures always displayed in the weekly schedule",
+                                "items": [
+                                    {
+                                        "type": "List",
+                                        "name": "ScheduleTemps",
+                                        "caption": "Temperatures",
+                                        "rowCount": 10,
+                                        "add": true,
+                                        "delete": true,
+                                        "sort": {
+                                            "column": "TemperatureValue",
+                                            "direction": "ascending"
+                                        },
+                                        "columns": [
+                                            {
+                                                "caption": "Temperature",
+                                                "name": "TemperatureValue",
+                                                "width": "auto",
+                                                "add": 21,
+                                                "edit": {
+                                                    "type": "NumberSpinner",
+                                                    "digits": 1,
+                                                    "minimum": 5,
+                                                    "maximum": 30,
+                                                    "suffix": " °C"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
                         }
                     ]
                 }

diff --git a/HeatingDevice/locale.json b/HeatingDevice/locale.json
@@ -4,6 +4,9 @@
             "Address": "Adresse",
             "General": "Allgemein",
             "Changing the target temperature sets the mode to manual": "Verändern der Solltemperatur setzt Modus auf Manuell",
+            "Edit temperatures": "Temperaturen anpassen",
+            "Temperatures always displayed in the weekly schedule": "Immer im Wochenplan angezeigte Temperaturen",
+            "Temperatures": "Temperaturen",
             "Optional status variables": "Optionale Statusvariablen",
             "Control": "Regelung",
             "Schedule": "Zeitplan",

diff --git a/HeatingDevice/module.php b/HeatingDevice/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../HeatingGroup/module.php';  // HMBase Klasse
 

diff --git a/HeatingGroup/form.json b/HeatingGroup/form.json
@@ -36,6 +36,42 @@
                             "type": "CheckBox",
                             "caption": "Schedule",
                             "width": "250px"
+                        },
+                        {
+                            "type": "PopupButton",
+                            "caption": "Edit temperatures",
+                            "popup": {
+                                "caption": "Temperatures always displayed in the weekly schedule",
+                                "items": [
+                                    {
+                                        "type": "List",
+                                        "name": "ScheduleTemps",
+                                        "caption": "Temperatures",
+                                        "rowCount": 10,
+                                        "add": true,
+                                        "delete": true,
+                                        "sort": {
+                                            "column": "TemperatureValue",
+                                            "direction": "ascending"
+                                        },
+                                        "columns": [
+                                            {
+                                                "caption": "Temperature",
+                                                "name": "TemperatureValue",
+                                                "width": "auto",
+                                                "add": 21,
+                                                "edit": {
+                                                    "type": "NumberSpinner",
+                                                    "digits": 1,
+                                                    "minimum": 5,
+                                                    "maximum": 30,
+                                                    "suffix": " °C"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
                         }
                     ]
                 }

diff --git a/HeatingGroup/locale.json b/HeatingGroup/locale.json
@@ -4,6 +4,9 @@
             "Address": "Adresse",
             "General": "Allgemein",
             "Changing the target temperature sets the mode to manual": "Verändern der Solltemperatur setzt Modus auf Manuell",
+            "Edit temperatures": "Temperaturen anpassen",
+            "Temperatures always displayed in the weekly schedule": "Immer im Wochenplan angezeigte Temperaturen",
+            "Temperatures": "Temperaturen",
             "Optional status variables": "Optionale Statusvariablen",
             "Control": "Regelung",
             "Schedule": "Zeitplan",

diff --git a/HeatingGroup/module.php b/HeatingGroup/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMHeatingDevice.php';  // HMBase Klasse
 

diff --git a/HeatingGroupHmIP/form.json b/HeatingGroupHmIP/form.json
@@ -36,6 +36,42 @@
                             "type": "CheckBox",
                             "caption": "Schedule",
                             "width": "250px"
+                        },
+                        {
+                            "type": "PopupButton",
+                            "caption": "Edit temperatures",
+                            "popup": {
+                                "caption": "Temperatures always displayed in the weekly schedule",
+                                "items": [
+                                    {
+                                        "type": "List",
+                                        "name": "ScheduleTemps",
+                                        "caption": "Temperatures",
+                                        "rowCount": 10,
+                                        "add": true,
+                                        "delete": true,
+                                        "sort": {
+                                            "column": "TemperatureValue",
+                                            "direction": "ascending"
+                                        },
+                                        "columns": [
+                                            {
+                                                "caption": "Temperature",
+                                                "name": "TemperatureValue",
+                                                "width": "auto",
+                                                "add": 21,
+                                                "edit": {
+                                                    "type": "NumberSpinner",
+                                                    "digits": 1,
+                                                    "minimum": 5,
+                                                    "maximum": 30,
+                                                    "suffix": " °C"
+                                                }
+                                            }
+                                        ]
+                                    }
+                                ]
+                            }
                         }
                     ]
                 }
@@ -250,52 +286,6 @@
         }
     ],
     "actions": [
-        {
-            "type": "ExpansionPanel",
-            "caption": "Schedule",
-            "expanded": true,
-            "visible": false,
-            "items": [
-                {
-                    "type": "List",
-                    "add": true,
-                    "caption": "temperature steps",
-                    "name": "ScheduleColor",
-                    "onAdd": [
-                        "var_dump($ScheduleColor);"
-                    ],
-                    "onDelete": [
-                        "var_dump($ScheduleColor);"
-                    ],
-                    "columns": [
-                        {
-                            "caption": "Temperature",
-                            "name": "temperature",
-                            "width": "200px",
-                            "add": 5,
-                            "edit": {
-                                "type": "NumberSpinner",
-                                "digits": 1,
-                                "minimum": 5,
-                                "maximum": 30,
-                                "suffix": " °C"
-                            }
-                        },
-                        {
-                            "caption": "Color",
-                            "name": "color",
-                            "width": "200px",
-                            "add": 0,
-                            "edit": {
-                                "type": "SelectColor",
-                                "allowTransparent ": false
-                            }
-                        }
-                    ],
-                    "values": []
-                }
-            ]
-        },
         {
             "type": "TestCenter"
         },

diff --git a/HeatingGroupHmIP/locale.json b/HeatingGroupHmIP/locale.json
@@ -4,6 +4,9 @@
             "Address": "Adresse",
             "General": "Allgemein",
             "Changing the target temperature sets the mode to manual": "Verändern der Solltemperatur setzt Modus auf Manuell",
+            "Edit temperatures": "Temperaturen anpassen",
+            "Temperatures always displayed in the weekly schedule": "Immer im Wochenplan angezeigte Temperaturen",
+            "Temperatures": "Temperaturen",
             "Optional status variables": "Optionale Statusvariablen",
             "Control": "Regelung",
             "Schedule": "Zeitplan",

diff --git a/HeatingGroupHmIP/module.php b/HeatingGroupHmIP/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMHeatingDevice.php';  // HMBase Klasse
 

diff --git a/HomeMaticScript/README.md b/HomeMaticScript/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20version-3.71-blue.svg)]()
+[![Version](https://img.shields.io/badge/Modul%20version-3.73-blue.svg)]()
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)  
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://community.symcon.de/t/ip-symcon-6-1-stable-changelog/40276-IP-Symcon-5-1-%28Stable%29-Changelog)
 [![Check Style](https://github.com/Nall-chan/HomematicExtended/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions) [![Run Tests](https://github.com/Nall-chan/HomematicExtended/workflows/Run%20Tests/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions)  

diff --git a/HomeMaticScript/module.php b/HomeMaticScript/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMBase.php';
 

diff --git a/ParaInterface/module.php b/ParaInterface/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMBase.php';  // HMBase Klasse
 

diff --git a/PowerMeter/README.md b/PowerMeter/README.md
@@ -1,5 +1,5 @@
 [![SDK](https://img.shields.io/badge/Symcon-PHPModul-red.svg)](https://www.symcon.de/service/dokumentation/entwicklerbereich/sdk-tools/sdk-php/)
-[![Version](https://img.shields.io/badge/Modul%20version-3.71-blue.svg)]()
+[![Version](https://img.shields.io/badge/Modul%20version-3.73-blue.svg)]()
 [![License](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-green.svg)](https://creativecommons.org/licenses/by-nc-sa/4.0/)  
 [![Version](https://img.shields.io/badge/Symcon%20Version-6.1%20%3E-green.svg)](https://community.symcon.de/t/ip-symcon-6-1-stable-changelog/40276-IP-Symcon-5-1-%28Stable%29-Changelog)
 [![Check Style](https://github.com/Nall-chan/HomematicExtended/workflows/Check%20Style/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions) [![Run Tests](https://github.com/Nall-chan/HomematicExtended/workflows/Run%20Tests/badge.svg)](https://github.com/Nall-chan/HomematicExtended/actions)   

diff --git a/PowerMeter/module.php b/PowerMeter/module.php
@@ -11,7 +11,7 @@
  * @copyright     2023 Michael Tröger
  * @license       https://creativecommons.org/licenses/by-nc-sa/4.0/ CC BY-NC-SA 4.0
  *
- * @version       3.71
+ * @version       3.73
  */
 require_once __DIR__ . '/../libs/HMBase.php';  // HMBase Klasse