From 053dd89d20b3962203b26bfcb7c9d5e3e5a2f3ad Mon Sep 17 00:00:00 2001
From: "belevo\\mh" <mh@belevo.ch>
Date: Wed, 27 May 2026 11:45:34 +0200
Subject: [PATCH] no message

---
 Peakshaving/form.json | 172 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 156 insertions(+), 16 deletions(-)

diff --git a/Peakshaving/form.json b/Peakshaving/form.json
index b70d9e4..8d5428e 100644
--- a/Peakshaving/form.json
+++ b/Peakshaving/form.json
@@ -26,36 +26,176 @@
         }
       ]
     },
+
     {
       "type": "ExpansionPanel",
       "caption": "Monatswerte",
       "items": [
-        { "type": "NumberSpinner", "name": "CapacityJanuary", "caption": "Kapazität Januar [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerJanuary", "caption": "Leistung Januar [W]", "suffix": " W" },
 
-        { "type": "NumberSpinner", "name": "CapacityFebruary", "caption": "Kapazität Februar [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerFebruary", "caption": "Leistung Februar [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "Januar"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerJanuary",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityJanuary",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
 
-        { "type": "NumberSpinner", "name": "CapacityMarch", "caption": "Kapazität März [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerMarch", "caption": "Leistung März [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "Februar"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerFebruary",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityFebruary",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
 
-        { "type": "NumberSpinner", "name": "CapacityApril", "caption": "Kapazität April [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerApril", "caption": "Leistung April [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "März"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerMarch",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityMarch",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
 
-        { "type": "NumberSpinner", "name": "CapacitySummer", "caption": "Kapazität Sommer Mai–September [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerSummer", "caption": "Leistung Sommer Mai–September [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "April"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerApril",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityApril",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
 
-        { "type": "NumberSpinner", "name": "CapacityOctober", "caption": "Kapazität Oktober [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerOctober", "caption": "Leistung Oktober [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "Sommer (Mai–September)"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerSummer",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacitySummer",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
 
-        { "type": "NumberSpinner", "name": "CapacityNovember", "caption": "Kapazität November [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerNovember", "caption": "Leistung November [W]", "suffix": " W" },
+        {
+          "type": "Label",
+          "caption": "Oktober"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerOctober",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityOctober",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
+
+        {
+          "type": "Label",
+          "caption": "November"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerNovember",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityNovember",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        },
+
+        {
+          "type": "Label",
+          "caption": "Dezember"
+        },
+        {
+          "type": "RowLayout",
+          "items": [
+            {
+              "type": "NumberSpinner",
+              "name": "PowerDecember",
+              "caption": "Leistung Peakshaving [W]"
+            },
+            {
+              "type": "NumberSpinner",
+              "name": "CapacityDecember",
+              "caption": "Kapazität [%]"
+            }
+          ]
+        }
 
-        { "type": "NumberSpinner", "name": "CapacityDecember", "caption": "Kapazität Dezember [%]", "suffix": " %" },
-        { "type": "NumberSpinner", "name": "PowerDecember", "caption": "Leistung Dezember [W]", "suffix": " W" }
       ]
     }
   ],
+
   "actions": [
     {
       "type": "Button",