3 Ревизии 055a857883 ... e105fa69e3

Автор SHA1 Съобщение Дата
  gc-server3 e105fa69e3 Filter Wiedervorlage-Staffel hinzugefügt преди 1 седмица
  gc-server3 2dd08d6c6a Füge Unterstützung für Schaden_Details hinzu und aktualisiere Audit-Werte in der Detailverarbeitung преди 1 седмица
  gc-server3 585f7d49ff Buttons und Details angepasst преди 1 седмица

+ 26 - 1
app/routes.py

@@ -7,6 +7,8 @@ from decimal import Decimal
 from pathlib import Path
 from pathlib import Path
 from typing import Annotated
 from typing import Annotated
 from urllib.parse import urlencode
 from urllib.parse import urlencode
+from zoneinfo import ZoneInfo
+from zoneinfo import ZoneInfo
 
 
 from docxtpl import DocxTemplate
 from docxtpl import DocxTemplate
 from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
 from fastapi import APIRouter, Depends, Form, HTTPException, Request, status
@@ -410,6 +412,8 @@ async def post_forderungen_details(
         "Wiedervorlage": "",
         "Wiedervorlage": "",
         "Vers_Adresse_ID": "",
         "Vers_Adresse_ID": "",
         "Versicherung_Typ": "",
         "Versicherung_Typ": "",
+        "Schadennummer": "",
+        "Schaden_Details": "",
         "Reklamation_Begruendung": "",
         "Reklamation_Begruendung": "",
         "Rechtsanwalt_Begruendung": "",
         "Rechtsanwalt_Begruendung": "",
         "Rechtsanwalt_Aktenzeichen": "",
         "Rechtsanwalt_Aktenzeichen": "",
@@ -420,13 +424,34 @@ async def post_forderungen_details(
 
 
     async with request.form() as form:
     async with request.form() as form:
         for k, v in form.items():
         for k, v in form.items():
+            if k == "Versicherung_Schadennummer":
+                k = "Schadennummer"
             if k in data and k not in {"Client_DB", "Beleg_Nr", "Benutzer_ID", "Timestamp"}:
             if k in data and k not in {"Client_DB", "Beleg_Nr", "Benutzer_ID", "Timestamp"}:
                 if v == "on":
                 if v == "on":
                     v = "J"
                     v = "J"
-                if re.match(r"\d+,?\d*", v):
+                if k in {"Selbstbeteiligung_Betrag", "Mwst_Betrag"}:
                     v = v.replace(",", ".")
                     v = v.replace(",", ".")
                 data[k] = v
                 data[k] = v
 
 
+    try:
+        data["Wiedervorlage"] = parse_filter_date(data["Wiedervorlage"]) if data["Wiedervorlage"] else None
+    except ValueError as error:
+        raise HTTPException(422, "Bitte ein gültiges Wiedervorlagedatum auswählen.") from error
+
+    # Set audit values after reading the form so clients cannot override them.
+    # SQL Server datetime stores local wall time without a timezone offset.
+    data.update(
+        Bearbeitung_Benutzer_ID=principal.username,
+        Bearbeitung_Timestamp=datetime.now(ZoneInfo("Europe/Berlin")).replace(tzinfo=None),
+    )
+
+    # Set audit values after reading the form so clients cannot override them.
+    # SQL Server datetime stores local wall time without a timezone offset.
+    data.update(
+        Bearbeitung_Benutzer_ID=principal.username,
+        Bearbeitung_Timestamp=datetime.now(ZoneInfo("Europe/Berlin")).replace(tzinfo=None),
+    )
+
     if source not in {"comments", "details"}:
     if source not in {"comments", "details"}:
         raise HTTPException(status_code=400, detail="Ungültige Datenquelle")
         raise HTTPException(status_code=400, detail="Ungültige Datenquelle")
     query = templates.TemplateResponse(
     query = templates.TemplateResponse(

+ 40 - 3
static/assets/css/details.css

@@ -5,6 +5,9 @@
   --text-light: #52616f;
   --text-light: #52616f;
   --border: #dce2e7;
   --border: #dce2e7;
   --cui-primary: #72889b;
   --cui-primary: #72889b;
+  --gc-button-orange: #c45500;
+  --gc-button-orange-hover: #a74700;
+  --gc-button-orange-active: #8f3e00;
   font-size: 1.0625rem;
   font-size: 1.0625rem;
   width: 100%;
   width: 100%;
   padding: 0 0 2rem;
   padding: 0 0 2rem;
@@ -31,7 +34,7 @@ body:has(.gc-detail-page) { max-width: 1840px; }
 .gc-context-heading h1 { margin: .25rem 0; font-size: clamp(1.325rem, 1.6vw, 1.75rem); line-height: 1.4; font-weight: 700; overflow-wrap: anywhere; }
 .gc-context-heading h1 { margin: .25rem 0; font-size: clamp(1.325rem, 1.6vw, 1.75rem); line-height: 1.4; font-weight: 700; overflow-wrap: anywhere; }
 .gc-context-heading p { margin: 0; font-size: 1.0625rem; }
 .gc-context-heading p { margin: 0; font-size: 1.0625rem; }
 .gc-context-heading p span { color: #52616f; }
 .gc-context-heading p span { color: #52616f; }
-.gc-detail-page .gc-back-link { padding: 0; font-size: 1rem; color: #3c5263; text-decoration: none; }
+.gc-detail-page .gc-back-link { font-size: 1rem; text-decoration: none; }
 .gc-context-metrics { display: flex; gap: .65rem; flex-wrap: wrap; }
 .gc-context-metrics { display: flex; gap: .65rem; flex-wrap: wrap; }
 .gc-metric { display: flex; flex-direction: column; gap: .15rem; padding: .6rem .85rem; border-radius: 8px; }
 .gc-metric { display: flex; flex-direction: column; gap: .15rem; padding: .6rem .85rem; border-radius: 8px; }
 .gc-metric span { font-size: 1rem; }
 .gc-metric span { font-size: 1rem; }
@@ -57,8 +60,37 @@ body:has(.gc-detail-page) { max-width: 1840px; }
 .gc-data-more summary { cursor: pointer; padding: .65rem 1rem; font-size: 1rem; font-weight: 600; color: #354f63; }
 .gc-data-more summary { cursor: pointer; padding: .65rem 1rem; font-size: 1rem; font-weight: 600; color: #354f63; }
 .gc-data-more[open] summary { background: #f4f6f8; }
 .gc-data-more[open] summary { background: #f4f6f8; }
 .gc-detail-page .btn { white-space: normal !important; border-radius: 6px; font-size: 1.0625rem; padding: .5rem .75rem; }
 .gc-detail-page .btn { white-space: normal !important; border-radius: 6px; font-size: 1.0625rem; padding: .5rem .75rem; }
-/* Dark text on the exact corporate action color meets text contrast requirements. */
-.gc-detail-page .btn-primary { --cui-btn-bg: #72889b; --cui-btn-border-color: #72889b; --cui-btn-color: #101b24; --cui-btn-hover-bg: #c3ccd4; --cui-btn-hover-color: #101b24; --cui-btn-hover-border-color: #72889b; --cui-btn-active-bg: #b1bcc7; --cui-btn-active-color: #101b24; }
+/* Orange gives the main action a clear emphasis against the blue-grey panels. */
+.gc-detail-page .btn-primary {
+  --cui-btn-bg: var(--gc-button-orange);
+  --cui-btn-border-color: var(--gc-button-orange);
+  --cui-btn-color: #fff;
+  --cui-btn-hover-bg: var(--gc-button-orange-hover);
+  --cui-btn-hover-border-color: var(--gc-button-orange-hover);
+  --cui-btn-hover-color: #fff;
+  --cui-btn-active-bg: var(--gc-button-orange-active);
+  --cui-btn-active-border-color: var(--gc-button-orange-active);
+  --cui-btn-active-color: #fff;
+  --cui-btn-disabled-bg: var(--gc-button-orange);
+  --cui-btn-disabled-border-color: var(--gc-button-orange);
+  --cui-btn-disabled-color: #fff;
+  --cui-btn-focus-shadow-rgb: 196, 85, 0;
+}
+.gc-detail-page .btn-outline-primary {
+  --cui-btn-color: var(--gc-button-orange);
+  --cui-btn-bg: #fff;
+  --cui-btn-border-color: var(--gc-button-orange);
+  --cui-btn-hover-bg: #fff1e6;
+  --cui-btn-hover-border-color: var(--gc-button-orange-hover);
+  --cui-btn-hover-color: var(--gc-button-orange-hover);
+  --cui-btn-active-bg: #ffe1c7;
+  --cui-btn-active-border-color: var(--gc-button-orange-active);
+  --cui-btn-active-color: var(--gc-button-orange-active);
+  --cui-btn-disabled-color: var(--gc-button-orange);
+  --cui-btn-disabled-border-color: var(--gc-button-orange);
+  --cui-btn-focus-shadow-rgb: 196, 85, 0;
+}
+.gc-detail-page :is(.gc-back-link, .gc-form-actions > a) { --cui-btn-bg: #fff; }
 .gc-detail-page .btn-outline-secondary { --cui-btn-color: #354f63; --cui-btn-border-color: #b1bcc7; --cui-btn-hover-bg: #cdd4da; --cui-btn-hover-color: #182630; --cui-btn-hover-border-color: #72889b; }
 .gc-detail-page .btn-outline-secondary { --cui-btn-color: #354f63; --cui-btn-border-color: #b1bcc7; --cui-btn-hover-bg: #cdd4da; --cui-btn-hover-color: #182630; --cui-btn-hover-border-color: #72889b; }
 .gc-detail-page .btn-link { color: #354f63; }
 .gc-detail-page .btn-link { color: #354f63; }
 .gc-detail-page .gc-workflow-form { margin: 0; padding: 1rem; --cui-gutter-x: 0; --cui-gutter-y: .75rem; }
 .gc-detail-page .gc-workflow-form { margin: 0; padding: 1rem; --cui-gutter-x: 0; --cui-gutter-y: .75rem; }
@@ -70,6 +102,11 @@ body:has(.gc-detail-page) { max-width: 1840px; }
 .gc-workflow-form .card-body .row, .gc-workflow-form .gc-follow-up .row { display: flex; flex-wrap: wrap; gap: .5rem; margin: 0 0 .85rem; }
 .gc-workflow-form .card-body .row, .gc-workflow-form .gc-follow-up .row { display: flex; flex-wrap: wrap; gap: .5rem; margin: 0 0 .85rem; }
 .gc-workflow-form .row > .col-form-label { flex: 0 0 100%; padding: 0; font-size: 1rem; color: #52616f; }
 .gc-workflow-form .row > .col-form-label { flex: 0 0 100%; padding: 0; font-size: 1rem; color: #52616f; }
 .gc-workflow-form .row > div { flex: 1 1 7rem; padding: 0; }
 .gc-workflow-form .row > div { flex: 1 1 7rem; padding: 0; }
+.gc-workflow-form .card-body .gc-insurance-amount-row { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); align-items: start; }
+.gc-workflow-form .gc-insurance-amount-row > label { grid-column: 1 / -1; width: auto; }
+.gc-workflow-form .gc-insurance-amount-row > div { width: auto; }
+.gc-workflow-form .gc-insurance-amount-row > .gc-amount-suggestion { grid-column: 2; }
+.gc-workflow-form #Schaden_Details { resize: vertical; }
 .gc-workflow-form .card-body > .col-3 { width: auto; }
 .gc-workflow-form .card-body > .col-3 { width: auto; }
 .gc-workflow-form :is(.form-control, .form-select) { width: 100%; font-size: 1.0625rem; min-height: 38px; border-color: #b1bcc7; }
 .gc-workflow-form :is(.form-control, .form-select) { width: 100%; font-size: 1.0625rem; min-height: 38px; border-color: #b1bcc7; }
 .gc-detail-page input[type="date"]::-webkit-datetime-edit-year-field,
 .gc-detail-page input[type="date"]::-webkit-datetime-edit-year-field,

+ 1 - 1
templates/base/base.html

@@ -23,7 +23,7 @@
   <link href="/static/assets/css/main.css" rel="stylesheet">
   <link href="/static/assets/css/main.css" rel="stylesheet">
   <link href="/static/assets/css/app.css" rel="stylesheet">
   <link href="/static/assets/css/app.css" rel="stylesheet">
 
 
-  <link href="/static/assets/css/details.css?v=3" rel="stylesheet">
+  <link href="/static/assets/css/details.css?v=5" rel="stylesheet">
   <link href="/static/assets/css/list.css?v=2" rel="stylesheet">
   <link href="/static/assets/css/list.css?v=2" rel="stylesheet">
   <link href="/static/assets/css/dashboard.css" rel="stylesheet">
   <link href="/static/assets/css/dashboard.css" rel="stylesheet">
   <script src="/static/assets/js/dashboard.js" defer></script>
   <script src="/static/assets/js/dashboard.js" defer></script>

+ 1 - 1
templates/forderungen/details/details.html

@@ -5,7 +5,7 @@
 {% set row = forderungen_details[0] %}
 {% set row = forderungen_details[0] %}
 <section class="gc-case-context" aria-label="Aktueller Beleg">
 <section class="gc-case-context" aria-label="Aktueller Beleg">
   <div class="gc-context-heading">
   <div class="gc-context-heading">
-    <a class="btn btn-link gc-back-link" href="{{ return_url }}" hx-boost="false" data-gc-return-url="{{ return_url }}">← Zurück</a>
+    <a class="btn btn-outline-secondary gc-back-link" href="{{ return_url }}" hx-boost="false" data-gc-return-url="{{ return_url }}">← Zurück zur Liste</a>
     <h1>{{ row.Beleg_Text }}</h1>
     <h1>{{ row.Beleg_Text }}</h1>
     <p>{{ row.Kunde_Name }} <span>· {{ row.Kunde_Nr }}</span></p>
     <p>{{ row.Kunde_Name }} <span>· {{ row.Kunde_Nr }}</span></p>
   </div>
   </div>

+ 13 - 6
templates/forderungen/details/details_formular.html

@@ -52,6 +52,12 @@
         </div>
         </div>
       </div>
       </div>
       <div class="row mb-3">
       <div class="row mb-3">
+        <label for="Schaden_Details" class="col-sm-3 col-form-label">Schaden Beschreibung</label>
+        <div class="col-sm-9">
+          <textarea class="form-control" id="Schaden_Details" name="Schaden_Details" rows="3">{{ row.Schaden_Details|default('', true) }}</textarea>
+        </div>
+      </div>
+      <div class="row mb-3 gc-insurance-amount-row">
         <label for="Selbstbeteiligung" class="col-sm-3 col-form-label">Selbstbeteiligung</label>
         <label for="Selbstbeteiligung" class="col-sm-3 col-form-label">Selbstbeteiligung</label>
         <div class="col-sm-3">
         <div class="col-sm-3">
           <select id="Selbstbeteiligung" name="Selbstbeteiligung" class="form-select">
           <select id="Selbstbeteiligung" name="Selbstbeteiligung" class="form-select">
@@ -66,7 +72,7 @@
             aria-label="Selbstbeteiligung Betrag" placeholder="Betrag" value="{{ row.Selbstbeteiligung_Betrag }}">
             aria-label="Selbstbeteiligung Betrag" placeholder="Betrag" value="{{ row.Selbstbeteiligung_Betrag }}">
         </div>
         </div>
       </div>
       </div>
-      <div class="row mb-3">
+      <div class="row mb-3 gc-insurance-amount-row">
         <label for="MwSt" class="col-sm-3 col-form-label">MwSt</label>
         <label for="MwSt" class="col-sm-3 col-form-label">MwSt</label>
         <div class="col-sm-3">
         <div class="col-sm-3">
           <select id="MwSt" name="Mwst" class="form-select">
           <select id="MwSt" name="Mwst" class="form-select">
@@ -80,10 +86,11 @@
           <input type="text" class="form-control" id="Mwst_Betrag" name="Mwst_Betrag" aria-label="Mehrwertsteuer Betrag" placeholder="Betrag"
           <input type="text" class="form-control" id="Mwst_Betrag" name="Mwst_Betrag" aria-label="Mehrwertsteuer Betrag" placeholder="Betrag"
             value="{{ row.Mwst_Betrag|number_format }}">
             value="{{ row.Mwst_Betrag|number_format }}">
         </div>
         </div>
-        <div class="col-sm-3">
+        <div class="col-sm-3 gc-amount-suggestion">
           <button type="button" class="btn btn-outline-secondary" hx-disable="true"
           <button type="button" class="btn btn-outline-secondary" hx-disable="true"
+            aria-label="Berechnete Mehrwertsteuer übernehmen"
             onclick="document.getElementById('Mwst_Betrag').value='{{ row.Mwst_Betrag_berechnet|number_format }}';">
             onclick="document.getElementById('Mwst_Betrag').value='{{ row.Mwst_Betrag_berechnet|number_format }}';">
-            <i class="cil-arrow-thick-left"></i>
+            <i class="cil-arrow-thick-top" aria-hidden="true"></i>
             {{ row.Mwst_Betrag_berechnet|number_format }}</button>
             {{ row.Mwst_Betrag_berechnet|number_format }}</button>
         </div>
         </div>
       </div>
       </div>
@@ -208,9 +215,9 @@
   </div>
   </div>
 
 
   <div class="col-12 gc-form-actions">
   <div class="col-12 gc-form-actions">
-    <button type="button" class="btn btn-primary" hx-post="" hx-trigger="click" hx-swap="outerHTML" hx-target="#formular" hx-push-url="false">Speichern</button>
-    <button type="button" class="btn btn-outline-secondary" hx-post="" hx-trigger="click" hx-swap="innerHTML" hx-target="body" hx-push-url="true" hx-vals='{"redirect": "list"}'">Speichern &amp; Zurück</button>
-    <a class="btn btn-link" href="{{ return_url }}" hx-boost="false">Zurück</a>
+    <button type="button" class="btn btn-primary" hx-post="" hx-trigger="click" hx-swap="outerHTML" hx-target="#formular" hx-push-url="false"><i class="icon cil-save me-1" aria-hidden="true"></i>Speichern</button>
+    <button type="button" class="btn btn-outline-primary" hx-post="" hx-trigger="click" hx-swap="innerHTML" hx-target="body" hx-push-url="true" hx-vals='{"redirect": "list"}'>Speichern &amp; zurück</button>
+    <a class="btn btn-outline-secondary" href="{{ return_url }}" hx-boost="false">Zurück zur Liste</a>
   </div>
   </div>
 
 
 
 

+ 4 - 0
templates/forderungen/details/queries/forderungen_details.sql

@@ -28,12 +28,16 @@ SELECT [F].*
      , isnull([FD].[Mwst_Betrag], 0.0) AS [Mwst_Betrag]
      , isnull([FD].[Mwst_Betrag], 0.0) AS [Mwst_Betrag]
      , isnull([FD].[Vers_Adresse_ID], '') AS [Vers_Adresse_ID]
      , isnull([FD].[Vers_Adresse_ID], '') AS [Vers_Adresse_ID]
      , isnull([FD].[Versicherung_Typ], '') AS [Versicherung_Typ]
      , isnull([FD].[Versicherung_Typ], '') AS [Versicherung_Typ]
+     , isnull([FD].[Schadennummer], '') AS [Versicherung_Schadennummer]
+     , isnull([FD].[Schaden_Details], '') AS [Schaden_Details]
      , isnull([FD].[Reklamation_Begruendung], '') AS [Reklamation_Begruendung]
      , isnull([FD].[Reklamation_Begruendung], '') AS [Reklamation_Begruendung]
      , isnull([FD].[Rechtsanwalt_Begruendung], '') AS [Rechtsanwalt_Begruendung]
      , isnull([FD].[Rechtsanwalt_Begruendung], '') AS [Rechtsanwalt_Begruendung]
      , isnull([FD].[Rechtsanwalt_Aktenzeichen], '') AS [Rechtsanwalt_Aktenzeichen]
      , isnull([FD].[Rechtsanwalt_Aktenzeichen], '') AS [Rechtsanwalt_Aktenzeichen]
      , isnull([FD].[Rechtsanwalt_Stand], '') AS [Rechtsanwalt_Stand]
      , isnull([FD].[Rechtsanwalt_Stand], '') AS [Rechtsanwalt_Stand]
      , isnull([FD].[Mahnen_Begruendung], '') AS [Mahnen_Begruendung]
      , isnull([FD].[Mahnen_Begruendung], '') AS [Mahnen_Begruendung]
      , isnull([FD].[Wiedervorlage], coalesce([FD].[Wiedervorlage], dateadd(DAY, 14, [F].[Beleg_Datum]))) AS [Wiedervorlage]
      , isnull([FD].[Wiedervorlage], coalesce([FD].[Wiedervorlage], dateadd(DAY, 14, [F].[Beleg_Datum]))) AS [Wiedervorlage]
+     , FD.Bearbeitung_Benutzer_ID
+     , FD.Bearbeitung_Timestamp
      , [V].[Vers_Name]
      , [V].[Vers_Name]
      , [V].[Vers_Adresse]
      , [V].[Vers_Adresse]
      , [V].[Vers_PLZ]
      , [V].[Vers_PLZ]

+ 5 - 1
templates/forderungen/details/queries/post/post_details.sql

@@ -10,6 +10,8 @@ IF NOT exists (SELECT 1
 
 
 UPDATE [dbo].[Forderungen_Details]
 UPDATE [dbo].[Forderungen_Details]
 SET [Bearbeitet] = 'J'
 SET [Bearbeitet] = 'J'
+  , [Bearbeitung_Benutzer_ID] = :Bearbeitung_Benutzer_ID
+  , [Bearbeitung_Timestamp] = :Bearbeitung_Timestamp
   , [Versicherung] = :Versicherung
   , [Versicherung] = :Versicherung
   , [Rechtsanwalt] = :Rechtsanwalt
   , [Rechtsanwalt] = :Rechtsanwalt
   , [Reklamation] = :Reklamation
   , [Reklamation] = :Reklamation
@@ -18,9 +20,11 @@ SET [Bearbeitet] = 'J'
   , [Selbstbeteiligung_Betrag] = :Selbstbeteiligung_Betrag
   , [Selbstbeteiligung_Betrag] = :Selbstbeteiligung_Betrag
   , [Mwst] = :Mwst
   , [Mwst] = :Mwst
   , [Mwst_Betrag] = :Mwst_Betrag
   , [Mwst_Betrag] = :Mwst_Betrag
-  , [Wiedervorlage] = NULLIF(:Wiedervorlage, '')
+  , [Wiedervorlage] = :Wiedervorlage
   , [Vers_Adresse_ID] = :Vers_Adresse_ID
   , [Vers_Adresse_ID] = :Vers_Adresse_ID
   , [Versicherung_Typ] = :Versicherung_Typ
   , [Versicherung_Typ] = :Versicherung_Typ
+  , [Schadennummer] = :Schadennummer
+  , [Schaden_Details] = :Schaden_Details
   , [Reklamation_Begruendung] = :Reklamation_Begruendung
   , [Reklamation_Begruendung] = :Reklamation_Begruendung
   , [Rechtsanwalt_Begruendung] = :Rechtsanwalt_Begruendung
   , [Rechtsanwalt_Begruendung] = :Rechtsanwalt_Begruendung
   , [Rechtsanwalt_Aktenzeichen] = :Rechtsanwalt_Aktenzeichen
   , [Rechtsanwalt_Aktenzeichen] = :Rechtsanwalt_Aktenzeichen

+ 1 - 1
templates/forderungen/liste/config/liste_filter.csv

@@ -13,7 +13,7 @@ RechnungsdatumBis;date;2;RG-Datum bis;Beleg_Datum;;;
 
 
 Staffel;select;2;;Staffel_Text;;;
 Staffel;select;2;;Staffel_Text;;;
 Mahnstufe;select;2;;;;;
 Mahnstufe;select;2;;;;;
-Bearbeitet;select;2;;;;;
+WVStaffel;select;2;WV-Staffel;Wiedervorlage_Staffel_Nr;Wiedervorlage_Staffel_Text;;
 Abwarten;select;2;;;;;
 Abwarten;select;2;;;;;
 WiedervorlageVon;date;2;Wiedervorlage von;Wiedervorlage;;;
 WiedervorlageVon;date;2;Wiedervorlage von;Wiedervorlage;;;
 WiedervorlageBis;date;2;Wiedervorlage bis;Wiedervorlage;;;
 WiedervorlageBis;date;2;Wiedervorlage bis;Wiedervorlage;;;

+ 1 - 1
templates/forderungen/liste/liste_zeile.html

@@ -83,7 +83,7 @@
   </td>
   </td>
 
 
   <td class="text-end">
   <td class="text-end">
-    <button type="button" class="gc-list-badge gc-list-badge-{{ row.Wiedervorlage_Stufe }} gc-wiedervorlage-edit"
+    <button type="button" class="gc-list-badge gc-list-badge-{{ row.Wiedervorlage_Staffel_Nr }} gc-wiedervorlage-edit"
       hx-get="/app/forderungen/liste/{{ primary_key|urlencode }}/wiedervorlage?return_to={{ origin|urlencode }}"
       hx-get="/app/forderungen/liste/{{ primary_key|urlencode }}/wiedervorlage?return_to={{ origin|urlencode }}"
       hx-target="#wiedervorlage-modal-content" hx-swap="innerHTML" hx-push-url="false"
       hx-target="#wiedervorlage-modal-content" hx-swap="innerHTML" hx-push-url="false"
       hx-sync="#wiedervorlage-modal:replace" aria-haspopup="dialog" aria-controls="wiedervorlage-modal"
       hx-sync="#wiedervorlage-modal:replace" aria-haspopup="dialog" aria-controls="wiedervorlage-modal"

+ 2 - 1
tests/test_forderung_list.py

@@ -32,7 +32,8 @@ def invoice(number=0, **changes):
         Bearbeitet="N",
         Bearbeitet="N",
         Abwarten="",
         Abwarten="",
         Wiedervorlage=date(2026, 11, 1),
         Wiedervorlage=date(2026, 11, 1),
-        Wiedervorlage_Stufe="0",
+        Wiedervorlage_Staffel_Nr="0",
+        Wiedervorlage_Staffel_Text="noch nicht fällig",
         Beleg_Betrag=20,
         Beleg_Betrag=20,
         Beleg_Offen=10,
         Beleg_Offen=10,
         Kunde_offen_gesamt=50,
         Kunde_offen_gesamt=50,

+ 97 - 1
tests/test_navigation.py

@@ -1,8 +1,9 @@
 import unittest
 import unittest
-from datetime import date
+from datetime import date, datetime
 from types import SimpleNamespace
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 from unittest.mock import MagicMock, patch
 from urllib.parse import parse_qs, urlencode, urlsplit
 from urllib.parse import parse_qs, urlencode, urlsplit
+from zoneinfo import ZoneInfo
 
 
 from fastapi import FastAPI
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from fastapi.testclient import TestClient
@@ -238,6 +239,101 @@ class DetailReturnTests(unittest.TestCase):
         self.assertEqual(native.status_code, 303)
         self.assertEqual(native.status_code, 303)
         self.assertEqual(native.headers["location"], self.return_url)
         self.assertEqual(native.headers["location"], self.return_url)
 
 
+    def test_rendered_save_and_back_supplies_all_sql_parameters(self):
+        import json
+        from html.parser import HTMLParser
+
+        class DetailForm(HTMLParser):
+            active = False
+
+            def __init__(self):
+                super().__init__()
+                self.values = {}
+                self.save_back = None
+                self.textarea = None
+
+            def handle_starttag(self, tag, attrs):
+                attrs = dict(attrs)
+                if tag == "form":
+                    self.active = attrs.get("id") == "formular"
+                if not self.active:
+                    return
+                if tag == "input" and attrs.get("name"):
+                    if attrs.get("type") != "checkbox" or "checked" in attrs:
+                        self.values[attrs["name"]] = attrs.get("value", "on")
+                if tag == "button" and "hx-vals" in attrs:
+                    self.save_back = attrs
+                if tag == "textarea" and attrs.get("name"):
+                    self.textarea = attrs["name"]
+                    self.values[self.textarea] = ''
+
+            def handle_data(self, data):
+                if self.textarea:
+                    self.values[self.textarea] += data
+
+            def handle_endtag(self, tag):
+                if tag == "textarea":
+                    self.textarea = None
+                if tag == "form":
+                    self.active = False
+
+        self.row['Versicherung_Schadennummer'] = 'SCH-123,45'
+        self.row['Schaden_Details'] = 'Stoßfänger beschädigt <vorne> & rechts.\nLackierung nötig, 2 Teile.'
+        response = self.client.get('/app/forderungen/details/1_R1', params={'return_to': self.return_url})
+        self.assertEqual(response.status_code, 200)
+        form = DetailForm()
+        form.feed(response.text)
+        self.assertIsNotNone(form.save_back)
+        self.assertNotIn('"', form.save_back)
+        submitted = {**form.values, **json.loads(form.save_back['hx-vals'])}
+        submitted['Wiedervorlage'] = '2026-11-18'
+
+        def check_bindings(statement, values):
+            # Exercise SQLAlchemy's actual required-parameter validation; a plain
+            # MagicMock accepted the missing Schadennummer parameter unnoticed.
+            statement.compile().construct_params(values)
+            return MagicMock(first=lambda: (1,))
+
+        self.db.execute.side_effect = check_bindings
+        response = self.client.post('/app/forderungen/details/1_R1', data=submitted, headers={'HX-Request': 'true'})
+        self.assertEqual(response.status_code, 200)
+        self.db.commit.assert_called_once()
+        self.assertEqual(response.headers['HX-Redirect'], self.return_url)
+        update = next(call for call in self.db.execute.call_args_list if str(call.args[0]).lstrip().startswith('UPDATE'))
+        self.assertEqual(update.args[1]['Schadennummer'], 'SCH-123,45')
+        self.assertEqual(update.args[1]['Schaden_Details'], self.row['Schaden_Details'])
+        self.assertIn('[Schaden_Details] = :Schaden_Details', str(update.args[0]))
+        self.assertEqual(update.args[1]['Wiedervorlage'], date(2026, 11, 18))
+
+    def test_form_saves_stamp_authenticated_user_and_server_time(self):
+        for redirect in ('', 'list'):
+            with self.subTest(redirect=redirect):
+                self.db.reset_mock()
+                before = datetime.now(ZoneInfo('Europe/Berlin')).replace(tzinfo=None)
+                response = self.client.post('/app/forderungen/details/1_R1', data={
+                    'source': 'details', 'redirect': redirect, 'return_to': self.return_url,
+                    'Schaden_Details': 'Neue Schadenbeschreibung',
+                    'Bearbeitung_Benutzer_ID': 'forged-user',
+                    'Bearbeitung_Timestamp': '2000-01-01T00:00:00',
+                }, headers={'HX-Request': 'true'})
+                after = datetime.now(ZoneInfo('Europe/Berlin')).replace(tzinfo=None)
+                self.assertEqual(response.status_code, 200)
+                update = next(call for call in self.db.execute.call_args_list
+                              if str(call.args[0]).lstrip().startswith('UPDATE'))
+                statement, values = update.args
+                statement.compile().construct_params(values)
+                self.assertIn('[Bearbeitung_Benutzer_ID] = :Bearbeitung_Benutzer_ID', str(statement))
+                self.assertIn('[Bearbeitung_Timestamp] = :Bearbeitung_Timestamp', str(statement))
+                self.assertEqual(values['Bearbeitung_Benutzer_ID'], 'tester')
+                self.assertEqual(values['Schaden_Details'], 'Neue Schadenbeschreibung')
+                self.assertIs(type(values['Bearbeitung_Timestamp']), datetime)
+                self.assertIsNone(values['Bearbeitung_Timestamp'].tzinfo)
+                self.assertLessEqual(before, values['Bearbeitung_Timestamp'])
+                self.assertLessEqual(values['Bearbeitung_Timestamp'], after)
+                self.db.commit.assert_called_once()
+                if redirect:
+                    self.assertEqual(response.headers['HX-Redirect'], self.return_url)
+
     def test_failed_save_does_not_return_and_external_target_is_ignored(self):
     def test_failed_save_does_not_return_and_external_target_is_ignored(self):
         self.db.commit.side_effect = RuntimeError("test database unavailable")
         self.db.commit.side_effect = RuntimeError("test database unavailable")
         response = self.client.post(
         response = self.client.post(