From 7257e8d1bde4e88ae86191bda68292fc3bd76136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fliger?= <dh@belevo.ch>
Date: Mon, 3 Nov 2025 14:57:00 +0100
Subject: [PATCH] no message

---
 Abrechnung/form.json | 87 ++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 60 deletions(-)

diff --git a/Abrechnung/form.json b/Abrechnung/form.json
index 771c91f..fc31c73 100644
--- a/Abrechnung/form.json
+++ b/Abrechnung/form.json
@@ -1,13 +1,8 @@
 {
   "elements": [
-    {
-      "type": "Label",
-      "caption": "⚙️  Abrechnungskonfiguration"
-    },
-
     {
       "type": "ExpansionPanel",
-      "caption": "Benutzer (Empfänger)",
+      "caption": "Benutzer",
       "items": [
         {
           "type": "List",
@@ -19,10 +14,10 @@
           "delete": true,
           "values": [],
           "columns": [
-            { "caption": "ID", "name": "id", "width": "10%", "add": "" },
-            { "caption": "Name", "name": "name", "width": "30%", "add": "" },
-            { "caption": "E-Mail", "name": "email", "width": "30%", "add": "" },
-            { "caption": "Adresse", "name": "address", "width": "30%", "add": "" }
+            { "caption": "Benutzer-ID", "name": "id", "width": "15%", "add": "" },
+            { "caption": "Name", "name": "name", "width": "35%", "add": "" },
+            { "caption": "Adresse", "name": "address", "width": "30%", "add": "" },
+            { "caption": "Ort", "name": "city", "width": "20%", "add": "" }
           ]
         }
       ]
@@ -30,23 +25,23 @@
 
     {
       "type": "ExpansionPanel",
-      "caption": "Zähler",
+      "caption": "Stromzähler",
       "items": [
         {
           "type": "List",
-          "name": "Meters",
-          "caption": "Zählerliste",
+          "name": "PowerMeters",
+          "caption": "Stromzählerliste",
           "rowCount": 5,
           "add": true,
           "edit": true,
           "delete": true,
           "values": [],
           "columns": [
-            { "caption": "ID", "name": "id", "width": "10%", "add": "" },
+            { "caption": "Zähler-ID", "name": "id", "width": "10%", "add": "" },
             { "caption": "Name", "name": "name", "width": "25%", "add": "" },
-            { "caption": "IPS-VariableID", "name": "variableid", "width": "20%", "add": 0 },
-            { "caption": "Benutzer-ID", "name": "user_id", "width": "20%", "add": "" },
-            { "caption": "Einheit", "name": "unit", "width": "15%", "add": "" }
+            { "caption": "VariableID Verbrauch", "name": "var_consumption", "width": "20%", "add": 0 },
+            { "caption": "VariableID Bezug", "name": "var_feed", "width": "20%", "add": 0 },
+            { "caption": "Benutzer-ID", "name": "user_id", "width": "25%", "add": "" }
           ]
         }
       ]
@@ -54,51 +49,23 @@
 
     {
       "type": "ExpansionPanel",
-      "caption": "Abrechnung (Schnellstart)",
+      "caption": "Wasserzähler / Verbrauchszähler",
       "items": [
         {
-          "type": "DatePicker",
-          "name": "from_date",
-          "caption": "Von (Datum)"
-        },
-        {
-          "type": "TimePicker",
-          "name": "from_time",
-          "caption": "Von (Zeit)"
-        },
-        {
-          "type": "DatePicker",
-          "name": "to_date",
-          "caption": "Bis (Datum)"
-        },
-        {
-          "type": "TimePicker",
-          "name": "to_time",
-          "caption": "Bis (Zeit)"
-        },
-        {
-          "type": "NumberSpinner",
-          "name": "work_price",
-          "caption": "Arbeitspreis (pro Einheit)",
-          "digits": 4,
-          "minimum": 0
-        },
-        {
-          "type": "NumberSpinner",
-          "name": "fixed_fee",
-          "caption": "Fixbetrag pro Benutzer (optional)",
-          "digits": 2,
-          "minimum": 0
-        },
-        {
-          "type": "Button",
-          "caption": "Abrechnung erzeugen (PDF)",
-          "onClick": "GenerateInvoices"
-        },
-        {
-          "type": "Label",
-          "name": "result",
-          "caption": ""
+          "type": "List",
+          "name": "WaterMeters",
+          "caption": "Verbrauchszählerliste",
+          "rowCount": 5,
+          "add": true,
+          "edit": true,
+          "delete": true,
+          "values": [],
+          "columns": [
+            { "caption": "Zähler-ID", "name": "id", "width": "15%", "add": "" },
+            { "caption": "Name", "name": "name", "width": "35%", "add": "" },
+            { "caption": "VariableID Verbrauch", "name": "var_consumption", "width": "25%", "add": 0 },
+            { "caption": "Benutzer-ID", "name": "user_id", "width": "25%", "add": "" }
+          ]
         }
       ]
     }