v1.40

demel42 · Nov 3, 2023 · 6d9db71 · 6d9db71
1 parent b7e097d
commit 6d9db71
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 45 deletions.
diff --git a/NetatmoWeatherDevice/module.php b/NetatmoWeatherDevice/module.php
@@ -767,6 +767,49 @@ private function GetFormElements()
 
         switch ($module_type) {
             case 'Station':
+                $entries = $this->getConfiguratorValues4Station();
+                if (count($entries) > 0) {
+                    $formElements[] = [
+                        'type'    => 'ExpansionPanel',
+                        'items'   => [
+                            [
+                                'name'    => 'ImportCategoryID',
+                                'type'    => 'SelectCategory',
+                                'caption' => 'category for modules to be created'
+                            ],
+                            [
+                                'type'    => 'Configurator',
+                                'name'    => 'Modules',
+                                'caption' => 'available modules',
+
+                                'rowCount' => count($entries),
+
+                                'add'     => false,
+                                'delete'  => false,
+                                'columns' => [
+                                    [
+                                        'caption' => 'Name',
+                                        'name'    => 'name',
+                                        'width'   => 'auto'
+                                    ],
+                                    [
+                                        'caption' => 'Type',
+                                        'name'    => 'module_desc',
+                                        'width'   => '200px'
+                                    ],
+                                    [
+                                        'caption' => 'Id',
+                                        'name'    => 'module_id',
+                                        'width'   => '200px'
+                                    ]
+                                ],
+                                'values' => $entries,
+                            ],
+                        ],
+                        'caption' => 'Modules'
+                    ];
+                }
+
                 $formElements[] = [
                     'type'    => 'ExpansionPanel',
                     'items'   => [
@@ -869,49 +912,6 @@ private function GetFormElements()
                     ],
                     'caption' => 'Wunderground'
                 ];
-
-                $entries = $this->getConfiguratorValues4Station();
-                if (count($entries) > 0) {
-                    $formElements[] = [
-                        'type'    => 'ExpansionPanel',
-                        'items'   => [
-                            [
-                                'name'    => 'ImportCategoryID',
-                                'type'    => 'SelectCategory',
-                                'caption' => 'category for modules to be created'
-                            ],
-                            [
-                                'type'    => 'Configurator',
-                                'name'    => 'Modules',
-                                'caption' => 'available modules',
-
-                                'rowCount' => count($entries),
-
-                                'add'     => false,
-                                'delete'  => false,
-                                'columns' => [
-                                    [
-                                        'caption' => 'Name',
-                                        'name'    => 'name',
-                                        'width'   => 'auto'
-                                    ],
-                                    [
-                                        'caption' => 'Type',
-                                        'name'    => 'module_desc',
-                                        'width'   => '200px'
-                                    ],
-                                    [
-                                        'caption' => 'Id',
-                                        'name'    => 'module_id',
-                                        'width'   => '200px'
-                                    ]
-                                ],
-                                'values' => $entries,
-                            ],
-                        ],
-                        'caption' => 'Modules'
-                    ];
-                }
                 break;
             case 'NAMain':
                 $items = [];

diff --git a/README.md b/README.md
@@ -424,8 +424,9 @@ GUIDs
 
 ## 7. Versions-Historie
 
-- 1.40 @ 15.10.2023 13:51
+- 1.40 @ 03.11.2023 18:22
   - Neu: Ermittlung von Speicherbedarf und Laufzeit (aktuell und für 31 Tage) und Anzeige im Panel "Information"
+  - Verbesserung: das Panel für die Module der STation ist nun direkt unter der "Basis-Konfiguration"
   - Fix: die Statistik der ApiCalls wird nicht mehr nach uri sondern nur noch host+cmd differenziert
   - Fix: Fehler abgefangen, das unter unklaren Umständen "time_utc" manchmal nicht übermittelt wird
   - update submodule CommonStubs

diff --git a/library.json b/library.json
@@ -8,5 +8,5 @@
 	},
 	"version": "1.40",
 	"build": 0,
-	"date": 1699005477
+	"date": 1699032137
 }