Bump version to 1.0.1.3

Bug was introduced by commit 9930e6173c
and shipped with v0.10.6 (2024-08-30)

.gitea/workflows/deploy.yaml

@@ -1,7 +1,7 @@
 name: Deploy
 on:
   push:
-    tags: ["v[0-9]+.[0-9]+.[0-9]+"]
+    tags: ["v[0-9]+.[0-9]+.[0-9]+.[0-9]+"]
 jobs:
   deploy:
     name: Build and Deploy

.gitea/workflows/test.yaml

@@ -1,7 +1,8 @@
 name: Test
 on:
   push:
-    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe"]
+    branches: ["**"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"]
 jobs:
   test:
     name: Run tests
@@ -9,6 +10,19 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Check for Byte order marks
+        shell: powershell
+        run: |
+          $pattern = [char]::ConvertFromUtf32(0xFEFF)
+          $files = git grep -IEl "^$pattern"
+          if ( $lastexitcode -ne 1 ) {
+            echo "Files with BOM found:"
+            echo $files
+            exit 1
+          } else {
+            echo "No files with BOM found"
+            exit 0
+          }
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
       - name: Setup NuGet
@@ -26,4 +40,4 @@ jobs:
         shell: powershell
         run: |
           $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH
-          $(& dotnet test Tests; $a=$lastexitcode) | findstr x*; exit $a
+          $(& dotnet test Tests --filter "FullyQualifiedName!~E2ETests"; $a=$lastexitcode) | findstr x*; exit $a

.gitignore

@@ -6,3 +6,4 @@ bin/
 Tests/Resources/Sql/Create.sql
 *.exe
 !WinziPrint.exe
+*.sqlite3

CHANGELOG.md

@@ -2,6 +2,822 @@
 Changelog
 =========
 
+[v1.0.1.3][v1.0.1.3] (2025-10-13) {#v1.0.1.3}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.1.3-features}
+
+* In der Liste des Lieferungen-Fenster (`DeliveryAdminWindow`) werden
+	* statt ausschließlich der Sorte auch Attribut und Bewirtschaftungsart angezeigt. (a0d4f19f30)
+	* Kommentare der Lieferungen (und Teillieferungen) angezeigt. (548aeb2ce9)
+
+### Sonstiges {#v1.0.1.3-misc}
+
+* Verzögerung der Überprüfung auf automatische Updates auf einige Sekunden verlängert. (67ba342c28)
+* Verbesserung der Ladezeiten im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (7edd888aa2)
+
+[v1.0.1.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.3
+
+
+
+
+[v1.0.1.2][v1.0.1.2] (2025-09-25) {#v1.0.1.2}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.1.2-bugfixes}
+
+* Beim automatischen Importieren/Synchronisieren wird bei einem Fehlerfall der Benutzer verständigt, aber der Vorgang nicht abgebrochen. (9d02f18bac)
+
+### Sonstiges {#v1.0.1.2-misc}
+
+* Beim Sichern der Datenbank werden Meta-Informationen in der ZIP-Datei gespeichert. (c8a95422af)
+
+[v1.0.1.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.2
+
+
+
+
+[v1.0.1.1][v1.0.1.1] (2025-09-21) {#v1.0.1.1}
+---------------------------------------------
+
+### Sonstiges {#v1.0.1.1-misc}
+
+* Eingabe von Sorten und Qualitätsstufen im Übernahme-Fenster (`DeliveryAdminWindows`) verbessert. (e2de7a1f1c, b27b89f599)
+
+[v1.0.1.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.1
+
+
+
+
+[v1.0.1.0][v1.0.1.0] (2025-09-18) {#v1.0.1.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.1.0-features}
+
+* Neue Weinsorten gemäß Kürzelliste der Bundeskellereiinspektion hinzugefügt. (a0dcaf7b4f)
+
+### Sonstiges {#v1.0.1.0-misc}
+
+* HTTP-Anfragen haben jetzt das Feld `User-Agent` gesetzt. (844fc5217a)
+* Auto-Update-Funktion wird auch beim Erlangen von Netzwerkverbindung ausgeführt. (8bc053053c)
+
+[v1.0.1.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.0
+
+
+
+
+[v1.0.0.6][v1.0.0.6] (2025-09-17) {#v1.0.0.6}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.0.6-bugfixes}
+
+* Die automatische Erkennung des Wiege-Modus hat im WKW nicht funktioniert. (463769b549)
+
+### Sonstiges {#v1.0.0.6-misc}
+
+* Tippfehler im Über-Fenster (`AboutWindow`) behoben. (2c383d0c55)
+* `SaveFileDialog` mit Multi-File-Extensions verbessert. (9e02b15ff1)
+
+[v1.0.0.6]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.6
+
+
+
+
+[v1.0.0.5][v1.0.0.5] (2025-09-15) {#v1.0.0.5}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.5-features}
+
+* Die Datenbank kann im Haupt-Fenster (`MainWindow`) gesichert und wiederhergestellt werden. (f02598760f)
+
+### Sonstiges {#v1.0.0.5-misc}
+
+* In der WGM ist eine Auswahl eines Zu/-Abschlags im Übernahme-Fenster (`DeliveryAdminWindow`) nun erforderlich. (a9b5317e79)
+* In der Konfigurationsdatei kann im `[general]` Block `weighing = gross`, `weighing = net`, oder `weighing = box` angegeben werden. (d7012ebfa1)
+* Über-Fenser (`AboutWindow`) hinzugefügt. (3c9b3c2db1)
+* Abhängigkeiten aktualisiert. (44dcc5e19f, 98f8907817)
+
+[v1.0.0.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.5
+
+
+
+
+[v1.0.0.4][v1.0.0.4] (2025-09-01) {#v1.0.0.4}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.0.4-bugfixes}
+
+* Absturz beim Verschicken von einzelnen E-Mails außerhalb des Rundschreiben-Fensters (`MailWindow`) behoben. (07f9a0f522)
+
+### Sonstiges {#v1.0.0.4-misc}
+
+* Ladezeit des Fehler-Protokoll-Fensters (`LogWindow`) verbessert. (4653a4f129)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) ist es nun möglich die Qualitätsstufe zu verändern. (104798d4f2)
+
+[v1.0.0.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.4
+
+
+
+
+[v1.0.0.3][v1.0.0.3] (2025-08-11) {#v1.0.0.3}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.3-features}
+
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich die gesamte Datenbank zu hochzuladen bzw. herunterzuladen. ([#69][i69])
+
+### Sonstiges {#v1.0.0.3-misc}
+
+* Die Intigrität von Elwig-Export-Dateien (`.elwig.zip`) und anderen `.zip` Dateien wir nun überprüft. (d3157e4d48)
+* Die Herkunftshierarchie wird nun auch automatisch synchronisiert (benötigt für Stamm-KG bei Mitglied, Ried/KG bei Flächenbindung, und Herkunft bei Lieferung). ([#70][i70], b6c03892b1)
+* Abhängigkeiten aktualisiert. (1f165055c1, 4e2eca295d)
+
+[v1.0.0.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.3
+[i69]: https://git.necronda.net/winzer/elwig/issues/69
+[i70]: https://git.necronda.net/winzer/elwig/issues/70
+
+
+
+
+[v1.0.0.2][v1.0.0.2] (2025-08-05) {#v1.0.0.2}
+---------------------------------------------
+
+### Sonstiges {#v1.0.0.2-misc}
+
+* Explizit native SQLite-Bibliothek hinzugefügt. (77c3f388e7)
+
+[v1.0.0.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.2
+
+
+
+
+[v1.0.0.1][v1.0.0.1] (2025-08-05) {#v1.0.0.1}
+---------------------------------------------
+
+### Sonstiges {#v1.0.0.1-misc}
+
+* Abhängigkeiten aktualisiert. (466c8a322c)
+* Angepasste Fehlermeldung, wenn Importieren fehlschlägt. (ab7c7404e2)
+
+[v1.0.0.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.1
+
+
+
+
+[v1.0.0.0][v1.0.0.0] (2025-07-30) {#v1.0.0.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.0-features}
+
+* Es wird nun gespeichert, wann Mitglieder/Flächenbindungen/Lieferungen importiert bzw. exporiert wurden. (4234c7f994)
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird der Auszahlungsbetrag für nicht-festgesetzte Varianten nun überschlagsmäßig angezeigt. (913129f155)
+* Wenn eine Variante im Auszahlungsvariante-Fenster (`ChartWindow`) gespeichert wird, wird sie nun automatisch auch berechnet. (c6c8fd9b68)
+* Überall wo Weinsorten vorkommen werden diese jetzt rot oder grün eingefärbt angezeigt. ([#61][i61])
+* Das Flächenbindungs-Fenster (`AreaComAdminWindow`) wurde überarbeitet. (53d82604a1, 267aa3d47c, [#64][i64])
+* Auf allen Dokumenten wird der Bio-Kontrollstellen-Code in der Fußzeile angeführt (sofern dieser in den Stammdaten gesetzt wurde). (fad1e28c06)
+
+### Behobene Fehler {#v1.0.0.0-bugfixes}
+
+* Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
+* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
+* Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
+* Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])
+
+### Sonstiges {#v1.0.0.0-misc}
+
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird angeführt, dass "Zu- und Abschläge bei Lieferungen" auch den Rebelzuschlag umfassen. (0dff3986b7)
+* Im gesamten Program wird an passenden Stellen statt "Gewicht" nun "Menge" verwendet. (0f3ce39f35)
+* Verbesserungen der Code-Qualität und der Leistung. ([#59][i59], b580e1bf79, 623f55f5b0, 3493ff6df1, 267797b55d, 41811925be, [#57][i57], 38d0ff969d, e6746f76b1, 7e9a27c75d)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Flächenbindungen jetzt für die momentane Saison angezeigt statt für das aktuelle Jahr. (953532cae4)
+* Abhängigkeiten aktualisiert. (4b27ebf81b, 7153bfab6f, 9b48242f0e)
+* GPLv3 Lizenz hinzugefügt. (93e920f61a)
+
+[v1.0.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.0
+[i57]: https://git.necronda.net/winzer/elwig/issues/57
+[i58]: https://git.necronda.net/winzer/elwig/issues/58
+[i59]: https://git.necronda.net/winzer/elwig/issues/59
+[i61]: https://git.necronda.net/winzer/elwig/issues/61
+[i62]: https://git.necronda.net/winzer/elwig/issues/62
+[i64]: https://git.necronda.net/winzer/elwig/issues/64
+[i65]: https://git.necronda.net/winzer/elwig/issues/65
+
+
+
+
+[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
+------------------------------------------
+
+### Sonstiges {#v0.13.9-misc}
+
+* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
+* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
+
+[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
+
+
+
+
+[v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.8-bugfixes}
+
+* Details im Lieferungen-Fenster (`DeliveryAdminWindow`) für die WG Weinland richtiggestellt (Lesweagen, Verhalten bei _Gerebelt gewogen_). (138dae715e, aa98909c0a)
+
+### Sonstiges {#v0.13.8-misc}
+
+* Abhängigkeiten aktualisiert. (fe0a7dab2a, 775bb08e95)
+
+[v0.13.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.8
+
+
+
+
+[v0.13.7][v0.13.7] (2025-01-21) {#v0.13.7}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.7-bugfixes}
+
+* In seltenen Fällen konnten im Auszahlungsvariante-Fenster (`ChartWindow`) manche (Sorten-/Attribut-/Bewirtschaftungsart-)Zuordnungen zu Kurven nicht richtig gespeichert werden. (0b8a1b321f)
+* Beim Öffnen des Ausgangs-Protokoll-Fensters (`MailLogWindow`) kam es zu einem Absturz. (5d017cc8ea)
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) war es nicht möglich die Überweisungsdaten zu exportieren, sofern mindestens eine Traubengutschrift einen negativen Betrag aufwies.
+  Jetzt wird der Benutzer nur gewarnt und es ist möglich alle anderen Gutschriften zu exportieren. (6d88c5645c, c7a2f2241d)
+
+### Sonstiges {#v0.13.7-misc}
+
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) ist es nun möglich das Datum einer Auszahlungsvariante zu ändern. (bd4ebb8c35)
+
+[v0.13.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.7
+
+
+
+
+[v0.13.6][v0.13.6] (2025-01-14) {#v0.13.6}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.6-bugfixes}
+
+* In seltenen Fällen konnten im Auszahlungsvariante-Fenster (`ChartWindow`) manche (Sorten-/Attribut-/Bewirtschaftungsart-)Zuordnungen zu Kurven nicht richtig gespeichert werden.
+  Berechnungen basierend auf diesen (evtl. falschen) Zuordnungen wurden immer richtig ausgeführt, eine nachträgliche Überprüfung ist daher möglich. (20e3e2a76b)
+
+### Sonstiges {#v0.13.6-misc}
+
+* Abhängigkeiten aktualisiert. (95ccb2627c, 80fec4473a)
+
+[v0.13.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.6
+
+
+
+
+[v0.13.5][v0.13.5] (2025-01-02) {#v0.13.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) Filter `aktiv` und `!aktiv` hinzugefügt. (5e53d864b1)
+* Im Lieferungen Fenster (`DeliveryAdminWindow`) Menüpunkt _Statistik_ mitsamt _Qualitätsstatistik_ und _Lieferstatistik pro Ort_ hinzugefügt. (c24b1ca2b9)
+
+### Sonstiges {#v0.13.5-misc}
+
+* Abhängigkeiten aktualisiert. (c9e483ba9d, 633b560a67)
+
+[v0.13.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.5
+
+
+
+
+[v0.13.4][v0.13.4] (2024-11-25) {#v0.13.4}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.4-bugfixes}
+
+* Bei _Unter-/Überlieferungen lt. gez. GA_ waren seit [v0.10.6](#v0.10.6) (2023-08-30) Nicht-Lieferanten nicht aufgeführt. (6ba2aa7143)
+* Bei _Unterlieferungen laut Flächenbindungen_ wurden nur Mitglieder berücksichtigt, die zum Zeitpunkt des Exports aktiv waren. (3b97c2243a, 338f9fe092)
+
+### Sonstiges {#v0.13.4-misc}
+
+* Abhängigkeiten aktualisiert. (c3a2f983d5, 70e01849be, a99a23fd08, 4a10e94d71, 6c7f10cb26)
+
+[v0.13.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.4
+
+
+
+
+[v0.13.3][v0.13.3] (2024-11-13) {#v0.13.3}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.3-features}
+
+* Im Haupt-Fenster (`MainWindow`) unter _Leseabschluss_ eine Statistik-Tabelle (Gebunden/Ungeb., Mitglieder/Gewicht/Fläche) hinzugefügt. (54deccf021)
+* Im Haupt-Fenster (`MainWindow`) unter _Leseabschluss_ zwei Exportmöglichkeiten (_Flächenbindungen_, _Liefermenge/Ertrag_) hinzugefügt. (c5453c2fe6)
+* Ausgangs-Protokoll-Fenster (`MailLogWindow`) zum Ansehen aller ausgehenden E-Mails oder ausgedruckten Rundschreiben hinzugefügt (_Rundschreiben_ -> _Hilfe_). (2ee0d56dcc)
+
+### Behobene Fehler {#v0.13.3-bugfixes}
+
+* Im Rundschreiben-Fenster (`MailWindow`) kleinere Fehler behoben und alle Einstellungen werden nun gespeichert. (0a9731af09)
+
+### Sonstiges {#v0.13.3-misc}
+
+* In allen Fenstern an passenden Stellen Symbole/Icons hinzugefügt. (f4fa549130)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) Filter `Flächenbindung` (Mitglieder mit irgendeiner aktiven Flächenbindung) hinzugefügt. (a1d84dd988)
+* Im Flächenbindungen-Fenster (`AreaComAdminWindow`) Filter für explizite Saisons hinzugefügt. (6718ad4c8d)
+
+[v0.13.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.3
+
+
+
+
+[v0.13.2][v0.13.2] (2024-10-13) {#v0.13.2}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.2-features}
+
+* Im Lieferungen-Fenster den Menüpunkt _Abwertungsliste_ (`DeliveryDepreciationList`) hinzugefügt. (3cbffdbf27)
+
+### Behobene Fehler {#v0.13.2-bugfixes}
+
+* Fehler im Waagenprotokoll `Avery-Async` (L320) behoben. (8680e51052)
+* Hausnummern in der BKI Traubentransportscheinliste werden in Excel richtig angezeigt. (86f7f693a0)
+* Beim Ändern der Identifikatoren von Attributen/Bewirtschaftungsarten wurden diese in Auszahlungsvarianten nicht aktualisiert. (d1f67dc57d)
+
+### Sonstiges {#v0.13.2-misc}
+
+* Weitere automatisierte Tests hinzugefügt. ([#11][i11])
+* Namenszusätze bei Gemeinden (z.B. an, bei, im, am) genauer angegeben. (65498dd18f)
+* Bei einigen Eingabefeldern waren die Ränder unscharf. (e247925472)
+* Wo leicht möglich wird `ExecuteSql`/`FromSql` statt `ExecuteSqlRaw`/`FromSqlRaw` verwendet. (0675c45617)
+
+[v0.13.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.2
+[i11]: https://git.necronda.net/winzer/elwig/issues/11
+
+
+
+
+[v0.13.1][v0.13.1] (2024-09-29) {#v0.13.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.1-features}
+
+* Das Extrahieren/Abwerten/Aufteilen von (Teil-)Lieferungen wurde grundlegend überarbeitet und funktioniert ab jetzt in einem einzigen, übersichtlicheren Dialog. (c62947dacd, c185437b9a)
+
+### Behobene Fehler {#v0.13.1-bugfixes}
+
+* Im Mitglieder-Fenster (`MemberAdminWinodw`) wurden bei `Anlieferungsbestätigung -> speichern (PDF)` und `Traubengutschrift -> speichern (PDF)` E-Mails verschickt, anstatt ein PDF gespeichert. (6ba1973087, a2315e84bd)
+
+### Sonstiges {#v0.13.1-misc}
+
+* Abhängigkeiten aktualisiert. (b6ae1f5675)
+
+[v0.13.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.1
+
+
+
+
+[v0.13.0][v0.13.0] (2024-09-25) {#v0.13.0}
+------------------------------------------
+
+> [!NOTE]
+> Ab dieser Version verhält sich die Berechnung der Unterlieferungen bei Flächenbindungen anders.
+
+### Behobene Fehler {#v0.13.0-bugfixes}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) war das Extrahieren in eine neue Lieferung seit ca. 6 Monaten (98688168b8) nicht mehr möglich. (8a61747538)
+
+### Sonstiges {#v0.13.0-misc}
+
+* Es werden alle Lieferungen (inkl. `WEI`, `RSW`, `LDW`) zur Berechnung der Unterlieferung bei Flächenbindungen herangezogen. (4fa5b8f6d4)
+* In diversen Fenstern die Formatierung von Zahlen verbessert. (579ed53487)
+* Das Rundschreiben-Fenster (`MailWindow`) ist nun benutzerfreundlicher/-sicherer. (4a7c95e250)
+
+[v0.13.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.0
+
+
+
+
+[v0.12.0][v0.12.0] (2024-09-24) {#v0.12.0}
+------------------------------------------
+
+### Behobene Fehler {#v0.12.0-bugfixes}
+
+* Das Drucken von Dokumenten ist wieder möglich. (94a6dd5312, a48ea8e7e2)
+
+### Sonstiges {#v0.12.0-misc}
+
+* Versuch 1: `Database is locked` Fehler beheben. ([#56][i56])
+
+[v0.12.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.12.0
+[i56]: https://git.necronda.net/winzer/elwig/issues/56
+
+
+
+
+[v0.11.4][v0.11.4] (2024-09-22) {#v0.11.4}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen die nächste Version zu verwenden.
+
+### Behobene Fehler {#v0.11.4-bugfixes}
+
+* In den Tooltips für Gewicht und Flächenbindungen wurden die Abstände wieder hergestellt. (e0fcaf1f53)
+
+[v0.11.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.4
+
+
+
+
+[v0.11.3][v0.11.3] (2024-09-22) {#v0.11.3}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen Version 0.12.0 zu verwenden.
+
+### Behobene Fehler {#v0.11.3-bugfixes}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde das Berechnen der Mitgliederdaten pro Jahr und Mitglied rückgängig gemacht. (1d187c25f3)
+
+[v0.11.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.3
+
+
+
+
+[v0.11.2][v0.11.2] (2024-09-22) {#v0.11.2}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen Version 0.12.0 zu verwenden.
+
+### Neue Funktionen {#v0.11.2-features}
+
+* In der Anmeldeliste (`DeliveryAncmtList`) wird die Stamm-KG des Mitgliedes angegeben. (165770fa37)
+* Im Haupt-Fenster (`MainWindow`) wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
+
+### Behobene Fehler {#v0.11.2-bugfixes}
+
+* Falls das Übernahme-Fenster (`DeliveryAdminWindow`) geöffnet war und man währenddessen die aktuellste Lieferung gelöscht hat kam es zum Fehler beim Nummerieren des Lieferscheines. (5c12dba125)
+* In Seltenen Fällen konnte es vorkommen, dass sich Elwig aufgrund eines internen Fehlers im Übernahme-Fenster (`DeliveryAdminWindow`) geschlossen hat. (dcec6f03fe)
+
+### Sonstiges {#v0.11.2-misc}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) wurde das Layout der Teillieferungen-Liste angepasst. (9fa9d9fbec)
+* Alle Aufrufe von `FillInputs()` in `Services` sind nun synchron. (648c406ad2, 7791d02979)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Lieferinformationen pro Jahr und Mitglied im Voraus berechnet. (66be5a3e2c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) heißt es nun _Anmeldungen_, nicht mehr _Traubenanmeldungen_. (3cde360aaa)
+
+[v0.11.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.2
+
+
+
+
+[v0.11.1][v0.11.1] (2024-09-19) {#v0.11.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.1-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) mehr Filter hinzugefügt; das Gewicht wird (wie im Lieferungen-Fenster) aufgeschlüsselt. (27d8a5cfb6)
+
+### Behobene Fehler {#v0.11.1-bugfixes}
+
+* Beim Export der BKI-Liste werden Namen von Rechnungsadressen _immer_ richtig getrennt. (871bc299bd)
+* Flächenbindungen ohne Startsaison werden ohne Fehler gehandhabt. (21a1b11d68)
+
+### Sonstiges {#v0.11.1-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`)...
+	* die Liste der Lesepläne vergrößert. (a18b58f438)
+	* sind abgesagte Lesepläne durchgestrichen. (74200083ab)
+	* wird beim Erstellen das Feld für die MgNr direkt fokussiert. (3f7cd2a6ff)
+* Abhängigkeiten aktualisiert. (eee90c784b, d8beb03b96)
+* Kleinigkeiten in `DeliveryService`. (642fb3a625)
+
+[v0.11.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.1
+
+
+
+
+[v0.11.0][v0.11.0] (2024-09-16) {#v0.11.0}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.0-features}
+
+* Im Rundschreiben-Fenster (`MailWindow`) können jetzt auch Funktionäre, Bio-Betriebe oder angemeldete Mitglieder für einen Leseplan adressiert werden. (5c08f61963)
+* Im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) können nun auch Attribut, Bewirtschaftungsart, und ob der Leseplan abgesagt ist angegeben werden. (d8a10152b3)
+
+### Sonstiges {#v0.11.0-misc}
+
+* `App.HintContextChange()` ist synchron und fügt Arbeitsaufträge dem Dispatcher hinzu. (f09c43c1bd)
+
+[v0.11.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.0
+
+
+
+
+[v0.10.8][v0.10.8] (2024-09-05) {#v0.10.8}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.8-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) gibt es eine neue Spalte `Datum` und es können alle Lesepläne nach z.B. einem Mitglied durchsucht werden. (a5638135a3, 7437187630)
+
+### Behobene Fehler {#v0.10.8-bugfixes}
+
+* Versuch 3: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8d9172f91e)
+
+### Sonstiges {#v0.10.8-misc}
+
+* Im Lieferjournal (`DeliveryJournal`) ist die Sortierung der Filter für das Gewicht korrigiert. (22514715c1)
+* In der Anmeldeliste (`DeliveryAncmtList`) wurde die Spalte `Anmldg.` zentriert. (f43d9c020c)
+* In Geschäftsdokumenten (`BusinessDocument`) wurden im Informationsblock `:` hinzugefügt. (26235f8c0a)
+* Im Mitgliedsstammdatenblat (`MemberDataSheet`) wird der USt.-Steuersatz zusätzlich zu _Buchführend: ja/nein_ angezeigt. (a04c7d538e)
+
+[v0.10.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.8
+
+
+
+
+[v0.10.7][v0.10.7] (2024-09-02) {#v0.10.7}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.7-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Anmeldezeitpunkt angezeigt; in der Anmeldeliste als `ok` oder `verspät.`. (141086673f)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) kann nach dem Gesamtgewicht einer Lieferung gefiltert werden (z.B. `<500kg`, `>8000kg`). (543185d48e)
+
+### Behobene Fehler {#v0.10.7-bugfixes}
+
+* Versuch 2: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12)
+
+[v0.10.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.7
+
+
+
+
+[v0.10.6][v0.10.6] (2024-08-30) {#v0.10.6}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.6-bugfixes}
+
+* Der Titel des Flächenbindungen-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c)
+* Im Auszahlungsvariante-Fenster (`ChartWindow`) einen Skalierungs-Fehler behoben. ([#33][i33])
+* Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8c8c0a8c2b)
+
+### Sonstiges {#v0.10.6-misc}
+
+* SQL-Queries für Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`) und Über-/Unterlieferungen effizienter umgeschrieben. (9930e6173c)
+* Im Haupt-Fenster (`MainWindow`) den Menüpunkt _Waagen_ zu _Waage_ geändert. (8ce8492c74)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) wird in der Teil-Lieferungen-Liste immer die letzte Teil-Lieferung angezeigt. (2ef10b4bb2)
+* Breite des Traubenanmeldungen-Fensters (`DeliveryAncmtAdminWindow`) leicht erhöht und Fehler beim Enter-Drücken im _Gewicht_ Eingabefeld. (21f68caf4c, e18bc58b6c)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wird das ändern der Kontaktart E-Mail wieder farblich hervorgehoben. (78a72c641f)
+
+[v0.10.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.6
+[i33]: https://git.necronda.net/winzer/elwig/issues/33
+
+
+
+
+[v0.10.5][v0.10.5] (2024-08-24) {#v0.10.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) kann der Benutzer beim Übertragen von Flächenbindungen entscheiden, ob der Beginn der Laufzeit übernommen werden soll, oder nicht. (bec1b165bf)
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich für Waagen vom Typ `SysTec-IT` Datum und Uhrzeit festzulegen. (cd2b482b5a)
+
+### Sonstiges {#v0.10.5-misc}
+
+* Abstände in der Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (adbe418b7c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) scheinen keine Warnungen mehr auf, wenn ein nicht-optionales Feld nicht ausgefüllt wurde. (2ae2564647)
+
+[v0.10.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.5
+
+
+
+
+[v0.10.4][v0.10.4] (2024-08-22) {#v0.10.4}
+------------------------------------------
+
+### Sonstiges {#v0.10.4-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Wochentag auch beim Bearbeiten angezeigt. (85931e62e8)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden Anzahl der Mitglieder und Geschäftsanteile nicht mehr von allen aktiven angezeigt, sonder von den momentan gefilterten. (49e4b65c27)
+* Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (f54677d429)
+
+[v0.10.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.4
+
+
+
+
+[v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.3-bugfixes}
+
+* Datum für _Anmeldungen bis_ im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) ab jetzt änderbar. (84d8d0cecb)
+
+### Sonstiges {#v0.10.3-misc}
+
+* Wochentag bei Leseplan-Liste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) anzeigen. (fe7f9d675b)
+
+[v0.10.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.3
+
+
+
+
+[v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.2-bugfixes}
+
+* Beim Hochladen der Mitgliederdaten sind Flächenbindungen nicht mitexportiert worden. (204dfe8745)
+* Beim Importieren von älteren Exportdaten kam es zu einem Fehler. (cd40075702)
+
+[v0.10.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.2
+
+
+
+
+[v0.10.1][v0.10.1] (2024-08-14) {#v0.10.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.1-features}
+
+* In der Mitglieder-Liste (PDF und Excel) werden ggf. gefilterte Flächenbindungen angegeben. (d3839c288a)
+
+### Behobene Fehler {#v0.10.1-bugfixes}
+
+* Fehler beim Berechnen...
+  * falls in Saison keine Lieferungen vorhanden sind. (48970de652)
+  * falls der Vorname eines Mitgliedes nicht gesetzt ist. (2764a0ca21)
+
+[v0.10.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.1
+
+
+
+
+[v0.10.0][v0.10.0] (2024-08-13) {#v0.10.0}
+------------------------------------------
+
+> [!NOTE]
+> Mitglieder können ab dieser Version als juristische Person markiert werden.
+> Es wird empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus).
+
+### Neue Funktionen {#v0.10.0-features}
+
+* Traubenanmeldungen und Leseplanung sind ab jetzt verfügbar. ([#14][i14])
+* Mitglieder können nun auch als juristische Person markiert werden. ([#54][i54])
+* Im Auszahlungsvarianten-Fenster kann unter _Anpassen_ (`PaymentAdjustmentWindow`) nun auch ein Absoluter oder Relativer Zu-/Abschlag pro Mitglied festgelegt werden, der **vor der MwSt.** angewendet wird. (4d89a17e80)
+
+### Behobene Fehler {#v0.10.0-bugfixes}
+
+* Beim Erstellen eines neuen Mitgliedes war es nicht möglich die Flächenbindungen des Vorgängers zu übernehmen. (9127cd3f03)
+
+### Sonstiges {#v0.10.0-misc}
+
+* Für den Treuebonus der WG Matzen werden nun auch Lieferungen der Vorgänger miteinbezogen. (2333077aa5)
+* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) werden Zu-/Abschläge pro Mitglied explizit angegeben, somit ist die Zwischensumme korrekt. (f52c11b91e)
+
+[v0.10.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.0
+[i14]: https://git.necronda.net/winzer/elwig/issues/14
+[i54]: https://git.necronda.net/winzer/elwig/issues/54
+
+
+
+
+[v0.9.3][v0.9.3] (2024-08-02) {#v0.9.3}
+---------------------------------------
+
+### Sonstiges {#v0.9.3-misc}
+
+* Das Lieferjournal als Excel-Liste beinhaltet nun auch Liefer-Zweigstelle und Stamm-Zweigstelle des Liefernaten. (cf05a0c658)
+
+[v0.9.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.3
+
+
+
+
+[v0.9.2][v0.9.2] (2024-08-01) {#v0.9.2}
+---------------------------------------
+
+### Behobene Fehler {#v0.9.2-bugfixes}
+
+* Verhalten beim Schließen des Haupt-Fensters (`MainWindow`) nicht immer richtig. (8db6007264)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) führt beim Erstellen eines Mitglied das Eingeben einer Tel.-Nr. zu einem Fehler. (4403754ada)
+
+[v0.9.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.2
+
+
+
+
+[v0.9.1][v0.9.1] (2024-08-01) {#v0.9.1}
+---------------------------------------
+
+### Neue Funktionen {#v0.9.1-features}
+
+* Im Rundschreiben-Fenster (`MailWindow`) können E-Mails ohne Anhänge verschickt werden. (f69d2809f3)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) und Lieferungen-Fenster (`DeliveryAdminWindow`) kann das/die momentan ausgewählte Mitglied/Lieferung alleine exportiert werden. (db4de5b5fe)
+* Exporte für Mitglieder enthalten nun auch deren Flächenbindungen. (10ee1d6548)
+
+### Behobene Fehler {#v0.9.1-bugfixes}
+
+* Sortierung der Wiegen-Knöpfe im Übernahme-Fenster (`DeliveryAdminWindow`). (7786fb421a)
+
+### Sonstiges {#v0.9.1-misc}
+
+* Deutsche Fehlermeldung beim Hochladen/Herunterladen im Haupt-Fenster (`MainWindow`). (91717f8efb)
+* Waagen-Fehler _Brutto negativ_ implementiert. (39f93da0ba)
+
+[v0.9.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.1
+
+
+
+
+[v0.9.0][v0.9.0] (2024-07-28) {#v0.9.0}
+---------------------------------------
+
+### Neue Funktionen {#v0.9.0-features}
+
+* Flächenbindungen werden als Tabelle in der Status-Leiste im Mitglieder-Fenster (`MemberAdminWindow`) angezeigt. ([#26][i26])
+* Filter für E-Mail-Adressen, Tel.-Nr. und Kontaktarten im Mitglieder-Fenster (`MemberAdminWindow`). (1141331608)
+* Auf Lieferscheinen (`DeliveryNote`) werden nun _Brutto, Tara, Netto_ werte abgedruckt. (fd0ed97305, 4aa3362029, 53d3affefe)
+* Beim Exportieren der Mitgliederliste werden auch Tel.-Nr. und E-Mail-Adressen exportiert. (b6afb94246)
+* Benutzerfreundliches Synchronisieren zwischen Standorten. ([#3][i3])
+* Übernehmer _müssen_ explizit entscheiden, ob _gerebelt gewogen_ oder nicht. (935b31f6e3)
+
+### Behobene Fehler {#v0.9.0-bugfixes}
+
+* Zu-/Abschläge im Lieferungen-Fenster (`DeliveryAdminWindow`). (f235d5b380)
+* Falls keine Saison existierte führte das zu einem Absturz im Rundschreiben-Fenster (`MailWindow`). (84f772a32f)
+* Beim Drucken _sollte_ kein Kommandozeilen-Fenster mehr sichtbar sein. (d741ba92dc)
+* Wenn bei einem Mitglied keine Stamm-KG hinterlegt war, kam es zu inkonsistentem Verhalten im Übernahme-Fenster (`DeliveryAdminWinodw`). (4c3f0c40fa)
+
+### Sonstiges {#v0.9.0-misc}
+
+* Model-View-ViewModel (MVVM) implementiert! ([#10][i10])
+* Die nächste Saison "beginnt" bereits im Juli (statt erst im August) (`CurrentLastSeason`). (c314321039)
+* Automatisierte Tests für Waagen (Sitzendorf, Haugsdorf). (8e9f2f4e90)
+* Überprüfung auf Byte-Order-Marks in allen Quellcode-Dateien. (53c7cb2ec0, f09753ccc2)
+
+[v0.9.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.9.0
+[i3]: https://git.necronda.net/winzer/elwig/issues/3
+[i10]: https://git.necronda.net/winzer/elwig/issues/10
+[i26]: https://git.necronda.net/winzer/elwig/issues/26
+
+
+
+
+[v0.8.9][v0.8.9] (2024-07-23) {#v0.8.9}
+---------------------------------------
+
+### Behobene Fehler {#v0.8.9-bugfixes}
+
+* Absturz im Rundschreiben-Fenster (`MailWindow`). Fehler bei `CheckComboBox`. (49f03c0a3c)
+* Excel-Exporte können nun auch Sonderzeichen (wie `&`) enthalten. (ba9e1d7201)
+
+[v0.8.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.9
+
+
+
+
+[v0.8.8][v0.8.8] (2024-07-22) {#v0.8.8}
+---------------------------------------
+
+### Behobene Fehler {#v0.8.8-bugfixes}
+
+* Schnittstelle für Gassner-Waagen nicht funktionsfähig. (4c75dbe4aa)
+
+[v0.8.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.8
+
+
+
+
+[v0.8.7][v0.8.7] (2024-07-22) {#v0.8.7}
+---------------------------------------
+
+### Neue Funktionen {#v0.8.7-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) muss eine E-Mail-Adresse angegeben werden, wenn E-Mail als Kontaktart angegeben wird. (5a36e84b1f)
+
+### Sonstiges {#v0.8.7-misc}
+
+* Automatisierte Ende-zu-Ende-Tests (`E2ETests`) hinzugefügt. (ddd821e478, 6b48a1090c, dd5049faae, 5b2f617a68, 7246852181)
+* Automatisierte Tests überarbeitet. (44656e0022, 86937485e4, 34178105a7, ffe0ff5508, 01d658f51d)
+* Update-Dialog (`UpdateDialog`) überarbeitet. (62f63ef63d, e9de54415a)
+* Eingebefelder vom Typ _Mehrfachauswahl mit Dropdown_ (`CheckComboBox`) etwas verbessert. (26d75ea3cd, daf83c4bbc)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) werden nur noch aktive Mitglieder angezeigt. (658a1f4dc1)
+* Abhängigkeiten aktualisiert. (ffef1fd6e4, dd48a24c58)
+* Auto-Update-Funktion überarbeitet. (3ac9536e76)
+
+[v0.8.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.8.7
+
+
+
 
 [v0.8.6][v0.8.6] (2024-07-01) {#v0.8.6}
 ---------------------------------------
@@ -65,7 +881,7 @@ Changelog
 
 ### Behobene Fehler {#v0.8.4-bugfixes}
 
-* Falls beim Schließen des Hauptmenüs ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
+* Falls beim Schließen des Haupt-Fensters (`MainWindow`) ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
 
 ### Sonstiges {#v0.8.4-misc}
 

Elwig/App.xaml

@@ -30,17 +30,25 @@
 
         <DataTemplate x:Key="WineVarietyTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Key="WineVarietyTemplateExpanded">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/>
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding SortIdFormat}" Foreground="{Binding Color}" MinWidth="36" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
                 <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
             </StackPanel>
         </DataTemplate>
 
+        <DataTemplate x:Key="AreaCommitmentTypeTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding WineVar.Name}" Foreground="{Binding WineVar.Color}"/>
+                <TextBlock Text="{Binding WineAttr.Name}" Margin="5,0,0,0"/>
+                <TextBlock Text="{Binding Discriminator}" Margin="5,0,0,0"/>
+            </StackPanel>
+        </DataTemplate>
+
         <DataTemplate x:Key="ModifierTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/>

Elwig/App.xaml.cs

@@ -1,23 +1,22 @@
-using System;
-using System.Data;
-using System.Linq;
-using System.Windows;
-using System.IO;
-using Elwig.Helpers;
-using Elwig.Helpers.Weighing;
-using System.Collections.Generic;
-using System.Windows.Threading;
-using System.Globalization;
-using System.Threading;
-using System.Windows.Markup;
-using System.Reflection;
-using Elwig.Helpers.Printing;
-using Elwig.Windows;
 using Elwig.Dialogs;
-using System.Threading.Tasks;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Helpers.Printing;
+using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
+using Elwig.Windows;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Reflection;
 using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace Elwig {
     public partial class App : Application {
@@ -28,23 +27,17 @@ namespace Elwig {
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
-        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
-        public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
+        public static readonly string MailsPath = Path.Combine(DataPath, "mails");
+        public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(InstallPath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
-        public static readonly Config Config = new(DataPath + "config.ini");
 
-        public static int VersionMajor { get; private set; }
-        public static int VersionMinor { get; private set; }
-        public static int VersionPatch { get; private set; }
-        public static string Version {
-            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
-            private set {
-                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
-                VersionMajor = p.ElementAtOrDefault(0);
-                VersionMinor = p.ElementAtOrDefault(1);
-                VersionPatch = p.ElementAtOrDefault(2);
-            }
-        }
+        public static Config Config { get; private set; } = new(ConfigPath);
+        public static Version Version { get; private set; } = new();
 
         public static int BranchNum { get; private set; }
         public static string ZwstId { get; private set; }
@@ -69,42 +62,32 @@ namespace Elwig {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
+            Directory.CreateDirectory(MailsPath);
             MainDispatcher = Dispatcher;
             Scales = [];
             CurrentApp = this;
-            OverrideCulture();
+            Utils.OverrideCulture();
+
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 2) {
+                Config = new(Path.GetFullPath(args[1]));
+            }
 
             ContextTimer.Tick += (object? sender, EventArgs evt) => {
-                if (CurrentLastWrite > LastChanged) {
-                    LastChanged = CurrentLastWrite;
+                var ch = CurrentLastWrite;
+                if (ch > LastChanged) {
+                    LastChanged = ch;
                     OnContextChanged();
                 }
             };
         }
 
         private static void OnContextChanged() {
-            MainDispatcher.BeginInvoke(async () => await HintContextChange());
-        }
-
-        private static void OverrideCulture() {
-            var locale = new CultureInfo("de-AT", false);
-            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
-            CultureInfo.CurrentCulture = locale;
-            CultureInfo.CurrentUICulture = locale;
-            Thread.CurrentThread.CurrentCulture = locale;
-            Thread.CurrentThread.CurrentUICulture = locale;
-            CultureInfo.DefaultThreadCurrentCulture = locale;
-            CultureInfo.DefaultThreadCurrentUICulture = locale;
-            FrameworkElement.LanguageProperty.OverrideMetadata(
-                typeof(FrameworkElement),
-                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
-            );
+            MainDispatcher.BeginInvoke(HintContextChange);
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0";
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0");
 
             try {
                 await AppDbUpdater.CheckDb();
@@ -145,10 +128,11 @@ namespace Elwig {
             if (Config.UpdateAuto && Config.UpdateUrl != null) {
                 if (Utils.HasInternetConnectivity()) {
                     Utils.RunBackground("Auto Updater", async () => {
-                        await Task.Delay(500);
+                        await Task.Delay(1000);
                         await CheckForUpdates();
                     });
                 }
+                NetworkChange.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
                 _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
                 _autoUpdateTimer.Start();
             }
@@ -159,7 +143,7 @@ namespace Elwig {
                     list.Add(Scale.FromConfig(s));
                 } catch (Exception e) {
                     list.Add(new InvalidScale(s.Id));
-                    if (Config.Debug || s.Required)
+                    if (s.Required)
                         MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error",
                             MessageBoxButton.OK, MessageBoxImage.Error);
                 }
@@ -180,6 +164,16 @@ namespace Elwig {
                 Shutdown();
             }
 
+            if (Config.WeighingMode == null) {
+                if (Client.IsMatzen || Client.IsWolkersdorf) {
+                    Config.WeighingMode = WeighingMode.Net;
+                } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
+                    Config.WeighingMode = WeighingMode.Box;
+                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
+                    Config.WeighingMode = WeighingMode.Gross;
+                }
+            }
+
             base.OnStartup(evt);
 
             var window = new MainWindow();
@@ -187,6 +181,9 @@ namespace Elwig {
         }
 
         private async void Application_Exit(object sender, ExitEventArgs evt) {
+            foreach (var s in EventScales) {
+                s.Dispose();
+            }
             await Pdf.Cleanup();
         }
 
@@ -198,19 +195,30 @@ namespace Elwig {
             ZwstId = entry.Item1;
             BranchName = entry.Item2;
             BranchPlz = entry.Item3;
-            BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+            BranchLocation = entry.Item4?
+                .Split(" in ")[0]
+                .Split(" im ")[0]
+                .Split(" an ")[0]
+                .Split(" am ")[0]
+                .Split(" bei ")[0]
+                .Split(" beim ")[0];
             BranchAddress = entry.Item5;
             BranchPhoneNr = entry.Item6;
             BranchFaxNr = entry.Item7;
             BranchMobileNr = entry.Item8;
         }
 
-        public static async Task HintContextChange() {
-            CurrentApp.LastChanged = CurrentLastWrite;
-            foreach (Window w in CurrentApp.Windows) {
-                if (w is not ContextWindow c) continue;
-                await c.HintContextChange();
-            }
+        public static void HintContextChange() {
+            if (CurrentApp == null) return;
+            var ch = CurrentLastWrite;
+            if (ch > CurrentApp.LastChanged)
+                CurrentApp.LastChanged = ch;
+            MainDispatcher.Invoke(() => {
+                foreach (Window w in CurrentApp.Windows) {
+                    if (w is not ContextWindow c) continue;
+                    MainDispatcher.BeginInvoke(c.HintContextChange);
+                }
+            });
         }
 
         private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
@@ -222,10 +230,20 @@ namespace Elwig {
             }
         }
 
-        public static async Task CheckForUpdates(bool showSuccess = false) {
+        private void OnNetworkAvailabilityChanged(object? sender, NetworkAvailabilityEventArgs evt) {
+            if (!evt.IsAvailable) return;
+            if (Utils.HasInternetConnectivity()) {
+                Utils.RunBackground("Auto Updater", async () => {
+                    await Task.Delay(2000);
+                    await CheckForUpdates();
+                });
+            }
+        }
+
+        public static async Task CheckForUpdates(bool showAlert = false) {
             if (Config.UpdateUrl == null) return;
             var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
-            if (latest != null && new Version(latest.Value.Version) > new Version(Version)) {
+            if (latest != null && new Version(latest.Value.Version) > Version) {
                 await MainDispatcher.BeginInvoke(() => {
                     var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size);
                     if (d.ShowDialog() == true) {
@@ -233,9 +251,27 @@ namespace Elwig {
                         Current.Shutdown();
                     }
                 });
-            } else if (showSuccess) {
-                MessageBox.Show("Elwig ist auf dem aktuellsten Stand!", "Nach Updates suchen",
-                    MessageBoxButton.OK, MessageBoxImage.Information);
+            } else if (showAlert) {
+                if (latest == null) {
+                    MessageBox.Show("Informationen konnten nicht abgerufen werden!", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
+                    MessageBox.Show($"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+        }
+
+        public static async Task ReplaceDatabase(string filename) {
+            try {
+                await Task.Run(async () => {
+                    await Database.Import(filename);
+                });
+                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
+                ForceShutdown = true;
+                Current.Shutdown();
+            } catch (Exception exc) {
+                MessageBox.Show("Fehler beim Ersetzen:\n\n" + exc.Message, "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -254,15 +290,15 @@ namespace Elwig {
         }
 
         public static DeliveryAdminWindow FocusReceipt() {
-            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.IsReceipt);
+            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt);
         }
 
         public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
-            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
         }
 
         public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
-            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr);
         }
 
         public static BaseDataWindow FocusBaseData() {
@@ -292,6 +328,14 @@ namespace Elwig {
             return w;
         }
 
+        public static DeliveryAncmtAdminWindow FocusDeliveryAncmt() {
+            return FocusWindow<DeliveryAncmtAdminWindow>(() => new());
+        }
+
+        public static DeliveryScheduleAdminWindow FocusDeliverySchedule() {
+            return FocusWindow<DeliveryScheduleAdminWindow>(() => new());
+        }
+
         public static PaymentVariantsWindow FocusPaymentVariants(int year) {
             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
         }

Elwig/Controls/CheckComboBox.cs

@@ -1,73 +1,112 @@
-using System.Linq;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Controls {
     public class CheckComboBox : ListBox {
 
-        public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register("Delimiter", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", "));
+        public new static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register(nameof(SelectedItems), typeof(IList), typeof(CheckComboBox), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedItemsChangedCallback));
+        public new IList SelectedItems {
+            get => (IList)GetValue(SelectedItemsProperty);
+            set => SetValue(SelectedItemsProperty, value);
+        }
+
+        public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register(nameof(Delimiter), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", "));
         public string Delimiter {
             get => (string)GetValue(DelimiterProperty);
             set => SetValue(DelimiterProperty, value);
         }
 
-        public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register("AllItemsSelectedContent", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public static readonly DependencyProperty ListDisplayMemberPathProperty = DependencyProperty.Register(nameof(ListDisplayMemberPath), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(null));
+        public string ListDisplayMemberPath {
+            get => (string)GetValue(ListDisplayMemberPathProperty);
+            set => SetValue(ListDisplayMemberPathProperty, value);
+        }
+
+        public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register(nameof(AllItemsSelectedContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
         public string AllItemsSelectedContent {
             get => (string)GetValue(AllItemsSelectedContentProperty);
             set => SetValue(AllItemsSelectedContentProperty, value);
         }
 
-        public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register("IsSelectAllActive", typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register(nameof(IsSelectAllActive), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
         public bool IsSelectAllActive {
             get => (bool)GetValue(IsSelectAllActiveProperty);
             set => SetValue(IsSelectAllActiveProperty, value);
         }
 
-        public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register("SelectAllContent", typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register(nameof(SelectAllContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
         public string SelectAllContent {
             get => (string)GetValue(SelectAllContentProperty);
             set => SetValue(SelectAllContentProperty, value);
         }
 
-        public static readonly DependencyProperty AllItemsSelectedProperty = DependencyProperty.Register("AllItemsSelected", typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public static readonly DependencyProperty AllItemsSelectedProperty = DependencyProperty.Register(nameof(AllItemsSelected), typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
         public bool? AllItemsSelected {
             get => (bool?)GetValue(AllItemsSelectedProperty);
             set => SetValue(AllItemsSelectedProperty, value);
         }
 
-        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register("IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(nameof(IsDropDownOpen), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
         public bool IsDropDownOpen {
             get => (bool)GetValue(IsDropDownOpenProperty);
             set => SetValue(IsDropDownOpenProperty, value);
         }
 
-        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register("MaxDropDownHeight", typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue));
+        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(nameof(MaxDropDownHeight), typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue));
         public double MaxDropDownHeight {
             get => (double)GetValue(MaxDropDownHeightProperty);
             set => SetValue(MaxDropDownHeightProperty, value);
         }
 
+        public new static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(nameof(SelectionChanged), RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckComboBox));
+        public new event SelectionChangedEventHandler SelectionChanged {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
+
         static CheckComboBox() {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckComboBox), new FrameworkPropertyMetadata(typeof(CheckComboBox)));
         }
 
-        private TextBlock TextBox;
+        private bool _viewHandled;
+        private bool _modelHandled;
+        private TextBlock _textBox;
 
         public CheckComboBox() {
             SelectionMode = SelectionMode.Multiple;
+            SelectedItems = new ObservableCollection<object>();
         }
 
         public override void OnApplyTemplate() {
-            TextBox = (GetTemplateChild("TextBox") as TextBlock)!;
+            _textBox = (GetTemplateChild("TextBox") as TextBlock)!;
             var button = GetTemplateChild("Button") as Button;
             button!.Click += Button_MouseDown;
             var item = GetTemplateChild("SelectAllItem") as ListBoxItem;
             item!.PreviewMouseDown += SelectAllItem_MouseDown;
-            SelectionChanged += OnSelectionChanged;
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
             IsEnabledChanged += OnIsEnabledChanged;
+            base.SelectionChanged += OnSelectionChanged;
             base.OnApplyTemplate();
         }
 
+        private static void OnSelectedItemsChangedCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+            if (sender is CheckComboBox ccb)
+                ccb.OnSelectedItemsChanged();
+        }
+
+        private void OnSelectedItemsChanged() {
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
+            SelectItems();
+        }
+
         private void Button_MouseDown(object sender, RoutedEventArgs evt) {
             IsDropDownOpen = !IsDropDownOpen;
         }
@@ -82,25 +121,47 @@ namespace Elwig.Controls {
         }
 
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            var dmp = DisplayMemberPath != null && DisplayMemberPath != "" ? DisplayMemberPath : null;
+            SelectItemsReverse();
+            var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null;
             if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
-                TextBox.Text = AllItemsSelectedContent;
+                _textBox.Text = AllItemsSelectedContent;
                 AllItemsSelected = true;
             } else if (SelectedItems.Count == 0) {
-                TextBox.Text = "";
+                _textBox.Text = "";
                 AllItemsSelected = false;
             } else {
-                TextBox.Text = string.Join(Delimiter,
+                _textBox.Text = string.Join(Delimiter,
                     dmp == null ? SelectedItems.Cast<object>() :
                     SelectedItems.Cast<object>()
                         .Select(i => i.GetType().GetProperty(dmp)?.GetValue(i))
                 );
                 AllItemsSelected = null;
             }
+            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, evt.RemovedItems, evt.AddedItems));
         }
 
         private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs evt) {
             if (!IsEnabled) IsDropDownOpen = false;
         }
+
+        private void SelectItems() {
+            if (_viewHandled || _modelHandled)
+                return;
+            _viewHandled = true;
+            base.SelectedItems.Clear();
+            foreach (var item in SelectedItems)
+                base.SelectedItems.Add(item);
+            _viewHandled = false;
+        }
+
+        private void SelectItemsReverse() {
+            if (_modelHandled || _viewHandled)
+                return;
+            _modelHandled = true;
+            SelectedItems.Clear();
+            foreach (var item in base.SelectedItems)
+                SelectedItems.Add(item);
+            _modelHandled = false;
+        }
     }
 }

Elwig/Controls/IntegerUpDown.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -8,13 +8,13 @@ using System.Windows.Input;
 namespace Elwig.Controls {
     public class IntegerUpDown : TextBox {
 
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register("Miminum", typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(nameof(Minimum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
         public int? Minimum {
             get => (int?)GetValue(MinimumProperty);
             set => SetValue(MinimumProperty, value);
         }
 
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register("Maximum", typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(nameof(Maximum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
         public int? Maximum {
             get => (int?)GetValue(MaximumProperty);
             set => SetValue(MaximumProperty, value);

Elwig/Controls/IntegerUpDown.xaml

@@ -15,9 +15,8 @@
                             <ColumnDefinition Width="18"/>
                         </Grid.ColumnDefinitions>
 
-                        <Border x:Name="Border" BorderThickness="1,1,0,1"
-                                BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                                SnapsToDevicePixels="True" Grid.RowSpan="2">
+                        <Border x:Name="Border" BorderThickness="1,1,0,1" Grid.RowSpan="2"
+                                BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center"/>
                         </Border>
 
@@ -43,6 +42,8 @@
             </Setter.Value>
         </Setter>
         <Setter Property="TextAlignment" Value="Right"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground" Value="Gray"/>

Elwig/Controls/UnitConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
@@ -6,13 +6,13 @@ using System.Windows.Data;
 namespace Elwig.Controls {
     public class UnitConverter : DependencyObject, IValueConverter {
 
-        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null));
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null));
         public string Unit {
             get => (string)GetValue(UnitProperty);
             set => SetValue(UnitProperty, value);
         }
 
-        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register("Precision", typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0));
+        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register(nameof(Precision), typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0));
         public byte Precision {
             get => (byte)GetValue(PrecisionProperty);
             set => SetValue(PrecisionProperty, value);

Elwig/Controls/UnitTextBox.cs

@@ -1,10 +1,10 @@
-using System.Windows;
+using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Controls {
     public class UnitTextBox : TextBox {
 
-        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata(""));
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata(""));
         public string Unit {
             get => (string)GetValue(UnitProperty);
             set => SetValue(UnitProperty, value);

Elwig/Controls/UnitTextBox.xaml

@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:ctrl="clr-namespace:Elwig.Controls">
     <Style TargetType="ctrl:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}">
@@ -7,9 +7,8 @@
                 <ControlTemplate TargetType="ctrl:UnitTextBox">
                     <Border x:Name="Border"
                             BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                            SnapsToDevicePixels="True">
-                        <Grid>
+                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <Grid Background="{Binding Path=Background, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Bottom">
                                 <ScrollViewer.Margin>
                                     <Binding ElementName="UnitBlock" Path="ActualWidth">
@@ -32,6 +31,8 @@
             </Setter.Value>
         </Setter>
         <Setter Property="TextAlignment" Value="Right"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground" Value="Gray"/>

Elwig/Controls/VisibilityConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Globalization;

Elwig/Controls/WidthToMarginConverter.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Globalization;

Elwig/Controls/WineOriginTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {
@@ -12,4 +12,4 @@ namespace Elwig.Controls {
             }
         }
     }
-}
+}

Elwig/Controls/WineQualityLevelTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {

Elwig/Controls/WineVarietyTemplateSelector.cs

@@ -1,4 +1,4 @@
-using System.Windows.Controls;
+using System.Windows.Controls;
 using System.Windows;
 
 namespace Elwig.Controls {

Elwig/Dialogs/AbwertenDialog.xaml

@@ -1,56 +0,0 @@
-<Window x:Class="Elwig.Dialogs.AbwertenDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Dialogs"
-        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
-        WindowStartupLocation="CenterOwner"
-        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
-        Title="Teillieferung abwerten" Height="190" Width="400">
-    <Window.Resources>
-        <Style TargetType="Label">
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Padding" Value="2,4,2,4"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-        <Style TargetType="TextBox">
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Padding" Value="2"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="TextWrapping" Value="NoWrap"/>
-        </Style>
-        <Style TargetType="Button">
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="VerticalAlignment" Value="Bottom"/>
-            <Setter Property="Width" Value="100"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-    </Window.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="70"/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-
-        <TextBlock Margin="10,10,10,10" Grid.ColumnSpan="2" TextWrapping="Wrap" TextAlignment="Center">
-            Welche Menge der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/>
-            von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/><LineBreak/>
-            mit <Run x:Name="TextWeight" FontWeight="Bold" Text="1&#x202f;000&#x202f;kg"/> soll abgewertet werden?
-        </TextBlock>
-
-        <Label Content="Gewicht:" Margin="10,70,10,10"/>
-        <Grid Grid.Column="1" Width="70" Height="25" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2"
-                     TextChanged="WeightInput_TextChanged"/>
-            <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/>
-        </Grid>
-
-        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" IsDefault="True"
-                Click="ConfirmButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
-    </Grid>
-</Window>

Elwig/Dialogs/AbwertenDialog.xaml.cs

@@ -1,33 +0,0 @@
-using Elwig.Helpers;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Elwig.Dialogs {
-    public partial class AbwertenDialog : Window {
-
-        public int Weight;
-
-        public AbwertenDialog(string lsnr, string name, int weight) {
-            Weight = weight;
-            InitializeComponent();
-            TextLsNr.Text = lsnr;
-            TextMember.Text = name;
-            TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg";
-        }
-
-        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
-            DialogResult = true;
-            Weight = int.Parse(WeightInput.Text);
-            Close();
-        }
-
-        private void UpdateButtons() {
-            ConfirmButton.IsEnabled = int.TryParse(WeightInput.Text, out var w) && w > 0 && w <= Weight;
-        }
-
-        private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            Validator.CheckInteger(WeightInput, true, 5);
-            UpdateButtons();
-        }
-    }
-}

Elwig/Dialogs/AreaComModifyDialog.xaml

@@ -0,0 +1,71 @@
+<Window x:Class="Elwig.Dialogs.AreaComModifyDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Flächenbindungen bearbeiten" Height="220" Width="450">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend bearbeitet werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+        <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend gelöscht werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+
+        <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"
+               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14"
+                            Minimum="1900" Maximum="9999"
+                            HorizontalAlignment="Center" VerticalAlignment="Top"
+                            TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="RetroactiveInput" Content="Rückwirkend bearbeiten" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="RetroactiveInput_Changed" Unchecked="RetroactiveInput_Changed"
+                  IsChecked="{Binding ModifyRetroactively}"/>
+
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> unverändert,<LineBreak/>
+            und wird ab inkl. Saison <Bold><Run x:Name="NewSeason1"/></Bold> in geänderter Form übernommen.
+        </TextBlock>
+        <TextBlock x:Name="DescBlock2" Margin="0,105,0,0" TextAlignment="Center" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig.
+        </TextBlock>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -0,0 +1,62 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AreaComModifyDialog : Window {
+
+        public int? YearTo { get; set; }
+        public bool ModifyRetroactively { get; set; }
+
+        public string OrigYearFrom { get; set; }
+        public string OrigYearTo { get; set; }
+        public string Area { get; set; }
+
+        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete) {
+            Area = $"{area:N0}";
+            OrigYearFrom = $"{yearFrom}";
+            OrigYearTo = $"{yearTo}";
+            InitializeComponent();
+            Title = delete ? "Flächenbindung löschen" : "Flächenbindung bearbeiten";
+            RetroactiveInput.Content = delete ? "Rückwirkend löschen" : "Rückwirkend bearbeiten";
+            if (delete) {
+                QuestionBlock1.Visibility = Visibility.Hidden;
+                QuestionBlock2.Visibility = Visibility.Visible;
+                DescBlock1.Visibility = Visibility.Hidden;
+                DescBlock2.Visibility = Visibility.Visible;
+            }
+            if ((yearTo.HasValue && yearTo < Utils.CurrentNextSeason) || (yearFrom.HasValue && yearFrom >= Utils.CurrentNextSeason)) {
+                RetroactiveInput.IsChecked = true;
+            } else {
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+            }
+        }
+
+        private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            YearTo = SeasonInput.Value! - 1;
+            CancelSeason1.Text = $"{YearTo}";
+            CancelSeason2.Text = $"{YearTo}";
+            NewSeason1.Text = $"{YearTo + 1}";
+        }
+
+        private void RetroactiveInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ModifyRetroactively) {
+                SeasonInput.IsEnabled = false;
+                SeasonInput.Text = "";
+                YearTo = null;
+                DescBlock1.Visibility = Visibility.Hidden;
+                DescBlock2.Visibility = Visibility.Hidden;
+            } else {
+                SeasonInput.IsEnabled = true;
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+                DescBlock1.Visibility = QuestionBlock1.Visibility;
+                DescBlock2.Visibility = QuestionBlock2.Visibility;
+            }
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComDialog"
+<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -8,7 +8,7 @@
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="230" Width="450">
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -48,11 +48,15 @@
                             Minimum="1900" Maximum="9999"
                             HorizontalAlignment="Center" VerticalAlignment="Top"
                             TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearFrom}"/>
 
-        <TextBlock x:Name="DescBlock1" Margin="0,85,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
             Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
-            und werden beim <Bold>Nachfolger</Bold> ab inkl. Saison <Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
+            und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
         </TextBlock>
         <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

@@ -1,17 +1,18 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Dialogs {
-    public partial class AreaComDialog : Window {
+    public partial class AreaComTransferDialog : Window {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearFrom { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
 
-        public AreaComDialog(string name, int areaComNum, int area) {
+        public AreaComTransferDialog(string name, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -22,12 +23,13 @@ namespace Elwig.Dialogs {
             QuestionBlock2.Visibility = Visibility.Visible;
             DescBlock1.Visibility = Visibility.Hidden;
             DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
             Height = 240;
             SeasonInput.Margin = new(0, 40, 0, 0);
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
-        public AreaComDialog(string name, string successorName, int areaComNum, int area) {
+        public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -41,7 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/DeleteMemberDialog.xaml

@@ -1,4 +1,5 @@
-<Window x:Class="Elwig.Dialogs.DeleteMemberDialog"
+<Window x:Class="Elwig.Dialogs.DeleteMemberDialog"
+        AutomationProperties.AutomationId="DeleteMemberDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -56,8 +57,8 @@
                   Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                   IsChecked="{Binding DeletePaymentData}"/>
 
-        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False"
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False"
                 Click="ConfirmButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/>
     </Grid>
 </Window>

Elwig/Dialogs/DeleteMemberDialog.xaml.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;

Elwig/Dialogs/DeliveryExtractionDialog.xaml

@@ -1,57 +0,0 @@
-<Window x:Class="Elwig.Dialogs.DeliveryExtractionDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Dialogs"
-        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
-        WindowStartupLocation="CenterOwner"
-        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
-        Title="Teillieferung extrahieren" Height="210" Width="380">
-    <Window.Resources>
-        <Style TargetType="Label">
-            <Setter Property="HorizontalAlignment" Value="Left"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="Padding" Value="2,4,2,4"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-        <Style TargetType="TextBox">
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Padding" Value="2"/>
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="TextWrapping" Value="NoWrap"/>
-        </Style>
-        <Style TargetType="Button">
-            <Setter Property="HorizontalAlignment" Value="Right"/>
-            <Setter Property="VerticalAlignment" Value="Bottom"/>
-            <Setter Property="Width" Value="100"/>
-            <Setter Property="Height" Value="25"/>
-        </Style>
-    </Window.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="200"/>
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-
-        <TextBlock Margin="10,10,0,10" TextWrapping="Wrap">
-            Was soll mit der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/>
-            von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/> geschehen?
-        </TextBlock>
-        <RadioButton x:Name="NewDeliveryButton" Content="Neue Lieferung erstellen"
-                     Margin="10,80,0,10" HorizontalAlignment="Left" VerticalAlignment="Top"
-                     Checked="Selection_Changed" Unchecked="Selection_Changed"/>
-        <RadioButton x:Name="AddToDeliveryButton" Content="Zu Lieferung hinzufügen"
-                     Margin="10,100,0,10" HorizontalAlignment="Left" VerticalAlignment="Top"
-                     Checked="Selection_Changed" Unchecked="Selection_Changed"/>
-
-        <ListBox x:Name="DeliveryList" Grid.Column="1" Margin="10,10,10,45"
-                 SelectionChanged="DeliveryList_SelectionChanged"/>
-
-        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="2" IsEnabled="False" IsDefault="True"
-                Click="ConfirmButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="2" IsCancel="True"/>
-    </Grid>
-</Window>

Elwig/Dialogs/DeliveryExtractionDialog.xaml.cs

@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-
-namespace Elwig.Dialogs {
-    public partial class DeliveryExtractionDialog : Window {
-
-        public string? AddTo;
-
-        public DeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) {
-            InitializeComponent();
-            TextLsNr.Text = lsnr;
-            TextMember.Text = name;
-            NewDeliveryButton.IsEnabled = !single;
-            DeliveryList.IsEnabled = false;
-            DeliveryList.ItemsSource = lsnrs;
-        }
-
-        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
-            DialogResult = true;
-            AddTo = NewDeliveryButton.IsChecked == true ? "new" : DeliveryList.SelectedItem as string;
-            Close();
-        }
-
-        private void UpdateButtons() {
-            ConfirmButton.IsEnabled = NewDeliveryButton.IsChecked == true || (AddToDeliveryButton.IsChecked == true && DeliveryList.SelectedItem != null);
-            DeliveryList.IsEnabled = AddToDeliveryButton.IsChecked == true;
-        }
-
-        private void Selection_Changed(object sender, RoutedEventArgs evt) {
-            UpdateButtons();
-        }
-
-        private void DeliveryList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            UpdateButtons();
-        }
-    }
-}

Elwig/Dialogs/DeliverySplittingDialog.xaml

@@ -0,0 +1,104 @@
+<local:ContextWindow
+        x:Class="Elwig.Dialogs.DeliverySplittingDialog"
+        AutomationProperties.AutomationId="DeliverySplittingDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Lieferung abwerten oder aufteilen" Height="400" Width="600">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+
+        <RadioButton x:Name="DepreciateModeInput" GroupName="ModeInput" Content="Abwerten" Margin="15,10,10,10" IsChecked="True"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+        <RadioButton x:Name="MemberModeInput" GroupName="ModeInput" Content="Auf Mitglied übertragen" Margin="15,30,10,10"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+        <RadioButton x:Name="DeliveryModeInput" GroupName="ModeInput" Content="Zu anderer Lieferung hinzufügen" Margin="15,50,10,10"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+
+        <TextBox x:Name="MgNrInput" FontSize="14" Padding="2" Visibility="Hidden"
+                 Width="48" Margin="220,10,0,0" Height="25" TextAlignment="Right"
+                 TextChanged="MgNrInput_TextChanged"
+                 VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <ComboBox x:Name="MemberInput" FontSize="14" Visibility="Hidden"
+                  Margin="273,10,40,10" IsEditable="True" Height="25"
+                  ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                  SelectionChanged="MemberInput_SelectionChanged"
+                  VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
+        <Button x:Name="MemberReferenceButton" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0"
+                Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen" FontSize="14" Visibility="Hidden"
+                Click="MemberReferenceButton_Click"/>
+
+        <ComboBox x:Name="DeliveryInput" FontSize="14" Visibility="Hidden"
+                  Margin="220,10,10,10" Height="25"
+                  TextSearch.TextPath="LsNr"
+                  SelectionChanged="DeliveryInput_SelectionChanged"
+                  VerticalAlignment="Top" HorizontalAlignment="Stretch">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding LsNr}" Width="100"/>
+                        <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="80" TextAlignment="Right" Margin="0,0,10,0"/>
+                        <TextBlock Text="{Binding Member.AdministrativeName}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <TextBlock x:Name="InfoBlock" Margin="230,45,10,10" FontSize="14" TextAlignment="Right"
+                   VerticalAlignment="Top" HorizontalAlignment="Stretch"
+                   Text="Insgesamt 0 kg / 0 kg ausgewählt."/>
+
+        <ListBox x:Name="DeliveryPartList" Margin="10,75,10,40" ItemsSource="{Binding DeliveryParts, Mode=TwoWay}">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="{x:Type ListBoxItem}">
+                    <Setter Property="Focusable" Value="False"/>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Part.DPNr}" Width="20" TextAlignment="Right"
+                                   VerticalAlignment="Center"  Margin="0,0,5,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.SortId}" Width="40" TextAlignment="Center"
+                                   VerticalAlignment="Center" Margin="0,0,0,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.Kmw, StringFormat='{}{0:N1}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.QualId}" Width="30"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.Weight, StringFormat='{}{0:N0} kg'}" Width="70" TextAlignment="Right"
+                                   VerticalAlignment="Center" Margin="0,0,10,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.Attribute.Name}" Width="60"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.Cultivation.Name}" Width="50"
+                                   VerticalAlignment="Center"/>
+                        <CheckBox IsChecked="{Binding SplitCompletely, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Vollständig" Tag="{Binding Part.DPNr}"
+                                  VerticalAlignment="Center" Margin="20,0,5,0"
+                                  Checked="SplitCompletelyInput_Changed" Unchecked="SplitCompletelyInput_Changed"/>
+                        <ctrl:UnitTextBox Text="{Binding SplitWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Unit="kg" Width="70" Height="25" IsEnabled="{Binding SplitWeightEnabled}" Tag="{Binding Part.DPNr}"
+                                          VerticalAlignment="Center" Margin="5,0,5,0" FontSize="14" Padding="2" Background="White"
+                                          TextChanged="SplitWeightInput_TextChanged"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Dialogs/DeliverySplittingDialog.xaml.cs

@@ -0,0 +1,163 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Elwig.Dialogs {
+    public partial class DeliverySplittingDialog : ContextWindow {
+
+        public class Row {
+            public DeliveryPart Part { get; set; }
+            public bool SplitCompletely { get; set; }
+            public string? SplitWeightString { get; set; }
+            public int? SplitWeight {
+                get => int.TryParse(SplitWeightString, out var v) ? v : null;
+                set => SplitWeightString = $"{value}";
+            }
+            public bool SplitWeightEnabled { get; set; }
+        }
+
+        private readonly Delivery _delivery;
+
+        public int? MgNr { get; set; }
+        public string? LsNr { get; set; }
+        public int[]? Weights => DeliveryParts.Select(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0).ToArray();
+
+        public ObservableCollection<Row> DeliveryParts { get; set; }
+
+        public DeliverySplittingDialog(Delivery d) {
+            _delivery = d;
+            DeliveryParts = new(d.Parts.Select(p => new Row {
+                Part = p,
+                SplitCompletely = false,
+                SplitWeight = null,
+                SplitWeightEnabled = true,
+            }).ToList());
+            InitializeComponent();
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(DeliveryInput, await ctx.Deliveries
+                .Where(d => d.DateString == $"{_delivery.Date:yyyy-MM-dd}" && d.ZwstId == _delivery.ZwstId)
+                .OrderBy(d => d.LsNr)
+                .Include(d => d.Member)
+                .Include(d => d.Parts)
+                .ToListAsync());
+            if (DeliveryInput.SelectedItem == null)
+                ControlUtils.SelectItem(DeliveryInput, _delivery);
+            CheckValidity();
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            if (DepreciateModeInput.IsChecked == true) {
+                MgNr = null;
+                LsNr = null;
+            } else if (MemberModeInput.IsChecked == true) {
+                MgNr = ((Member)MemberInput.SelectedItem).MgNr;
+                LsNr = null;
+            } else if (DeliveryModeInput.IsChecked == true) {
+                MgNr = null;
+                LsNr = ((Delivery)DeliveryInput.SelectedItem).LsNr;
+            }
+            DialogResult = true;
+            Close();
+        }
+
+        private void ModeInput_Changed(object sender, RoutedEventArgs evt) {
+            if (!IsLoaded) return;
+            CheckValidity();
+            if (DepreciateModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Hidden;
+                MemberInput.Visibility = Visibility.Hidden;
+                MemberReferenceButton.Visibility = Visibility.Hidden;
+                DeliveryInput.Visibility = Visibility.Hidden;
+            } else if (MemberModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Visible;
+                MemberInput.Visibility = Visibility.Visible;
+                MemberReferenceButton.Visibility = Visibility.Visible;
+                DeliveryInput.Visibility = Visibility.Hidden;
+            } else if (DeliveryModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Hidden;
+                MemberInput.Visibility = Visibility.Hidden;
+                MemberReferenceButton.Visibility = Visibility.Hidden;
+                DeliveryInput.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void CheckValidity() {
+            var weight = DeliveryParts.Sum(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0);
+            var total = DeliveryParts.Sum(r => r.Part.Weight);
+            InfoBlock.Text = $"Insgesamt {weight:N0} kg / {total:N0} kg ausgewählt.";
+            ConfirmButton.IsEnabled = DeliveryParts.Any(r => r.SplitCompletely || r.SplitWeight > 0) && (
+                DepreciateModeInput.IsChecked == true ||
+                (MemberModeInput.IsChecked == true && MemberInput.SelectedItem != null && !DeliveryParts.All(r => r.SplitCompletely)) ||
+                (DeliveryModeInput.IsChecked == true && DeliveryInput.SelectedItem != null));
+        }
+
+        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var res = Validator.CheckMgNr((TextBox)sender, true);
+            var text = MgNrInput.Text;
+            var caret = MgNrInput.CaretIndex;
+            ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
+            MgNrInput.Text = text;
+            MgNrInput.CaretIndex = caret;
+        }
+
+        private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            var m = MemberInput.SelectedItem as Member;
+            MgNrInput.Text = m?.MgNr.ToString();
+            CheckValidity();
+        }
+
+        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            App.FocusMember(m.MgNr);
+        }
+
+        private void DeliveryInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            CheckValidity();
+        }
+
+        private void SplitCompletelyInput_Changed(object sender, RoutedEventArgs evt) {
+            var checkbox = (CheckBox)sender;
+            var dpnr = int.Parse(checkbox.Tag.ToString()!);
+            var row = DeliveryParts.First(d => d.Part.DPNr == dpnr);
+            if (checkbox.IsChecked == true) {
+                row.SplitWeightEnabled = false;
+                row.SplitWeight = row.Part.Weight;
+            } else if (checkbox.IsChecked == false) {
+                row.SplitWeightEnabled = true;
+                row.SplitWeight = null;
+            }
+            CollectionViewSource.GetDefaultView(DeliveryParts).Refresh();
+            CheckValidity();
+        }
+
+        private void SplitWeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var textbox = (TextBox)sender;
+            Validator.CheckInteger(textbox, false, 6);
+            var dpnr = int.Parse(textbox.Tag.ToString()!);
+            var row = DeliveryParts.First(d => d.Part.DPNr == dpnr);
+            var w = int.TryParse(textbox.Text, out var v) ? v : (int?)null;
+            if (w >= row.Part.Weight) {
+                row.SplitCompletely = true;
+                row.SplitWeightEnabled = false;
+                row.SplitWeight = row.Part.Weight;
+                CollectionViewSource.GetDefaultView(DeliveryParts).Refresh();
+            }
+            CheckValidity();
+        }
+    }
+}

Elwig/Dialogs/NewSeasonDialog.xaml

@@ -1,4 +1,5 @@
-<Window x:Class="Elwig.Dialogs.NewSeasonDialog"
+<Window x:Class="Elwig.Dialogs.NewSeasonDialog"
+        AutomationProperties.AutomationId="NewSeasonDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

Elwig/Dialogs/NewSeasonDialog.xaml.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Windows;

Elwig/Dialogs/UpdateDialog.xaml

@@ -1,15 +1,17 @@
-<Window x:Class="Elwig.Dialogs.UpdateDialog"
+<Window x:Class="Elwig.Dialogs.UpdateDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
-        Title="Neues Update verfügbar - Elwig" Height="180" Width="400">
+        Title="Neues Update verfügbar - Elwig" Height="190" Width="400"
+        Closed="OnClosed">
     <Grid>
-        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,30"
+        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,40"
                    HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center">
-            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!<LineBreak/>
+            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!
+            (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungen</Hyperlink>)<LineBreak/>
             Soll das Update heruntergeladen und<LineBreak/>
             installiert werden? (ca. <Run x:Name="SizeText">100</Run> MB)<LineBreak/>
             <Run FontWeight="Bold">Achtung</Run>: Elwig wird dabei geschlossen!
@@ -19,12 +21,12 @@
                      HorizontalAlignment="Center" VerticalAlignment="Center"
                      Height="27" Width="300" SnapsToDevicePixels="True"/>
 
-        <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,10"
-                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+        <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,20"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                 Width="100" Height="27"
                 Click="InstallButton_Click"/>
-        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True" IsDefault="True"
-                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="115,10,10,20" IsCancel="True"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                 Width="100" Height="27"/>
     </Grid>
 </Window>

Elwig/Dialogs/UpdateDialog.xaml.cs

@@ -1,10 +1,12 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Navigation;
 
 namespace Elwig.Dialogs {
     public partial class UpdateDialog : Window {
@@ -12,36 +14,54 @@ namespace Elwig.Dialogs {
         public string Version { get; private set; }
         public string Url { get; private set; }
 
+        private readonly CancellationTokenSource Cancellation;
+
         public UpdateDialog(string version, string url, long size) {
             Version = version;
             Url = url;
+            Cancellation = new();
             InitializeComponent();
             VersionText.Text = version;
             SizeText.Text = $"{size / 1024 / 1024}";
         }
 
+        private void OnClosed(object sender, EventArgs evt) {
+            Cancellation.Cancel();
+        }
+
         private async void InstallButton_Click(object sender, RoutedEventArgs evt) {
             Description.Visibility = Visibility.Hidden;
             ProgressBar.Visibility = Visibility.Visible;
             InstallButton.IsEnabled = false;
             await Install();
-            DialogResult = true;
             Close();
         }
 
         public async Task Install() {
             var fileName = Path.Combine(App.TempPath, $"Elwig-{Version}.exe");
-            {
+            try {
                 using var stream = new FileStream(fileName, FileMode.Create);
                 using var client = new HttpClient() {
                     Timeout = TimeSpan.FromSeconds(5),
                 };
                 await client.DownloadAsync(Url, stream, new Progress<double>(p => {
                     ProgressBar.Value = p * 100.0;
-                }));
+                }), Cancellation.Token);
+            } catch (OperationCanceledException) {
+                File.Delete(fileName);
+                return;
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-
             Process.Start(fileName);
+            DialogResult = true;
+        }
+
+        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
+            Process.Start(new ProcessStartInfo {
+                FileName = e.Uri.ToString(),
+                UseShellExecute = true,
+            });
         }
     }
 }

Elwig/Documents/BusinessDocument.cs

@@ -22,9 +22,9 @@ namespace Elwig.Documents {
             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
                 $"</tbody></table>";
         }
 
@@ -32,7 +32,7 @@ namespace Elwig.Documents {
             get {
                 IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
                 var plz = addr.PostalDest.AtPlz;
-                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
+                return string.Join("\n", ((string?[])[Member.BillingAddress?.FullName, Member.AdministrativeName, Member.ForTheAttentionOf, addr.Address, $"{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}", addr.PostalDest.Country.Name]).Where(s => !string.IsNullOrWhiteSpace(s)));
             }
         }
 
@@ -81,11 +81,11 @@ namespace Elwig.Documents {
         }
 
         private static string FormatRow(
-            int obligation, int right, int delivery, int? payment = null, int? area = null,
+            int obligation, int right, int delivery, int? totalDelivery = null, int? payment = null, int? area = null,
             bool isGa = false, bool showPayment = false, bool showArea = false
         ) {
+            totalDelivery ??= delivery;
             payment ??= delivery;
-            var baseline = showPayment ? payment : delivery;
 
             if (showArea) {
                 return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" +
@@ -95,15 +95,15 @@ namespace Elwig.Documents {
 
             return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
                 $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" +
-                $"<td>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" +
-                $"<td>{(baseline >= obligation && delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
+                $"<td>{(totalDelivery < obligation ? $"<b>{obligation - totalDelivery:N0}</b>" : "-")}</td>" +
+                $"<td>{(delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
                 $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
                 (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") +
-                $"<td>{delivery:N0}</td>";
+                $"<td>{totalDelivery:N0}</td>";
         }
 
         private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) {
-            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
+            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
         }
 
         public string PrintBucketTable(

Elwig/Documents/BusinessDocument.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">

Elwig/Documents/CreditNote.cs

@@ -33,24 +33,30 @@ namespace Elwig.Documents {
             bool considerCustomModifiers,
             Dictionary<string, UnderDelivery>? underDeliveries = null
         ) :
-            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Data = data;
             Payment = p;
             Credit = p.Credit;
             var season = p.Variant.Season;
+            if (considerCustomModifiers) {
+                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
+            }
+
             var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
-            if (mod != null) {
+            if (CustomPayment?.ModComment != null) {
+                MemberModifier = CustomPayment.ModComment;
+            } else if (mod != null) {
                 MemberModifier = $"{mod.Name} ({mod.ValueStr})";
             } else {
                 MemberModifier = "Sonstige Zu-/Abschläge";
             }
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
-                $"<tr><th>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
+                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextCreditNote;
             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
@@ -88,8 +94,5 @@ namespace Elwig.Documents {
                     .Where(u => u.Item3 != 0)
                     .ToList();
             }
-            if (considerCustomModifiers) {
-                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
-            }
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -3,14 +3,14 @@
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width:  5mm;"/>
-            <col style="width: 22mm;"/>
+            <col style="width:  6mm;"/>
+            <col style="width: 21mm;"/>
             <col style="width: 15mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
@@ -51,7 +51,7 @@
                     <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")">
                         @if (i == 0) {
                             <td rowspan="@rows">@p.LsNr</td>
-                            <td rowspan="@rows">@p.DPNr</td>
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
                             <td class="small">
                                 @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation
@@ -136,7 +136,10 @@
             }
         </tbody>
         <tbody style="break-inside: avoid;">
-            @{ decimal penalty = 0; }
+            @{
+                decimal penalty = 0;
+                string? comment = null;
+            }
 
             @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
                 <tr class="small">
@@ -157,9 +160,15 @@
                 @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
                 penalty += Model.MemberAutoBusinessSharesAmount;
             }
-            @if (Model.CustomPayment != null) {
-                @Raw(FormatRow(Model.CustomPayment.Comment ?? (Model.CustomPayment.Amount < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount, add: true));
-                penalty += Model.CustomPayment.Amount;
+            @if (Model.CustomPayment?.Amount != null) {
+                comment = Model.CustomPayment.Comment;
+                string text = (Model.CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
+                if (comment != null && comment!.Length <= 30) {
+                    text = comment;
+                    comment = null;
+                }
+                @Raw(FormatRow(text, Model.CustomPayment.Amount.Value, add: true));
+                penalty += Model.CustomPayment.Amount.Value;
             }
 
             @if (Model.Credit == null) {
@@ -176,6 +185,9 @@
             }
         </tbody>
     </table>
+    @if (comment != null) {
+        <p>* @comment</p>
+    }
     <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
     <div style="margin-top: 1em;">
         @if (Model.Text != null) {

Elwig/Documents/DeliveryAncmtList.cs

@@ -0,0 +1,21 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryAncmtList : Document {
+
+        public new static string Name => "Anmeldeliste";
+
+        public string Filter;
+        public IEnumerable<DeliveryAncmtListRow> Announcements;
+
+        public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) : base($"{Name} {filter}") {
+            Filter = filter;
+            Announcements = announcements;
+        }
+
+        public DeliveryAncmtList(string filter, DeliveryAncmtListData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -0,0 +1,52 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
+@model Elwig.Documents.DeliveryAncmtList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
+<main>
+    <h1>Anmeldeliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="announcement-list">
+        <colgroup>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 50mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 11mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">MgNr.</th>
+                <th rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Ort</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2">Anmldg.</th>
+                <th>Menge</th>
+            </tr>
+            <tr>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var a in Model.Announcements) {
+                <tr>
+                    <td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
+                    <td class="number">@a.MgNr</td>
+                    <td>@a.AdministrativeName</td>
+                    <td class="small">@a.DefaultKg</td>
+                    <td>@a.Variety</td>
+                    <td class="small center">@(a.Status ?? "-")</td>
+                    <td class="number">@($"{a.Weight:N0}")</td>
+                </tr>
+            }
+            <tr class="sum bold">
+                <td colspan="2">Gesamt:</td>
+                <td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>

Elwig/Documents/DeliveryAncmtList.css

@@ -0,0 +1,13 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-top: 10mm;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -3,14 +3,14 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="delivery-confirmation">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width:  5mm;"/>
-            <col style="width: 24mm;"/>
+            <col style="width:  6mm;"/>
+            <col style="width: 23mm;"/>
             <col style="width: 16mm;"/>
             <col style="width: 17mm;"/>
             <col style="width: 10mm;"/>
@@ -30,12 +30,12 @@
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
                 <th rowspan="3" style="padding: 0;">
                     <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
-                        <text x="-40" y="5" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
+                        <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
                               style="text-anchor: start; alignment-baseline: middle;">
-                            bto./nto.
+                            gerebelt
                         </text>
                     </svg>
                 </th>
@@ -60,7 +60,7 @@
                     <tr class="@(first ? "first" : "") @(p.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
                         @if (first) {
                             <td rowspan="@rows">@p.LsNr</td>
-                            <td rowspan="@rows">@p.DPNr</td>
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
                             <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
                             <td class="small">@p.QualityLevel</td>
@@ -81,7 +81,7 @@
                         }
                         @if (i == p.Buckets.Length - 1) {
                             <td class="number">@($"{p.Weight:N0}")</td>
-                            <td class="small">@(p.IsNetWeight ? "n" : "b")</td>
+                            <td style="font-size: 7pt;">@(p.IsNetWeight ? "\u2611" : "\u2610")</td>
                         } else {
                             <td></td>
                             <td></td>

Elwig/Documents/DeliveryDepreciationList.cs

@@ -0,0 +1,22 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryDepreciationList : Document {
+
+        public new static string Name => "Abwertungsliste";
+
+        public string Filter;
+        public IEnumerable<DeliveryJournalRow> Deliveries;
+
+        public DeliveryDepreciationList(string filter, IEnumerable<DeliveryJournalRow> deliveries) :
+            base($"{Name} {filter}") {
+            Filter = filter;
+            Deliveries = deliveries;
+        }
+
+        public DeliveryDepreciationList(string filter, DeliveryJournalData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/DeliveryDepreciationList.cshtml

@@ -0,0 +1,104 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
+@model Elwig.Documents.DeliveryDepreciationList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
+<main>
+    <h1>Abwertungsliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="journal">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width:  6mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 35mm;"/>
+            <col style="width: 30mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">Zeit</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
+                <th colspan="2">Gradation</th>
+                <th>Menge</th>
+            </tr>
+            <tr>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                int? lastMember = null;
+            }
+            @foreach (var p in Model.Deliveries) {
+                if (lastMember != p.MgNr) {
+                    <tr class="subheading @(lastMember != null ? "new" : "")">
+                        @{
+                            var memberDeliveries = Model.Deliveries.Where(d => d.MgNr == p.MgNr).ToList();
+                            var memberKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(memberDeliveries);
+                            var memberOe = Elwig.Helpers.Utils.KmwToOe(memberKmw);
+                        }
+                        <th colspan="5">
+                            @($"{p.MgNr}, {p.AdministrativeName}")
+                        </th>
+                        <td>Teil-Lfrg.: <span style="float: right;">@($"{memberDeliveries.Count():N0}")</span></td>
+                        <td class="center">@($"{memberOe:N0}")</td>
+                        <td class="center">@($"{memberKmw:N1}")</td>
+                        <td class="number">@($"{memberDeliveries.Sum(p => p.Weight):N0}")</td>
+                    </tr>
+                }
+                <tr>
+                    <td>@p.LsNr</td>
+                    <td class="center narrow">@p.Pos</td>
+                    <td>@($"{p.Date:dd.MM.yyyy}")</td>
+                    <td>@($"{p.Time:HH:mm}")</td>
+                    <td>@p.Variety</td>
+                    <td>@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
+                    <td class="center">@($"{p.Oe:N0}")</td>
+                    <td class="center">@($"{p.Kmw:N1}")</td>
+                    <td class="number">@($"{p.Weight:N0}")</td>
+                </tr>
+                lastMember = p.MgNr;
+            }
+            @{
+                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+                if (branches.Length > 1) {
+                    foreach (var b in branches) {
+                        <tr class="@(branches[0] == b ? "sum" : "") bold">
+                            @{
+                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
+                            }
+                            <td colspan="2">@b:</td>
+                            <td colspan="4">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
+                            <td class="center">@($"{branchOe:N0}")</td>
+                            <td class="center">@($"{branchKmw:N1}")</td>
+                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
+                        </tr>
+                    }
+                }
+            }
+            <tr class="sum bold">
+                @{
+                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
+                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
+                }
+                <td colspan="2">Gesamt:</td>
+                <td colspan="4">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
+                <td class="center">@($"{oe:N0}")</td>
+                <td class="center">@($"{kmw:N1}")</td>
+                <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>

Elwig/Documents/DeliveryDepreciationList.css

@@ -0,0 +1,13 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-top: 10mm;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}

Elwig/Documents/DeliveryJournal.cs

@@ -9,7 +9,8 @@ namespace Elwig.Documents {
         public string Filter;
         public IEnumerable<DeliveryJournalRow> Deliveries;
 
-        public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) : base($"{Name} {filter}") {
+        public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) :
+            base($"{Name} {filter}") {
             Filter = filter;
             Deliveries = deliveries;
         }

Elwig/Documents/DeliveryJournal.cshtml

@@ -2,17 +2,17 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryJournal>
 @model Elwig.Documents.DeliveryJournal
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
 <main>
     <h1>Lieferjournal</h1>
     <h2>@Model.Filter</h2>
     <table class="journal">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width: 5mm;"/>
+            <col style="width:  6mm;"/>
             <col style="width: 15mm;"/>
-            <col style="width: 8mm;"/>
-            <col style="width: 12mm;"/>
+            <col style="width:  8mm;"/>
+            <col style="width: 11mm;"/>
             <col style="width: 38mm;"/>
             <col style="width: 28mm;"/>
             <col style="width: 10mm;"/>
@@ -29,7 +29,7 @@
                 <th rowspan="2" style="text-align: left;">Mitglied</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th colspan="2">Gradation</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[°Oe]</th>
@@ -41,7 +41,7 @@
             @foreach (var p in Model.Deliveries) {
                 <tr>
                     <td>@p.LsNr</td>
-                    <td>@p.Pos</td>
+                    <td class="center narrow">@p.Pos</td>
                     <td class="small">@($"{p.Date:dd.MM.yyyy}")</td>
                     <td class="small">@($"{p.Time:HH:mm}")</td>
                     <td class="number">@p.MgNr</td>
@@ -52,6 +52,25 @@
                     <td class="number">@($"{p.Weight:N0}")</td>
                 </tr>
             }
+            @{
+                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+                if (branches.Length > 1) {
+                    foreach (var b in branches) {
+                        <tr class="@(branches[0] == b ? "sum" : "") bold">
+                            @{
+                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
+                            }
+                            <td colspan="2">@b:</td>
+                            <td colspan="5">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
+                            <td class="center">@($"{branchOe:N0}")</td>
+                            <td class="center">@($"{branchKmw:N1}")</td>
+                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
+                        </tr>
+                    }
+                }
+            }
             <tr class="sum bold">
                 @{
                     var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);

Elwig/Documents/DeliveryNote.cs

@@ -23,9 +23,9 @@ namespace Elwig.Documents {
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
+                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
+                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;

Elwig/Documents/DeliveryNote.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery large">
@@ -24,7 +24,7 @@
             <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <th>Menge</th>
         </tr>
         <tr>
             <th class="unit">[°Oe]</th>
@@ -60,8 +60,18 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.IsManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
-                (@(part.IsNetWeight ? "netto/gerebelt gewogen" : "brutto/nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
+                @if (part.IsManualWeighing) {
+                    <i>Handwiegung @(part.IsNetWeight ? " (gerebelt gewogen)" : " (nicht gerebelt gewogen)")</i>@Raw(part.WeighingReason != null ? ", <i>Begründung:</i> " : "") @part.WeighingReason
+                } else {
+                    var info = part.WeighingInfo;
+                    <i>Waage:</i> @(part.ScaleId ?? "?")@(", ") <i>ID:</i> @(info.Id ?? "?")
+                    @(info.Date != null || info.Time != null ? " – " : "")@(info.Time != null ? $"{info.Time:HH:mm}" : "")@(info.Date != null ? $", {info.Date:dd.MM.yyyy}" : "")
+                    @if (info.Gross != null && info.Tare != null && info.Net != null) {
+                        <br/><i>Brutto:</i> @($"{info.Gross:N0} kg")@(" – ") <i>Tara:</i> @($"{info.Tare:N0} kg")@(" – ") <i>Netto:</i> @($"{info.Net:N0} kg")@(" – ")@Raw(part.IsNetWeight ? "<i>gerebelt gewogen</i>" : "<i>nicht gerebelt gewogen</i>")
+                    } else {
+                        @Raw($" <i>({(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen")})</i>")
+                    }
+                }
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>

Elwig/Documents/Document.cs

@@ -23,7 +23,7 @@ namespace Elwig.Documents {
         public bool ShowFoldMarks = App.Config.Debug;
         public bool DoublePaged = false;
 
-        public string DataPath;
+        public string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
@@ -34,7 +34,7 @@ namespace Elwig.Documents {
 
         public Document(string title) {
             var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
@@ -44,8 +44,8 @@ namespace Elwig.Documents {
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
                 .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
                     .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
-                    .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
+                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
             Date = DateOnly.FromDateTime(Utils.Today);
         }
@@ -78,6 +78,8 @@ namespace Elwig.Documents {
                 name = "CreditNote";
             } else if (this is DeliveryJournal) {
                 name = "DeliveryJournal";
+            } else if (this is DeliveryDepreciationList) {
+                name = "DeliveryDepreciationList";
             } else if (this is Letterhead) {
                 name = "Letterhead";
             } else if (this is DeliveryConfirmation) {
@@ -90,6 +92,8 @@ namespace Elwig.Documents {
                 name = "WineQualityStatistics";
             } else if (this is PaymentVariantSummary) {
                 name = "PaymentVariantSummary";
+            } else if (this is DeliveryAncmtList) {
+                name = "DeliveryAncmtList";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -151,12 +155,12 @@ namespace Elwig.Documents {
 
         public async Task Print(int copies = 1) {
             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(PdfPath, copies);
+            await Pdf.Print(PdfPath, copies, DoublePaged);
         }
 
         public void Show() {
             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
+            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.FullName}" : ""));
         }
 
         public MimePart AsEmailAttachment(string filename) {

Elwig/Documents/Document.cshtml

@@ -7,9 +7,9 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
     @if (Model.DoublePaged) {
         <style>
             @@page :left {

Elwig/Documents/Letterhead.cs

@@ -2,7 +2,7 @@ using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {
-        public Letterhead(Member m) : base($"Briefkopf {m.Name}", m, true) {
+        public Letterhead(Member m) : base($"Briefkopf {m.FullName}", m, true) {
             Aside = "";
         }
     }

Elwig/Documents/MemberDataSheet.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;

Elwig/Documents/MemberDataSheet.cshtml

@@ -1,9 +1,9 @@
-@using RazorLight
+@using RazorLight
 @using Elwig.Helpers
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="member border">
@@ -18,21 +18,31 @@
         <tbody>
             <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr>
             <tr>
-                <th class="small">Titel (vorangestellt)</th>
-                <th class="small">Vorname</th>
-                <th colspan="3" class="small">Nachname</th>
-                <th class="small">Titel (nachgestellt)</th>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <th colspan="3" class="small">Name</th>
+                    <th colspan="3" class="small">Zu Handen</th>
+                } else {
+                    <th class="small">Titel (vorangestellt)</th>
+                    <th class="small">Vorname</th>
+                    <th colspan="3" class="small">Nachname</th>
+                    <th class="small">Titel (nachgestellt)</th>
+                }
             </tr>
             <tr>
-                <td class="large">@Model.Member.Prefix</td>
-                <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
-                <td class="large" colspan="3">@Model.Member.FamilyName</td>
-                <td class="large">@Model.Member.Suffix</td>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <td colspan="3" class="large">@Model.Member.Name</td>
+                    <td colspan="3" class="large">@Model.Member.ForTheAttentionOf</td>
+                } else {
+                    <td class="large">@Model.Member.Prefix</td>
+                    <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
+                    <td class="large" colspan="3">@Model.Member.Name</td>
+                    <td class="large">@Model.Member.Suffix</td>
+                }
             </tr>
             <tr>
                 <th>Mitglieds-Nr.:</th>
                 <td>@Model.Member.MgNr</td>
-                <th colspan="2">Geburtsjahr/-tag:</th>
+                <th colspan="2">@(Model.Member.IsJuridicalPerson ? "Gründungsjahr/-tag" : "Geburtsjahr/-tag"):</th>
                 <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td>
             </tr>
             <tr>
@@ -50,7 +60,7 @@
             <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr>
             <tr>
                 <th>Name:</th>
-                <td colspan="5">@Model.Member.BillingAddress?.Name</td>
+                <td colspan="5">@Model.Member.BillingAddress?.FullName</td>
             </tr>
             <tr>
                 <th>Adresse:</th>
@@ -105,7 +115,7 @@
                 <th>Stammgemeinde:</th>
                 <td>@Model.Member.DefaultKg?.Name</td>
                 <th colspan="2">Buchführend:</th>
-                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
             </tr>
             <tr>
                 <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
@@ -196,7 +206,7 @@
                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                             <td class="number">@($"{areaCom.Area:N0}")</td>
                             <td class="center">@areaCom.WineCult?.Name</td>
-                            <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
+                            <td class="center">@(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;
                     }

Elwig/Documents/MemberDataSheet.css

@@ -1,4 +1,4 @@
-
+
 h2 {
     margin-bottom: 0.5em !important;
 }

Elwig/Documents/MemberList.cs

@@ -1,5 +1,6 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class MemberList : Document {
@@ -9,9 +10,17 @@ namespace Elwig.Documents {
         public string Filter;
         public IEnumerable<MemberListRow> Members;
 
+        public string[] AreaComFilters;
+        public bool FilterAreaComs => AreaComFilters.Length > 0;
+
         public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
             Filter = filter;
             Members = members;
+            AreaComFilters = [..members
+                .SelectMany(m => m.AreaCommitmentsFiltered)
+                .Select(c => c.VtrgId)
+                .Distinct()
+                .Order()];
         }
 
         public MemberList(string filter, MemberListData data) :

Elwig/Documents/MemberList.cshtml

@@ -2,36 +2,67 @@
 @inherits TemplatePage<Elwig.Documents.MemberList>
 @model Elwig.Documents.MemberList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
 <main>
     <h1>Mitgliederliste</h1>
     <h2>@Model.Filter</h2>
     <table class="members">
         <colgroup>
-            <col style="width: 8mm;"/>
-            <col style="width: 42mm;"/>
-            <col style="width: 40mm;"/>
             <col style="width:  8mm;"/>
-            <col style="width: 20mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 38mm;"/>
+            } else {
+                <col style="width: 42mm;"/>
+            }
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 36mm;"/>
+            } else {
+                <col style="width: 40mm;"/>
+            }
+            <col style="width:  8mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 18mm;"/>
+            } else {
+                <col style="width: 20mm;"/>
+            }
             <col style="width: 12mm;"/>
-            <col style="width:  5mm;" />
-            <col style="width: 18mm;"/>
+            <col style="width:  5mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 16mm;"/>
+            } else {
+                <col style="width: 18mm;"/>
+            }
             <col style="width: 12mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 12mm;"/>
+            }
         </colgroup>
         <thead>
             <tr>
-                <th rowspan="2">Nr.</th>
-                <th rowspan="2" style="text-align: left;">Name</th>
-                <th rowspan="2" style="text-align: left;">Adresse</th>
-                <th rowspan="2">PLZ</th>
-                <th rowspan="2" style="text-align: left;">Ort</th>
-                <th rowspan="2">Betr.-Nr.</th>
-                <th rowspan="2">GA</th>
-                <th rowspan="2" style="text-align: left;">Stamm-KG</th>
-                <th>Geb. Fl.</th>
+                @{
+                    var headerSpan = Model.FilterAreaComs ? 3 : 2;
+                }
+                <th rowspan="@headerSpan">Nr.</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Name</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Adresse</th>
+                <th rowspan="@headerSpan">PLZ</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Ort</th>
+                <th rowspan="@headerSpan">Betr.-Nr.</th>
+                <th rowspan="@headerSpan">GA</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th>
+                <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th>
             </tr>
+            @if (Model.FilterAreaComs) {
+                <tr>
+                    @foreach (var vtrgId in Model.AreaComFilters) {
+                        <th>@vtrgId</th>
+                    }
+                </tr>
+            }
             <tr>
-                <th class="unit">[m²]</th>
+                @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) {
+                    <th class="unit">[m²]</th>
+                }
             </tr>
         </thead>
         <tbody class="small">
@@ -40,22 +71,28 @@
             }
             @foreach (var m in Model.Members) {
                 if (lastBranch != null && m.Branch != lastBranch) {
-                    <tr class="spacing"><td colspan="9"></td></tr>
+                    <tr class="spacing"><td colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr>
                     <tr class="header">
-                        <th colspan="9">@m.Branch</th>
+                        <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th>
                     </tr>
                     lastBranch = m.Branch;
                 }
                 <tr>
                     <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
-                    <td>@m.Name1.Replace('ß', 'ẞ').ToUpper() @m.Name2</td>
+                    <td>@m.AdminName1 @m.Name2</td>
                     <td>@m.Address</td>
                     <td>@m.Plz</td>
                     <td class="tiny">@m.Locality</td>
                     <td>@m.LfbisNr</td>
                     <td class="number">@m.BusinessShares</td>
                     <td class="tiny">@m.DefaultKg</td>
-                    <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    @if (Model.AreaComFilters.Length > 0) {
+                        foreach (var v in Model.AreaComFilters) {
+                            <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td>
+                        }
+                    } else {
+                        <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    }
                 </tr>
                 if (m.BillingName != null) {
                     <tr>

Elwig/Documents/PaymentVariantSummary.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
 @model Elwig.Documents.PaymentVariantSummary
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
 <main>
     <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
     <h2>@Model.Variant.Name</h2>
@@ -20,9 +20,10 @@
         @{
             //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
             //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount);
-            var modifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
             var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
-            var sum1 = sum2 - modifiers;
+            var sum1 = sum2 - deliveryModifiers - memberModifiers;
             var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
             var vat = Model.Variant.Credits.Sum(p => p.VatAmount);
@@ -49,7 +50,7 @@
                 <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
             </tr>
             <tr>
-                <th style="overflow: visible;">Nto./bto.-Zuschl:</th>
+                <th style="overflow: visible;">Rebel-Zuschl.:</th>
                 <td colspan="3" class="center">
                     @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
                     @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %
@@ -84,58 +85,58 @@
                 <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td>
             </tr>
             <tr>
-                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
-                <td class="number">@Utils.GetSign(modifiers)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(modifiers):N2}")</td>
+                <th colspan="2">Zu-/Abschläge (Mitglieder):</th>
+                <td class="number">@Utils.GetSign(memberModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td>
                 <th class="lborder">Lieferungen:</th>
                 <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
             </tr>
+            <tr>
+                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <td class="number">@Utils.GetSign(deliveryModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td>
+                <th class="lborder">Teillieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+            </tr>
             <tr>
                 <th colspan="2">Gesamtsumme:</th>
                 <td class="number tborder"></td>
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td>
-                <th class="lborder">Teillieferungen:</th>
-                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
             </tr>
             <tr>
                 <th colspan="2">Bisher ausgezahlt:</th>
                 <td class="number">@Utils.GetSign(payed)</td>
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
-                <th class="lborder"></th>
-                <td colspan="2"></td>
+                @{
+                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
+                }
+                <th class="lborder tborder">Preis (abgewertet):</th>
+                <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
                 <th colspan="2">Nettosumme:</th>
                 <td class="number tborder"></td>
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
-                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.Price);
-                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
                 }
-                <th class="lborder tborder">Preis (abgewertet):</th>
-                <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
+                <th class="lborder">Preis (ungeb., nicht abgew.):</th>
+                <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
             </tr>
             <tr>
                 <th colspan="2">Mehrwertsteuer:</th>
                 <td class="number">@Utils.GetSign(vat)</td>
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
-                @{
-                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
-                }
-                <th class="lborder">Preis (ungeb., nicht abgew.):</th>
-                <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
-            </tr>
-            <tr>
-                <th colspan="2">Bruttosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
-                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
-                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
                     var minGeb = gebRows.Min();
                     var maxGeb = gebRows.Max();
                 }
@@ -144,6 +145,13 @@
                     @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg")
                 </td>
             </tr>
+            <tr>
+                <th colspan="2">Bruttosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
+            </tr>
             <tr>
                 <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th>
                 <td class="number">@Utils.GetSign(totalMods)</td>
@@ -211,19 +219,22 @@
     </table>
     <table class="payment-variant-data">
         <colgroup>
-            <col style="width: 30mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
             <col style="width: 25mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 22mm;"/>
         </colgroup>
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th>Gradation</th>
                 <th colspan="2">ungebunden</th>
+                <th colspan="2">attributlos gebunden</th>
                 <th colspan="2">gebunden</th>
                 <th>Gesamt</th>
             </tr>
@@ -233,6 +244,8 @@
                 <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[kg]</th>
                 <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[@(Model.CurrencySymbol)]</th>
             </tr>
         </thead>
@@ -250,6 +263,8 @@
                         <th colspan="2">@hdr</th>
                         <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
                         <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.LowGeb.Weight):N0}")</td>
+                        <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
                         <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
@@ -259,9 +274,11 @@
                     <td>@(row.QualityLevel)</td>
                     <td class="center">@($"{row.Oe:N0}")</td>
                     <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@($"{row.Amount:N2}")</td>
                 </tr>
                 lastHdr = hdr;

Elwig/Documents/WineQualityStatistics.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System.Collections.Generic;
 
 namespace Elwig.Documents {

Elwig/Documents/WineQualityStatistics.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
 @model Elwig.Documents.WineQualityStatistics
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\WineQualityStatistics.css" />
 <main>
     <h1>Qualitätsstatistik</h1>
     <h2>@Model.Filter</h2>

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.8.6</Version>
+    <Version>1.0.1.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,23 +20,24 @@
     <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
-    <PackageReference Include="LinqKit" Version="1.2.5" />
-    <PackageReference Include="MailKit" Version="4.6.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.31" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
-    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
+    <PackageReference Include="NJsonSchema" Version="11.4.0" />
+    <PackageReference Include="PdfiumViewer" Version="2.13.0" />
+    <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.34" />
-    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.56" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/ActionCommand.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows.Input;
 
 namespace Elwig.Helpers {

Elwig/Helpers/AppDbContext.cs

@@ -17,7 +17,7 @@ namespace Elwig.Helpers {
 
     public record struct AreaComBucket(int Area, int Obligation, int Right);
     public record struct UnderDelivery(int Weight, int Diff);
-    public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
+    public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int DeliveryTotal, int Payment);
     public record struct MemberStat(string Variety, string Discr, int Weight);
     public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum);
 
@@ -51,6 +51,9 @@ namespace Elwig.Helpers {
         public DbSet<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
+        public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
+        public DbSet<DeliveryScheduleWineVar> DeliveryScheduleWineVarieties { get; private set; }
+        public DbSet<DeliveryAncmt> DeliveryAnnouncements { get; private set; }
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
@@ -60,10 +63,12 @@ namespace Elwig.Helpers {
         public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
         public DbSet<PaymentCustom> CustomPayments { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
+        public DbSet<DeliveryPartBucket> DeliveryPartBuckets { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
         public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; }
@@ -75,7 +80,7 @@ namespace Elwig.Helpers {
         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime;
 
         public static string? ConnectionStringOverride { get; set; } = null;
-        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default";
+        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False";
 
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
@@ -98,15 +103,15 @@ namespace Elwig.Helpers {
             SavedChanges += OnSavedChanges;
         }
 
-        public static SqliteConnection Connect() {
-            var cnx = new SqliteConnection(ConnectionString);
+        public static SqliteConnection Connect(string? connectionString = null) {
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             cnx.Open();
             return cnx;
         }
 
-        public static async Task<SqliteConnection> ConnectAsync() {
-            var cnx = new SqliteConnection(ConnectionString);
+        public static async Task<SqliteConnection> ConnectAsync(string? connectionString = null) {
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             await cnx.OpenAsync();
             return cnx;
@@ -200,10 +205,10 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
-        public async Task<int> NextLNr(DateOnly date) {
+        public async Task<int> NextLNr(DateOnly date, string zwstid) {
             var dateStr = date.ToString("yyyy-MM-dd");
             int c = 0;
-            (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync())
+            (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => d.LNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
@@ -236,11 +241,11 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
-        public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
-            return await WineQualityLevels
-                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
-                .OrderBy(q => q.MinKmw)
-                .LastAsync();
+        public async Task<int> NextDsNr(int year) {
+            int c = 0;
+            (await DeliverySchedules.Where(s => s.Year == year).Select(s => s.DsNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
@@ -266,6 +271,31 @@ namespace Elwig.Helpers {
             }
         }
 
+        public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) {
+            foreach (var v in WineVarieties) {
+                var e = new DeliveryScheduleWineVar {
+                    Year = schedule.Year,
+                    DsNr = schedule.DsNr,
+                    SortId = v.SortId,
+                    Priority = 1,
+                };
+                var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                if (n != -1) {
+                    e.Priority = n;
+                    if (o == -1) {
+                        Add(e);
+                    } else {
+                        Update(e);
+                    }
+                } else {
+                    if (o != -1) {
+                        Remove(e);
+                    }
+                }
+            }
+        }
+
         private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
@@ -407,6 +437,7 @@ namespace Elwig.Helpers {
                     rightsAndObligations.GetValueOrDefault(id).Right,
                     deliveryBuckets.GetValueOrDefault(id),
                     deliveryBucketsStrict.GetValueOrDefault(id),
+                    deliveryBuckets.GetValueOrDefault(id) + deliveryBuckets.GetValueOrDefault(id + "_"),
                     paymentBuckets.GetValueOrDefault(id)
                 );
             }

Elwig/Helpers/AppDbUpdater.cs

@@ -9,15 +9,15 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 23;
+        public static readonly int RequiredSchemaVersion = 33;
 
         private static int VersionOffset = 0;
 
-        public static async Task<string> CheckDb() {
+        public static async Task<Version> CheckDb() {
             using var cnx = AppDbContext.Connect();
 
             var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
-            if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
+            if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})");
 
             var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
             VersionOffset = (int)(schemaVers % 100);
@@ -28,18 +28,14 @@ namespace Elwig.Helpers {
             await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
             var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
-            var major = userVers >> 24;
-            var minor = (userVers >> 16) & 0xFF;
-            var patch = userVers & 0xFFFF;
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)((userVers >> 8) & 0xFF), (int)(userVers & 0xFF));
 
-            if (App.VersionMajor > major ||
-                (App.VersionMajor == major && App.VersionMinor > minor) ||
-                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch)) {
-                long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
+            if (App.Version > v) {
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | (App.Version.Build << 8) | App.Version.Revision;
                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 
-            return $"{major}.{minor}.{patch}";
+            return v;
         }
 
         private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {

Elwig/Helpers/Billing/Billing.cs

@@ -157,13 +157,15 @@ namespace Elwig.Helpers.Billing {
                 lastMgNr = mgnr;
             }
 
-            await AppDbContext.ExecuteBatch(cnx, $"""
-                UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year};
-                INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
-                ON CONFLICT DO UPDATE
-                SET discr = excluded.discr, value = value + excluded.value;
-                """);
+            await AppDbContext.ExecuteBatch(cnx, $"UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year}");
+            if (inserts.Count > 0) {
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                    ON CONFLICT DO UPDATE
+                    SET discr = excluded.discr, value = value + excluded.value;
+                    """);
+            }
 
             if (!avoidUnderDlvrs) {
                 if (ownCnx) await cnx.DisposeAsync();

Elwig/Helpers/Billing/BillingData.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using NJsonSchema;
 using System;
 using System.Collections.Generic;
@@ -299,22 +299,30 @@ namespace Elwig.Helpers.Billing {
             return (rev1, rev2);
         }
 
-        protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
+        protected static void CollapsePaymentData(JsonObject data, JsonObject originalData, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
             var (rev1, rev2) = GetReverseKeys(data);
             if (!data.ContainsKey("default")) {
                 foreach (var (v, ks) in rev1) {
-                    if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
-                        foreach (var k in ks) data.Remove(k);
+                    if ((ks.Count > vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
+                        foreach (var k in ks) {
+                            if (!(originalData[$"{k[..2]}/"]?.AsValue().TryGetValue<string>(out var o) ?? false) || o == v)
+                                if (!(originalData[k.Split('-')[0]]?.AsValue().TryGetValue<string>(out var o2) ?? false) || o2 == v)
+                                    data.Remove(k);
+                        }
                         data["default"] = v;
-                        CollapsePaymentData(data, vaributes, useDefault);
+                        CollapsePaymentData(data, originalData, vaributes, useDefault);
                         return;
                     }
                 }
                 foreach (var (v, ks) in rev2) {
-                    if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
-                        foreach (var k in ks) data.Remove(k);
+                    if ((ks.Count > vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
+                        foreach (var k in ks) {
+                            if (!(originalData[$"{k[..2]}/"]?.AsValue().TryGetValue<decimal>(out var o) ?? false) || o == v)
+                                if (!(originalData[k.Split('-')[0]]?.AsValue().TryGetValue<decimal>(out var o2) ?? false) || o2 == v)
+                                    data.Remove(k);
+                        }
                         data["default"] = v;
-                        CollapsePaymentData(data, vaributes, useDefault);
+                        CollapsePaymentData(data, originalData, vaributes, useDefault);
                         return;
                     }
                 }
@@ -330,16 +338,26 @@ namespace Elwig.Helpers.Billing {
                 var len = vaributes.Count(e => $"{e.AttrId}{(e.CultId != null && e.CultId != "" ? "-" : "")}{e.CultId}" == idx);
                 foreach (var (v, ks) in rev1) {
                     var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
-                    if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
+                    if (myKs.Count > 1 && ((myKs.Count > len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
+                        var discr = (idx.StartsWith('-') && !useDefault ? "" : "/") + idx;
+                        data[discr] = v;
+                        foreach (var (k, o) in originalData) {
+                            if (o!.AsValue().TryGetValue<string>(out var o2) && o2 != v && k.Contains(discr))
+                                data[k] = o2;
+                        }
                     }
                 }
                 foreach (var (v, ks) in rev2) {
                     var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
-                    if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
+                    if (myKs.Count > 1 && ((myKs.Count > len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
+                        var discr = (idx.StartsWith('-') && !useDefault ? "" : "/") + idx;
+                        data[discr] = v;
+                        foreach (var (k, o) in originalData) {
+                            if (o!.AsValue().TryGetValue<decimal>(out var o2) && o2 != v && k.Contains(discr))
+                                data[k] = o2;
+                        }
                     }
                 }
             }
@@ -355,13 +373,22 @@ namespace Elwig.Helpers.Billing {
                 } else if (k.Contains("/-")) {
                     data.Remove(k, out var val);
                     data.Add(k.Replace("/-", "-"), val);
+                    if (k[0] == '/' || k.Contains('-')) {
+                        foreach (var (k2, o) in originalData) {
+                            if (!data.ContainsKey(k2) && k2.Contains('-') && k2.Contains("-" + k.Split('-')[1]) && !k2.Contains("/-")
+                                && (!k2.Contains('/') || k2.Length <= 4 || !data.ContainsKey(k2[2..])))
+                            {
+                                data[k2] = o?.DeepClone();
+                            }
+                        }
+                    }
                 }
             }
 
             (rev1, rev2) = GetReverseKeys(data, false);
             var keyVaributes = data
-                .Select(e => e.Key.Split('-')[0])
-                .Where(e => e.Length > 0 && e != "default")
+                .Select(e => e.Key)
+                .Where(e => e.Length > 0 && !e.Contains('-') && e != "default")
                 .Distinct()
                 .ToList();
             foreach (var idx in keyVaributes) {
@@ -419,8 +446,8 @@ namespace Elwig.Helpers.Billing {
                 }
             }
 
-            CollapsePaymentData(payment, vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
-            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
+            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
+            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
 
             var data = new JsonObject {
                 ["mode"] = "elwig",

Elwig/Helpers/Billing/BillingVariant.cs

@@ -29,6 +29,8 @@ namespace Elwig.Helpers.Billing {
             await CalculatePrices(cnx);
             if (Data.ConsiderDelieryModifiers) {
                 await CalculateDeliveryModifiers(cnx);
+            }
+            if (Data.ConsiderCustomModifiers) {
                 await CalculateMemberModifiers(cnx);
             }
             await tx.CommitAsync();
@@ -44,14 +46,14 @@ namespace Elwig.Helpers.Billing {
                            m.mgnr,
                            v.avnr,
                            ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
-                           ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
+                           IIF(lc.amount >= 0, ROUND(lp.amount / POW(10, s.precision - 2)), 0) AS prev_net_amount,
                            IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
                            ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
                            ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
                            ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) +
                            IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0)
                            AS modifiers,
-                           lc.modifiers AS prev_modifiers
+                           IIF(lc.amount >= 0, lc.modifiers, 0) AS prev_modifiers
                     FROM season s
                         JOIN payment_variant v ON v.year = s.year
                         LEFT JOIN payment_variant l ON l.year = s.year
@@ -104,18 +106,21 @@ namespace Elwig.Helpers.Billing {
             if (App.Client.IsMatzen) {
                 var lastYears = 3;
                 var multiplier = 0.50;
+                var includePredecessor = true;
                 var modName = "Treue%";
                 await AppDbContext.ExecuteBatch(cnx, $"""
                     INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
                     SELECT c.year, {AvNr}, s.mgnr, 0,
                            ROUND(s.sum * COALESCE(m.abs, 0)),
                            COALESCE(m.rel, 0)
-                    FROM (SELECT {Year} AS year, mgnr,
-                                 ROUND(AVG(sum) * {multiplier}) AS baseline,
-                                 COUNT(*) = {lastYears} AND MIN(sum) > 0 AS allowed
-                          FROM v_stat_member
-                          WHERE year > {Year} - {lastYears}
-                          GROUP BY mgnr
+                    FROM (SELECT {Year} AS year, m.mgnr,
+                                 ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline,
+                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.sum, b.sum)) > 0 AS allowed
+                          FROM member m
+                              LEFT JOIN v_stat_member a ON a.mgnr = m.mgnr
+                              FULL OUTER JOIN v_stat_member b ON b.mgnr = m.predecessor_mgnr AND b.year = a.year AND {(includePredecessor ? "TRUE" : "FALSE")}
+                          WHERE a.year > {Year} - {lastYears}
+                          GROUP BY m.mgnr
                           HAVING allowed) c
                         JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr)
                         LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}'
@@ -125,6 +130,16 @@ namespace Elwig.Helpers.Billing {
                         mod_rel = mod_rel + excluded.mod_rel
                     """);
             }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
+                SELECT x.year, {AvNr}, x.mgnr, 0, COALESCE(x.mod_abs * POW(10, s.precision - 2), 0), COALESCE(x.mod_rel, 0)
+                FROM payment_custom x
+                    JOIN season s ON s.year = x.year
+                WHERE x.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_abs = mod_abs + excluded.mod_abs,
+                    mod_rel = mod_rel + excluded.mod_rel
+                """);
         }
 
         protected async Task CalculatePrices(SqliteConnection cnx) {

Elwig/Helpers/Billing/EditBillingData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Helpers/Billing/GraphEntry.cs

@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows.Media;
 
 namespace Elwig.Helpers.Billing {
     public class GraphEntry {
@@ -40,6 +41,7 @@ namespace Elwig.Helpers.Billing {
         public string VaributeStringSimple => (Abgewertet ? "Abgew.: " : "") + (Vaributes.Count != 0 ? (Vaributes.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Vaributes.Select(c => c.Listing))) : "-");
         public string VaributeString => Vaributes.Count != 0 ? string.Join("\n", Vaributes.Select(c => c.FullName)) : "-";
         public string VaributeStringChange => (Abgewertet ? "A." : "") + string.Join(",", Vaributes.Select(c => c.Listing));
+        public Brush? Color => Vaributes.Select(v => v.Variety?.Color).Distinct().SingleOrDefault();
         private readonly int Precision;
 
         public GraphEntry(int id, int precision, BillingData.CurveMode mode) {

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;

Elwig/Helpers/Billing/Varibute.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;

Elwig/Helpers/ClientParameters.cs

@@ -19,10 +19,6 @@ namespace Elwig.Helpers {
         public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
         public bool IsGrInzersdorf => IsWeinland;
 
-        public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
-        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
-        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
-
         public string NameToken;
         public string NameShort;
         public string Name;
@@ -51,6 +47,7 @@ namespace Elwig.Helpers {
         public string? Bic;
         public string? UstIdNr;
         public string? LfbisNr;
+        public string? OrganicAuthority;
 
         public string? PhoneNr;
         public string? FaxNr;
@@ -67,6 +64,12 @@ namespace Elwig.Helpers {
         public string? TextEmailSubject;
         public string? TextEmailBody;
 
+        public bool MailIncludeNonDeliverers;
+        public bool MailDoublePaged;
+        public int MailSendPostal;
+        public int MailSendEmail;
+        public int MailOrdering;
+
         public int ExportEbicsVersion;
         public int ExportEbicsAddress;
 
@@ -103,6 +106,7 @@ namespace Elwig.Helpers {
                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
+                OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
 
                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
                     case "NONE": ModeDeliveryNoteStats = 0; break;
@@ -117,7 +121,7 @@ namespace Elwig.Helpers {
                     case "KMW/5": ModeWineQualityStatistics = 3; break;
                     case "KMW/10": ModeWineQualityStatistics = 4; break;
                 }
-                switch (parameters.GetValueOrDefault("ORDERING_MEMBERLIST", "")?.ToUpper()) {
+                switch (parameters.GetValueOrDefault("ORDERING_MEMBERLIST", "MGNR")?.ToUpper()) {
                     case "MGNR": OrderingMemberList = 0; break;
                     case "NAME": OrderingMemberList = 1; break;
                     case "KG": OrderingMemberList = 2; break;
@@ -135,6 +139,31 @@ namespace Elwig.Helpers {
                 TextEmailBody = parameters.GetValueOrDefault("TEXT_EMAIL_BODY");
                 if (TextEmailBody == "") TextEmailBody = null;
 
+                MailIncludeNonDeliverers = (parameters.GetValueOrDefault("MAIL_INCLUDE_NON_DELIVERERS")?.ToUpper()) switch {
+                    "1" or "TRUE" or "YES" or "JA" => true,
+                    _ => false,
+                };
+                MailDoublePaged = (parameters.GetValueOrDefault("MAIL_DOUBLE_PAGED")?.ToUpper()) switch {
+                    "1" or "TRUE" or "YES" or "JA" => true,
+                    _ => false,
+                };
+                switch (parameters.GetValueOrDefault("MAIL_SEND_POSTAL", "WISH")?.ToUpper()) {
+                    case "ALL": MailSendPostal = 3; break;
+                    case "WISH": MailSendPostal = 2; break;
+                    case "NO_EMAIL": MailSendPostal = 1; break;
+                    case "NONE": MailSendPostal = 0; break;
+                }
+                switch (parameters.GetValueOrDefault("MAIL_SEND_EMAIL", "WISH")?.ToUpper()) {
+                    case "ALL": MailSendEmail = 2; break;
+                    case "WISH": MailSendEmail = 1; break;
+                    case "NONE": MailSendEmail = 0; break;
+                }
+                switch (parameters.GetValueOrDefault("MAIL_ORDERING", "MGNR")?.ToUpper()) {
+                    case "MGNR": MailOrdering = 0; break;
+                    case "NAME": MailOrdering = 1; break;
+                    case "PLZ": MailOrdering = 2; break;
+                }
+
                 ExportEbicsVersion = int.TryParse(parameters.GetValueOrDefault("EXPORT_EBICS_VERSION"), out var v) ? v : 9;
                 switch (parameters.GetValueOrDefault("EXPORT_EBICS_ADDRESS", "FULL")?.ToUpper()) {
                     case "OMIT": ExportEbicsAddress = 0; break;
@@ -177,6 +206,25 @@ namespace Elwig.Helpers {
                 case 1: orderingMemberList = "NAME"; break;
                 case 2: orderingMemberList = "KG"; break;
             }
+            string mailSendPostal = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailSendPostal = "NONE"; break;
+                case 1: mailSendPostal = "NO_EMAIL"; break;
+                case 2: mailSendPostal = "WISH"; break;
+                case 3: mailSendPostal = "ALL"; break;
+            }
+            string mailSendEmail = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailSendEmail = "NONE"; break;
+                case 1: mailSendEmail = "WISH"; break;
+                case 2: mailSendEmail = "ALL"; break;
+            }
+            string mailOrdering = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailOrdering = "MGNR"; break;
+                case 1: mailOrdering = "NAME"; break;
+                case 2: mailOrdering = "PLZ"; break;
+            }
             string exportEbicsAddress = "FULL";
             switch (ExportEbicsAddress) {
                 case 0: exportEbicsAddress = "OMIT"; break;
@@ -203,6 +251,7 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
+                ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics),
                 ("ORDERING_MEMBERLIST", orderingMemberList),
@@ -212,6 +261,11 @@ namespace Elwig.Helpers {
                 ("TEXT_CREDITNOTE", TextCreditNote),
                 ("TEXT_EMAIL_SUBJECT", TextEmailSubject),
                 ("TEXT_EMAIL_BODY", TextEmailBody),
+                ("MAIL_INCLUDE_NON_DELIVERERS", MailIncludeNonDeliverers ? "YES" : "NO"),
+                ("MAIL_DOUBLE_PAGED", MailDoublePaged ? "YES" : "NO"),
+                ("MAIL_SEND_POSTAL", mailSendPostal),
+                ("MAIL_SEND_EMAIL", mailSendEmail),
+                ("MAIL_ORDERING", mailOrdering),
                 ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()),
                 ("EXPORT_EBICS_ADDRESS", exportEbicsAddress),
                 ("AUTOADJUST_BUSINESSSHARES", autoAdjust),

Elwig/Helpers/Config.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -5,6 +6,8 @@ using Microsoft.Extensions.Configuration;
 
 namespace Elwig.Helpers {
 
+    public enum WeighingMode { Gross, Net, Box }
+
     public record struct ScaleConfig {
         public string Id;
         public string? Type;
@@ -41,6 +44,7 @@ namespace Elwig.Helpers {
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
+        public WeighingMode? WeighingMode;
         public string? UpdateUrl = null;
         public bool UpdateAuto = false;
         public string? SyncUrl = null;
@@ -69,11 +73,13 @@ namespace Elwig.Helpers {
         public void Read() {
             var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
 
-            DatabaseFile = Path.Combine(App.DataPath, config["database:file"] ?? "database.sqlite3");
+            DatabaseFile = Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, config["database:file"] ?? "database.sqlite3");
             var log = config["database:log"];
-            DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
+            DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null;
             Branch = config["general:branch"];
             Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
+            var weighing = config["general:weighing"];
+            WeighingMode = weighing != null && Enum.TryParse<WeighingMode>(weighing, true, out var w) ? w : null;
             UpdateUrl = config["update:url"];
             UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
             SyncUrl = config["sync:url"];
@@ -87,7 +93,7 @@ namespace Elwig.Helpers {
             SmtpPassword = config["smtp:password"];
             SmtpFrom = config["smtp:from"];
 
-            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key);
+            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order();
             ScaleList.Clear();
             Scales = ScaleList;
             foreach (var s in scales) {

Elwig/Helpers/ControlUtils.cs

@@ -5,17 +5,14 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Threading;
 using Brush = System.Windows.Media.Brush;
 using Brushes = System.Windows.Media.Brushes;
 
 namespace Elwig.Helpers {
     public class ControlUtils {
 
-        public enum RenewSourceDefault {
-            None,
-            IfOnly,
-            First
-        }
+        public enum RenewSourceDefault { None, IfOnly, First }
 
         private static void SetControlBorderBrush(Control input, Brush brush) {
             if (input is ComboBox cb) {
@@ -171,15 +168,19 @@ namespace Elwig.Helpers {
             return item;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, object? item) {
-            return GetItemFromSource(source, Utils.GetEntityIdentifier(item));
+        public static T? GetItemFromSource<T>(IEnumerable source, T? item) {
+            return (T?)GetItemFromSource(source, Utils.GetEntityIdentifier(item));
+        }
+
+        public static object? GetItemFromSourceWithPk(IEnumerable source, params object?[] primaryKey) {
+            return GetItemFromSource(source, (int?)Utils.GetEntityIdetifierForPk(primaryKey));
         }
 
         public static void SelectItemWithHash(Selector input, int? hash) {
             if (hash == null) {
                 input.SelectedItem = null;
             } else {
-                input.SelectedItem = GetItemFromSource(input.ItemsSource, (int)hash);
+                input.SelectedItem = GetItemFromSource(input.ItemsSource, hash);
             }
             if (input is ListBox lb && lb.SelectedItem is object lbItem) {
                 lb.ScrollIntoView(lbItem);
@@ -234,5 +235,21 @@ namespace Elwig.Helpers {
                 return null;
             }
         }
+
+        public static void InitializeDelayTimer(TextBox tb, Action<object, TextChangedEventArgs> handler) {
+            var timer = new DispatcherTimer {
+                Interval = TimeSpan.FromMilliseconds(250)
+            };
+            timer.Tick += (object? sender, EventArgs evt) => {
+                timer.Stop();
+                var (oSender, oEvent) = ((object, TextChangedEventArgs))timer.Tag;
+                handler(oSender, oEvent);
+            };
+            tb.TextChanged += (object sender, TextChangedEventArgs evt) => {
+                timer.Stop();
+                timer.Tag = (sender, evt);
+                timer.Start();
+            };
+        }
     }
 }

Elwig/Helpers/Export/Bki.cs

@@ -22,20 +22,20 @@ namespace Elwig.Helpers.Export {
                 """;
             var c = App.Client;
             var (a1, a2) = Utils.SplitAddress(c.Address);
-            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};{a2};{c.Plz};{c.Ort}";
+            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};\t{a2};{c.Plz};{c.Ort}";
         }
 
         public async Task ExportAsync(int year) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT lfbis_nr, family_name, name, billing_name, address, plz, ort, area,
+                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area,
                        date, weight, type, sortid, qualid, year, hkid, kmw, oe
                 FROM v_bki_delivery
                 WHERE year = {year}
                 """;
             var r = await cmd.ExecuteReaderAsync();
-            List<Row> rows = new();
+            List<Row> rows = [];
             while (await r.ReadAsync()) {
                 rows.Add(new(
                     (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
@@ -57,7 +57,7 @@ namespace Elwig.Helpers.Export {
 
             var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
             var (a1, a2) = Utils.SplitAddress(address);
-            var memberData = $"{lfBisNr};{n1};{n2};{a1};{a2};{plz};{ort}";
+            var memberData = $"{lfBisNr};{n1};{n2};{a1};\t{a2};{plz};{ort}";
             var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
             var vollData = $"N;;;{area / 10_000.0}";
 

Elwig/Helpers/Export/Database.cs

@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public static class Database {
+
+        private static async Task<(long? ApplicationId, string? UserVersion, long? SchemaVersion, long FileSize)> GetMeta() {
+            long size = new FileInfo(App.Config.DatabaseFile).Length;
+            using var cnx = await AppDbContext.ConnectAsync();
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id");
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version");
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version");
+            return (applId, userVers != null ? $"{userVers >> 24}.{(userVers >> 16) & 0xFF}.{(userVers >> 8) & 0xFF}.{userVers & 0xFF}" : null, schemaVers, size);
+        }
+
+        public static async Task ExportSqlite(string filename, bool zipFile) {
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
+            } else {
+                File.Copy(App.Config.DatabaseFile, filename, true);
+            }
+        }
+
+        public static async Task ExportSql(string filename, bool zipFile) {
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var sql = zip.CreateEntry("database.sql", CompressionLevel.SmallestSize);
+                using (var writer = new StreamWriter(sql.Open(), Utils.UTF8)) {
+                    await ExportSql(writer);
+                }
+            } else {
+                using var stream = File.OpenWrite(filename);
+                using var writer = new StreamWriter(stream, Utils.UTF8);
+                await ExportSql(writer);
+            }
+        }
+
+        public static async Task ExportSql(StreamWriter writer) {
+            using var cnx = await AppDbContext.ConnectAsync();
+
+            var tables = new List<(string Name, string Sql)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT name, sql FROM sqlite_schema WHERE type = 'table'";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    tables.Add((reader.GetString(0), reader.GetString(1)));
+                }
+            }
+
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+
+            await writer.WriteLineAsync($"-- Elwig database dump, {DateTime.Now:yyyy-MM-dd, HH:mm:ss}");
+            await writer.WriteLineAsync($"-- {Environment.MachineName}, Zwst. {App.BranchName}, {App.Client.Name}");
+            await writer.WriteLineAsync("BEGIN TRANSACTION;");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=OFF;");
+            await writer.WriteLineAsync($"PRAGMA application_id=0x{applId:X8};");
+            await writer.WriteLineAsync($"PRAGMA user_version=0x{userVers:X8};");
+
+            foreach (var t in tables) {
+                await writer.WriteAsync(t.Sql);
+                await writer.WriteLineAsync(";");
+
+                var columnNames = new List<string>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"PRAGMA table_info({t.Name})";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        columnNames.Add(reader.GetString(1));
+                    }
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"SELECT {string.Join(',', columnNames)} FROM {t.Name}";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    var columns = await reader.GetColumnSchemaAsync();
+                    var values = new object[reader.FieldCount];
+                    while (await reader.ReadAsync()) {
+                        await writer.WriteAsync($"INSERT INTO {t.Name} VALUES (");
+
+                        reader.GetValues(values);
+                        for (int i = 0; i < columns.Count; i++) {
+                            var c = columns[i];
+                            var v = values[i];
+                            if (i > 0) await writer.WriteAsync(",");
+                            if (v == null || v is DBNull) {
+                                await writer.WriteAsync("NULL");
+                            } else if (c.DataTypeName == "TEXT") {
+                                await writer.WriteAsync($"'{v.ToString()?.Replace("'", "''")}'");
+                            } else {
+                                await writer.WriteAsync(v.ToString()?.Replace(',', '.'));
+                            }
+                        }
+
+                        await writer.WriteLineAsync(");");
+                    }
+                }
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT sql FROM sqlite_schema WHERE type != 'table' AND sql IS NOT NULL";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    await writer.WriteAsync(reader.GetString(0));
+                    await writer.WriteLineAsync(";");
+                }
+            }
+
+            await writer.WriteLineAsync($"PRAGMA schema_version={schemaVers};");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=ON;");
+            await writer.WriteLineAsync("COMMIT;");
+            await writer.WriteLineAsync("VACUUM;");
+        }
+
+        public static async Task Import(string filename) {
+            if (filename.EndsWith(".sql")) {
+                await ImportSql(filename, false);
+            } else if (filename.EndsWith(".sql.zip")) {
+                await ImportSql(filename, true);
+            } else if (filename.EndsWith(".sqlite3")) {
+                await ImportSqlite(filename, false);
+            } else if (filename.EndsWith(".sqlite3.zip")) {
+                await ImportSqlite(filename, true);
+            } else {
+                throw new ArgumentException($"Unknown file extension for importing: '{filename}'");
+            }
+        }
+
+        public static async Task ImportSql(string filename, bool zipFile = false) {
+            if (zipFile) {
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                await zip.CheckIntegrity();
+                foreach (var entry in zip.Entries) {
+                    if (entry.Name.EndsWith(".sql")) {
+                        using var stream = entry.Open();
+                        using var reader = new StreamReader(stream, Utils.UTF8);
+                        await ImportSql(reader);
+                        return;
+                    }
+                }
+                throw new FileFormatException("ZIP archive has to contain at least one .sql file");
+            } else {
+                using var stream = File.Open(filename, FileMode.Open);
+                using var reader = new StreamReader(stream, Utils.UTF8);
+                await ImportSql(reader);
+            }
+        }
+
+        public static async Task ImportSqlite(string filename, bool zipFile = false) {
+            if (zipFile) {
+                var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+                try {
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                    await zip.CheckIntegrity();
+                    foreach (var entry in zip.Entries) {
+                        if (entry.Name.EndsWith(".sqlite3")) {
+                            entry.ExtractToFile(newName);
+                            await ImportSqlite(newName);
+                            return;
+                        }
+                    }
+                    throw new FileFormatException("ZIP archive has to contain at least one .sqlite3 file");
+                } finally {
+                    if (File.Exists(newName)) File.Delete(newName);
+                }
+            }
+
+            var oldName = Path.ChangeExtension(App.Config.DatabaseFile, ".old.sqlite3");
+            File.Move(App.Config.DatabaseFile, oldName, true);
+            File.Move(filename, App.Config.DatabaseFile, false);
+
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, "VACUUM");
+        }
+
+        public static async Task ImportSql(StreamReader reader) {
+            var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+            File.Delete(newName);
+            try {
+                using (var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{newName}\"; Mode=ReadWriteCreate; Foreign Keys=False; Cache=Default; Pooling=False")) {
+                    await AppDbContext.ExecuteBatch(cnx, await reader.ReadToEndAsync());
+                }
+                await ImportSqlite(newName);
+            } finally {
+                if (File.Exists(newName)) File.Delete(newName);
+            }
+        }
+    }
+}

Elwig/Helpers/Export/Ebics.cs

@@ -83,7 +83,7 @@ namespace Elwig.Helpers.Export {
                         <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
                         <Cdtr>
-                         <Nm>{SecurityElement.Escape(a.Name[..Math.Min(140, a.Name.Length)])}</Nm>
+                         <Nm>{SecurityElement.Escape(a.FullName[..Math.Min(140, a.FullName.Length)])}</Nm>
                     """);
                 if (ShowAddresses != AddressMode.Omit) {
                     var full = ShowAddresses == AddressMode.Full;

Elwig/Helpers/Export/ElwigData.cs

@@ -1,17 +1,20 @@
-using System.IO.Compression;
-using System.IO;
-using System.Threading.Tasks;
 using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System;
-using System.Text.Json.Nodes;
-using System.Linq;
-using System.Windows;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
 
+        public enum ImportMode { Auto, Interactively, FromBranches }
+
         public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt");
 
         public static async Task<string[]> GetImportedFiles() {
@@ -22,146 +25,696 @@ namespace Elwig.Helpers.Export {
             }
         }
 
-        public static async Task AddImportedFiles(IEnumerable<string> filenames) {
+        public static async Task AddImportedFiles(params string[] filenames) {
             await File.AppendAllLinesAsync(ImportedTxt, filenames, Utils.UTF8);
         }
 
-        public static Task Import(string filename, bool interactive) => Import([filename], interactive);
+        public static Task Import(string filename, ImportMode mode) => Import([filename], mode);
 
-        public static async Task Import(IEnumerable<string> filenames, bool interactive) {
+        public static async Task Import(IEnumerable<string> filenames, ImportMode mode) {
             try {
-                using var ctx = new AppDbContext();
-                var currentDids = await ctx.Deliveries
-                    .GroupBy(d => d.Year)
-                    .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+                Dictionary<string, Branch> branches;
+                Dictionary<int, int> currentDids;
+                Dictionary<string, int> currentLsNrs;
+                Dictionary<int, List<WbRd>> currentWbRde;
+                Dictionary<int, AT_Kg> kgs;
+                List<WbGl> currentWbGls;
 
-                var deliveries = new List<Delivery>();
-                var deliveryParts = new List<DeliveryPart>();
-                var modifiers = new List<DeliveryPartModifier>();
+                using (var ctx = new AppDbContext()) {
+                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
+                    currentDids = await ctx.Deliveries
+                        .GroupBy(d => d.Year)
+                        .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+                    currentLsNrs = await ctx.Deliveries
+                        .ToDictionaryAsync(d => d.LsNr, d => d.DId);
+                    currentWbRde = await ctx.WbRde
+                        .GroupBy(r => r.KgNr)
+                        .ToDictionaryAsync(g => g.Key, g => g.ToList());
+                    currentWbGls = await ctx.WbGls.ToListAsync();
+                    kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
+                }
 
-                var metaData = new List<(string Name, int DeliveryNum, string Filters)>();
+                var data = new List<(
+                    List<Member> Members,
+                    List<BillingAddr> BillingAddresses,
+                    List<MemberTelNr> TelephoneNumbers,
+                    List<MemberEmailAddr> EmailAddresses,
+                    List<AreaCom> AreaCommitments,
+                    List<WbRd> Riede,
+                    List<WbKg> WbKgs,
+                    List<WbGl> WbGls,
+                    List<Delivery> Deliveries,
+                    List<DeliveryPart> DeliveryParts,
+                    List<DeliveryPartModifier> Modifiers,
+                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
+
+                var metaData = new List<(string FileName, string ZwstId, string Device,
+                    int? MemberNum, string? MemberFilters,
+                    int? AreaComNum, string? AreaComFilters,
+                    int? DeliveryNum, string? DeliveryFilters)>();
 
                 foreach (var filename in filenames) {
-                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                    try {
+                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
+                            ["member"] = [],
+                            ["area_commitment"] = [],
+                            ["delivery"] = [],
+                        })));
+                        var r = data[^1];
 
-                    var version = zip.GetEntry("version");
-                    using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                        if (await reader.ReadToEndAsync() != "elwig:1")
-                            throw new FileFormatException("Ungültige Export-Datei");
-                    }
+                        // TODO read encrypted files
+                        using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                        await zip.CheckIntegrity();
 
-                    var metaJson = zip.GetEntry("meta.json");
-                    var meta = await JsonNode.ParseAsync(metaJson!.Open());
-                    var deliveryCount = meta!["deliveries"]?["count"]!.AsValue().GetValue<int>();
-                    var deliveryFilters = meta!["deliveries"]?["filters"]!.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                    if (deliveryCount != null && deliveryFilters != null)
-                        metaData.Add((Path.GetFileName(filename), (int)deliveryCount, string.Join(" / ", deliveryFilters)));
-
-                    var membersJson = zip.GetEntry("members.json");
-                    if (membersJson != null) {
-                        using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
-                        string? line;
-                        while ((line = await reader.ReadLineAsync()) != null) {
-                            var obj = JsonNode.Parse(line)!.AsObject();
-                            // TODO import members.json
+                        var version = zip.GetEntry("version");
+                        using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
+                            if (await reader.ReadToEndAsync() != "elwig:1")
+                                throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
                         }
-                    }
 
-                    var areaComsJson = zip.GetEntry("area_commitments.json");
-                    if (areaComsJson != null) {
-                        using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
-                        string? line;
-                        while ((line = await reader.ReadLineAsync()) != null) {
-                            var obj = JsonNode.Parse(line)!.AsObject();
-                            // TODO import area_commitments.json
+                        var metaJson = zip.GetEntry("meta.json");
+                        var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                        var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                        var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
+                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
+                        var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        metaData.Add((Path.GetFileName(filename),
+                            meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
+                            memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
+                            areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                            deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
+
+                        var wbKgsJson = zip.GetEntry("wb_kgs.json");
+                        if (wbKgsJson != null) {
+                            using var reader = new StreamReader(wbKgsJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (k, g) = obj.ToWbKg(currentWbGls);
+                                r.WbKgs.Add(k);
+                                if (g != null) {
+                                    currentWbGls[g.GlNr] = g;
+                                    r.WbGls.Add(g);
+                                }
+                            }
                         }
-                    }
 
-                    var deliveriesJson = zip.GetEntry("deliveries.json");
-                    if (deliveriesJson != null) {
-                        using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
-                        string? line;
-                        while ((line = await reader.ReadLineAsync()) != null) {
-                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (d, parts, mods) = JsonToDelivery(obj, currentDids);
-                            deliveries.Add(d);
-                            deliveryParts.AddRange(parts);
-                            modifiers.AddRange(mods);
+                        var membersJson = zip.GetEntry("members.json");
+                        if (membersJson != null) {
+                            using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
+                                r.Members.Add(m);
+                                if (b != null) r.BillingAddresses.Add(b);
+                                r.TelephoneNumbers.AddRange(telNrs);
+                                r.EmailAddresses.AddRange(emailAddrs);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        var areaComsJson = zip.GetEntry("area_commitments.json");
+                        if (areaComsJson != null) {
+                            using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
+                                r.AreaCommitments.Add(areaCom);
+                                if (wbrd != null) {
+                                    r.Riede.Add(wbrd);
+                                }
+                                if (timestamps.HasValue)
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        var deliveriesJson = zip.GetEntry("deliveries.json");
+                        if (deliveriesJson != null) {
+                            using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
+                                r.Deliveries.Add(d);
+                                r.DeliveryParts.AddRange(parts);
+                                r.Modifiers.AddRange(mods);
+                                r.Riede.AddRange(rde);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+                    } catch (Exception exc) when (
+                            exc is InvalidDataException ||
+                            exc is FileFormatException ||
+                            exc is FileNotFoundException ||
+                            exc is IOException) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen.\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                        await AddImportedFiles(Path.GetFileName(filename));
+                    } catch (Exception exc) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        var r = MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No);
+                        if (r == MessageBoxResult.Yes) {
+                            await AddImportedFiles(Path.GetFileName(filename));
                         }
                     }
                 }
 
-                var lsnrs = deliveries.Select(d => d.LsNr).ToList();
-                var duplicateLsNrs = await ctx.Deliveries
-                    .Where(d => lsnrs.Contains(d.LsNr))
-                    .Select(d => d.LsNr)
-                    .ToListAsync();
-                var duplicateDIds = deliveries
-                    .Where(d => duplicateLsNrs.Contains(d.LsNr))
-                    .Select(d => (d.Year, d.DId))
-                    .ToList();
-                bool overwriteDelivieries = false;
-                if (duplicateLsNrs.Count > 0) {
-                    var res = MessageBox.Show($"Sollen {duplicateLsNrs.Count} Lieferungen überschreiben werden?", "Lieferungen überschreiben",
-                        MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-                    overwriteDelivieries = res == MessageBoxResult.Yes;
+                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
+                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                    var branch = branches[meta.ZwstId];
+                    var device = meta.Device;
+
+                    using var ctx = new AppDbContext();
+
+                    var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
+                    var duplicateKgNrs = await ctx.WbKgs
+                        .Where(k => kgnrs.Contains(k.KgNr))
+                        .Select(k => k.KgNr)
+                        .ToListAsync();
+
+                    var mgnrs = members.Select(m => m.MgNr).ToList();
+                    var duplicateMgNrs = await ctx.Members
+                        .Where(m => mgnrs.Contains(m.MgNr))
+                        .Select(m => m.MgNr)
+                        .ToListAsync();
+                    bool importNewMembers = false, importDuplicateMembers = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (mgnrs.Count - duplicateMgNrs.Count > 0)
+                            importNewMembers = ImportQuestion(branch.Name, device, "Mitglieder", false, mgnrs.Count - duplicateMgNrs.Count);
+                    } else {
+                        importNewMembers = true;
+                    }
+                    if (duplicateMgNrs.Count > 0)
+                        importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count);
+
+                    var fbnrs = areaCommitments.Select(c => c.FbNr).ToList();
+                    var duplicateFbNrs = await ctx.AreaCommitments
+                        .Where(c => fbnrs.Contains(c.FbNr))
+                        .Select(c => c.FbNr)
+                        .ToListAsync();
+
+                    var lsnrs = deliveries.Select(d => d.LsNr).ToList();
+                    var duplicateLsNrs = await ctx.Deliveries
+                        .Where(d => lsnrs.Contains(d.LsNr))
+                        .Select(d => d.LsNr)
+                        .ToListAsync();
+                    var duplicateDIds = deliveries
+                        .Where(d => duplicateLsNrs.Contains(d.LsNr))
+                        .Select(d => (d.Year, d.DId))
+                        .ToList();
+                    var allowedDuplicateLsNrs = new List<string>();
+                    bool importNewDeliveries = false, importDuplicateDeliveries = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (lsnrs.Count - duplicateLsNrs.Count > 0)
+                            importNewDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", false, lsnrs.Count - duplicateLsNrs.Count);
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    } else if (mode == ImportMode.FromBranches) {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0) {
+                            allowedDuplicateLsNrs = await ctx.Deliveries
+                                .Where(d => lsnrs.Contains(d.LsNr) && d.ZwstId == branch.ZwstId)
+                                .Select(d => d.LsNr)
+                                .ToListAsync();
+                            if (duplicateLsNrs.Count - allowedDuplicateLsNrs.Count > 0)
+                                importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count - allowedDuplicateLsNrs.Count);
+                        }
+                    } else {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    }
+
+                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
+                        ctx.AddRange(wbGls);
+                        ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
+                        ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
+                    }
+
+                    if (importDuplicateMembers) {
+                        ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (importNewMembers) {
+                        ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (members.Count > 0) {
+                        var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0;
+                        var o = importDuplicateMembers ? duplicateMgNrs.Count : 0;
+                        importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
+                    }
+                    if (areaCommitments.Count > 0) {
+                        ctx.AddRange(riede);
+                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
+                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
+                    }
+
+                    if (allowedDuplicateLsNrs.Count > 0) {
+                        var dids = deliveries
+                            .Where(d => allowedDuplicateLsNrs.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importDuplicateDeliveries) {
+                        var l = duplicateLsNrs.Except(allowedDuplicateLsNrs).ToList();
+                        var dids = deliveries
+                            .Where(d => l.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => l.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importNewDeliveries) {
+                        ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId))));
+                    }
+                    if (deliveries.Count > 0) {
+                        var n = importNewDeliveries ? deliveries.Count - duplicateDIds.Count : 0;
+                        var o = allowedDuplicateLsNrs.Count + (importDuplicateDeliveries ? duplicateDIds.Count - allowedDuplicateLsNrs.Count : 0);
+                        importedDeliveries.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, deliveries.Count - n - o, meta.DeliveryFilters));
+                    }
+
+                    await ctx.SaveChangesAsync();
+
+                    var primaryKeys = new Dictionary<string, string>() {
+                        ["member"] = "mgnr, 0",
+                        ["area_commitment"] = "fbnr, 0",
+                        ["delivery"] = "year, did",
+                    };
+                    var updateStmts = timestamps
+                        .SelectMany(e => e.Value.Select(m => $"UPDATE {e.Key} " +
+                                                             $"SET ctime = {((DateTimeOffset)m.CreatedAt.ToUniversalTime()).ToUnixTimeSeconds()}, " +
+                                                                 $"mtime = {((DateTimeOffset)m.ModifiedAt.ToUniversalTime()).ToUnixTimeSeconds()} " +
+                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2});"));
+                    using var cnx = AppDbContext.Connect();
+                    await AppDbContext.ExecuteBatch(cnx, $"""
+                        BEGIN;
+                        UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        {string.Join("\n", updateStmts)}
+                        UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        COMMIT;
+                        """);
+
+                    await AddImportedFiles(Path.GetFileName(meta.FileName));
                 }
-                if (overwriteDelivieries) {
-                    ctx.RemoveRange(ctx.Deliveries.Where(d => duplicateLsNrs.Contains(d.LsNr)));
-                    ctx.AddRange(deliveries);
-                    ctx.AddRange(deliveryParts);
-                    ctx.AddRange(modifiers);
-                } else {
-                    ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId))));
-                    ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId))));
-                    ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId))));
-                }
-                await ctx.SaveChangesAsync();
-                await AddImportedFiles(filenames.Select(f => Path.GetFileName(f)));
-                await App.HintContextChange();
+                App.HintContextChange();
 
                 MessageBox.Show(
                     $"Das importieren der Daten war erfolgreich!\n" +
                     $"Folgendes wurde importiert:\n" +
-                    $"  Lieferungen: {deliveries.Count}\n" +
-                    string.Join("\n", metaData.Select(d => $"    {d.Name} ({d.DeliveryNum})\n      {d.Filters}")) +
-                    "\n", "Importieren erfolgreich",
+                    string.Join("\n", [
+                        $"Mitglieder: {importedMembers.Sum(d => d.New + d.Overwritten)}",
+                        ..importedMembers.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}",
+                        ..importedAreaComs.Select(d =>
+                            $"  {d.FileName} ({d.Imported})\n" +
+                            $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}",
+                        ..importedDeliveries.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschr., {d.NotImported} nicht importiert)\n" +
+                            $"    Zwst.: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}")
+                    ]),
+                    "Importieren erfolgreich",
                     MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden.\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
         }
 
-        public static async Task ExportDeliveries(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
-            File.Delete(filename);
-            using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+        private static bool ImportQuestion(string branch, string device, string subject, bool duplicate, int number) {
+            return MessageBox.Show(
+                $"Sollen {number} {(duplicate ? "" : "neue ")}{subject} durch die Zweigstelle\n" +
+                $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?",
+                $"{subject} importieren",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes
+            ) == MessageBoxResult.Yes;
+        }
 
-            var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
-            using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                await writer.WriteAsync("elwig:1");
-            }
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern"]),
+            }.Export(filename);
+        }
 
-            var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
-            using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
-                await writer.WriteAsync(
-                    $"{{\"timestamp\": \"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}\", " +
-                    $"\"zwstid\": \"{App.ZwstId}\", \"device\": \"{Environment.MachineName}\", " +
-                    $"\"deliveries\": {{" +
-                    $"\"count\": {deliveries.Count()}, " +
-                    $"\"parts\": {deliveries.Sum(d => d.Parts.Count)}, " +
-                    $"\"filters\": [{string.Join(", ", filters.Select(f => '"' + f + '"'))}]" +
-                    $"}}}}");
-            }
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters),
+                AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
+            }.Export(filename);
+        }
 
-            var json = zip.CreateEntry("deliveries.json");
-            using (var writer = new StreamWriter(json.Open(), Utils.UTF8)) {
-                foreach (var d in deliveries) {
-                    await writer.WriteLineAsync(DeliveryToJson(d).ToJsonString());
+        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Deliveries = (deliveries, filters),
+                WbKgs = (wbKgs, ["von exportierten Lieferungen"]),
+            }.Export(filename);
+        }
+
+        public class ElwigExport {
+            public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
+            public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
+            public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
+            public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
+
+            public async Task Export(string filename) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
+
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                    };
+                    if (WbKgs != null) {
+                        obj["wb_kgs"] = new JsonObject {
+                            ["count"] = WbKgs.Value.WbKgs.Count(),
+                            ["filters"] = new JsonArray(WbKgs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    }
+                    if (Members != null)
+                        obj["members"] = new JsonObject {
+                            ["count"] = Members.Value.Members.Count(),
+                            ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (AreaComs != null)
+                        obj["area_commitments"] = new JsonObject {
+                            ["count"] = AreaComs.Value.AreaComs.Count(),
+                            ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (Deliveries != null)
+                        obj["deliveries"] = new JsonObject {
+                            ["count"] = Deliveries.Value.Deliveries.Count(),
+                            ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count),
+                            ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                // TODO encrypt files
+                if (WbKgs != null) {
+                    var json = zip.CreateEntry("wb_kgs.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var k in WbKgs.Value.WbKgs) {
+                        await writer.WriteLineAsync(k.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (Members != null) {
+                    var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var m in Members.Value.Members) {
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (AreaComs != null) {
+                    var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var c in AreaComs.Value.AreaComs) {
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (Deliveries != null) {
+                    var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var d in Deliveries.Value.Deliveries) {
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
                 }
             }
         }
 
-        public static JsonObject DeliveryToJson(Delivery d) {
+        public static JsonObject ToJson(this WbKg k) {
+            return new JsonObject {
+                ["kgnr"] = k.KgNr,
+                ["großlage"] = k.Gl?.Name,
+            };
+        }
+
+        public static (WbKg, WbGl?) ToWbKg(this JsonNode json, List<WbGl> gls) {
+            var grosslage = json["großlage"]?.AsValue().GetValue<string>();
+            WbGl? gl = null;
+            bool newGl = false;
+            if (grosslage != null) {
+                gl = gls.FirstOrDefault(g => g.Name == grosslage);
+                if (gl == null) {
+                    newGl = true;
+                    gl = new WbGl {
+                        GlNr = (gls.Count == 0 ? 1 : gls.Max(g => g.GlNr)) + 1,
+                        Name = grosslage,
+                    };
+                    gls[gl.GlNr] = gl;
+                }
+            }
+            return (new WbKg {
+                KgNr = json["kgnr"]!.AsValue().GetValue<int>(),
+                GlNr = gl?.GlNr,
+            }, newGl ? gl : null);
+        }
+
+        public static JsonObject ToJson(this Member m) {
+            return new JsonObject {
+                ["mgnr"] = m.MgNr,
+                ["predecessor_mgnr"] = m.PredecessorMgNr,
+                ["name"] = m.Name,
+                ["prefix"] = m.Prefix,
+                ["given_name"] = m.GivenName,
+                ["middle_names"] = m.MiddleName,
+                ["suffix"] = m.Suffix,
+                ["attn"] = m.ForTheAttentionOf,
+                ["birthday"] = m.Birthday,
+                ["entry_date"] = m.EntryDate != null ? $"{m.EntryDate:yyyy-MM-dd}" : null,
+                ["exit_date"] = m.ExitDate != null ? $"{m.ExitDate:yyyy-MM-dd}" : null,
+                ["business_shares"] = m.BusinessShares,
+                ["accounting_nr"] = m.AccountingNr,
+                ["zwstid"] = m.ZwstId,
+                ["lfbis_nr"] = m.LfbisNr,
+                ["ustid_nr"] = m.UstIdNr,
+                ["juridical_pers"] = m.IsJuridicalPerson,
+                ["volllieferant"] = m.IsVollLieferant,
+                ["buchführend"] = m.IsBuchführend,
+                ["organic"] = m.IsOrganic,
+                ["funktionär"] = m.IsFunktionär,
+                ["active"] = m.IsActive,
+                ["deceased"] = m.IsDeceased,
+                ["iban"] = m.Iban,
+                ["bic"] = m.Bic,
+                ["default_kgnr"] = m.DefaultKgNr,
+                ["contact_postal"] = m.ContactViaPost,
+                ["contact_email"] = m.ContactViaEmail,
+                ["address"] = new JsonObject {
+                    ["address"] = m.Address,
+                    ["postal_dest"] = m.PostalDestId,
+                    ["country"] = m.CountryNum,
+                },
+                ["billing_address"] = m.BillingAddress != null ? new JsonObject {
+                    ["name"] = m.BillingAddress.FullName,
+                    ["address"] = m.BillingAddress.Address,
+                    ["postal_dest"] = m.BillingAddress.PostalDestId,
+                    ["country"] = m.BillingAddress.CountryNum,
+                } : null,
+                ["telephone_numbers"] = new JsonArray(m.TelephoneNumbers.OrderBy(n => n.Nr).Select(n => {
+                    var obj = new JsonObject {
+                        ["number"] = n.Number,
+                        ["type"] = n.Type,
+                    };
+                    if (n.Comment != null) obj["comment"] = n.Comment;
+                    return obj;
+                }).ToArray()),
+                ["email_addresses"] = new JsonArray(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => {
+                    var obj = new JsonObject {
+                        ["address"] = a.Address,
+                    };
+                    if (a.Comment != null) obj["comment"] = a.Comment;
+                    return obj;
+                }).ToArray()),
+                ["comment"] = m.Comment,
+                ["created_at"] = $"{m.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{m.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+            var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
+            var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
+            if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
+                throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+            }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            return (new Member {
+                MgNr = mgnr,
+                PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
+                Name = json["name"]?.AsValue().GetValue<string>() ?? json["family_name"]!.AsValue().GetValue<string>(),
+                Prefix = json["prefix"]?.AsValue().GetValue<string>(),
+                GivenName = json["given_name"]?.AsValue().GetValue<string>(),
+                MiddleName = json["middle_names"]?.AsValue().GetValue<string>(),
+                Suffix = json["suffix"]?.AsValue().GetValue<string>(),
+                ForTheAttentionOf = json["attn"]?.AsValue().GetValue<string>(),
+                Birthday = json["birthday"]?.AsValue().GetValue<string>(),
+                EntryDateString = json["entry_date"]?.AsValue().GetValue<string>(),
+                ExitDateString = json["exit_date"]?.AsValue().GetValue<string>(),
+                BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
+                AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(),
+                ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
+                LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
+                UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
+                IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
+                IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
+                IsOrganic = json["organic"]?.AsValue().GetValue<bool>() ?? false,
+                IsFunktionär = json["funktionär"]?.AsValue().GetValue<bool>() ?? false,
+                IsActive = json["active"]?.AsValue().GetValue<bool>() ?? false,
+                IsDeceased = json["deceased"]?.AsValue().GetValue<bool>() ?? false,
+                Iban = json["iban"]?.AsValue().GetValue<string>(),
+                Bic = json["bic"]?.AsValue().GetValue<string>(),
+                CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = json["address"]!["address"]!.AsValue().GetValue<string>(),
+                DefaultKgNr = kgnr,
+                ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
+                ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, json["billing_address"] is JsonObject a ? new BillingAddr {
+                MgNr = mgnr,
+                FullName = a["name"]!.AsValue().GetValue<string>(),
+                CountryNum = a["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = a["address"]!.AsValue().GetValue<string>(),
+            } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Type = n["type"]!.AsValue().GetValue<string>(),
+                Number = n["number"]!.AsValue().GetValue<string>(),
+                Comment = n["comment"]?.AsValue().GetValue<string>(),
+            }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Address = a["address"]!.AsValue().GetValue<string>(),
+                Comment = a["comment"]?.AsValue().GetValue<string>(),
+            }).ToList(),
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+
+        public static JsonObject ToJson(this AreaCom c) {
+            return new JsonObject {
+                ["fbnr"] = c.FbNr,
+                ["mgnr"] = c.MgNr,
+                ["vtrgid"] = c.VtrgId,
+                ["cultid"] = c.CultId,
+                ["area"] = c.Area,
+                ["kgnr"] = c.KgNr,
+                ["gstnr"] = c.GstNr,
+                ["ried"] = c.Rd?.Name,
+                ["year_from"] = c.YearFrom,
+                ["year_to"] = c.YearTo,
+                ["comment"] = c.Comment,
+                ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
+            var ried = json["ried"]?.AsValue().GetValue<string>();
+            WbRd? rd = null;
+            bool newRd = false;
+            if (ried != null) {
+                var rde = riede.GetValueOrDefault(kgnr, []);
+                rd = rde.FirstOrDefault(r => r.Name == ried);
+                if (rd == null) {
+                    newRd = true;
+                    rd = new WbRd {
+                        KgNr = kgnr,
+                        RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                        Name = ried,
+                    };
+                    rde.Add(rd);
+                    riede[rd.KgNr] = rde;
+                }
+            }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            return (new AreaCom {
+                FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
+                MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
+                VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(),
+                CultId = json["cultid"]?.AsValue().GetValue<string>(),
+                Area = json["area"]!.AsValue().GetValue<int>(),
+                KgNr = kgnr,
+                GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
+                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
+                YearTo = json["year_to"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, newRd ? rd : null,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+
+        public static JsonObject ToJson(this Delivery d) {
             return new JsonObject {
                 ["lsnr"] = d.LsNr,
                 ["year"] = d.Year,
@@ -181,11 +734,13 @@ namespace Elwig.Helpers.Export {
                         ["qualid"] = p.QualId,
                         ["hkid"] = p.HkId,
                         ["kgnr"] = p.KgNr,
-                        ["rdnr"] = p.RdNr,
+                        ["ried"] = p.Rd?.Name,
                         ["net_weight"] = p.IsNetWeight,
                         ["manual_weighing"] = p.IsManualWeighing,
                         ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
                         ["comment"] = p.Comment,
+                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
                     };
                     if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
                     if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
@@ -194,17 +749,28 @@ namespace Elwig.Helpers.Export {
                     if (p.Temperature != null) obj["temperature"] = p.Temperature;
                     if (p.Acid != null) obj["acid"] = p.Acid;
                     if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
-                    if (p.WeighingId != null) obj["weighing_id"] = p.WeighingId;
+                    if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
                     if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
                     return obj;
                 }).ToArray()),
                 ["comment"] = d.Comment,
+                ["created_at"] = $"{d.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{d.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) JsonToDelivery(JsonNode json, Dictionary<int, int> currentDids) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var year = json["year"]!.AsValue().GetValue<int>();
-            var did = ++currentDids[year];
+            var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
+            var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
+            if (did == -1) {
+                if (!currentDids.ContainsKey(year)) currentDids[year] = 0;
+                did = ++currentDids[year];
+            }
+            currentLsNrs[lsnr] = did;
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            var wbRde = new List<WbRd>();
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -212,40 +778,64 @@ namespace Elwig.Helpers.Export {
                 TimeString = json["time"]?.AsValue().GetValue<string>(),
                 ZwstId = json["zwstid"]!.AsValue().GetValue<string>(),
                 LNr = json["lnr"]!.AsValue().GetValue<int>(),
-                LsNr = json["lsnr"]!.AsValue().GetValue<string>(),
+                LsNr = lsnr,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
-            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
-                Year = year,
-                DId = did,
-                DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
-                SortId = p["sortid"]!.AsValue().GetValue<string>(),
-                AttrId = p["attrid"]?.AsValue().GetValue<string>(),
-                CultId = p["cultid"]?.AsValue().GetValue<string>(),
-                Weight = p["weight"]!.AsValue().GetValue<int>(),
-                Kmw = p["kmw"]!.AsValue().GetValue<double>(),
-                QualId = p["qualid"]!.AsValue().GetValue<string>(),
-                HkId = p["hkid"]!.AsValue().GetValue<string>(),
-                KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
-                RdNr = p["rdnr"]?.AsValue().GetValue<int>(),
-                IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
-                IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
-                Comment = p["comment"]?.AsValue().GetValue<string>(),
-                IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
-                IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
-                IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
-                IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
-                Temperature = p["temperature"]?.AsValue().GetValue<double>(),
-                Acid = p["acid"]?.AsValue().GetValue<double>(),
-                ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
-                WeighingId = p["weighing_id"]?.AsValue().GetValue<string>(),
-                WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
+                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
+                var ried = p["ried"]?.AsValue().GetValue<string>();
+                WbRd? rd = null;
+                if (ried != null) {
+                    var rde = riede.GetValueOrDefault(kgnr, []);
+                    rd = rde.FirstOrDefault(r => r.Name == ried);
+                    if (rd == null) {
+                        rd = new WbRd {
+                            KgNr = kgnr,
+                            RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                            Name = ried,
+                        };
+                        rde.Add(rd);
+                        riede[rd.KgNr] = rde;
+                        wbRde.Add(rd);
+                    }
+                }
+                return new DeliveryPart {
+                    Year = year,
+                    DId = did,
+                    DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
+                    SortId = p["sortid"]!.AsValue().GetValue<string>(),
+                    AttrId = p["attrid"]?.AsValue().GetValue<string>(),
+                    CultId = p["cultid"]?.AsValue().GetValue<string>(),
+                    Weight = p["weight"]!.AsValue().GetValue<int>(),
+                    Kmw = p["kmw"]!.AsValue().GetValue<double>(),
+                    QualId = p["qualid"]!.AsValue().GetValue<string>(),
+                    HkId = p["hkid"]!.AsValue().GetValue<string>(),
+                    KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
+                    RdNr = rd?.RdNr ?? p["rdnr"]?.AsValue().GetValue<int>(),
+                    IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
+                    IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
+                    Comment = p["comment"]?.AsValue().GetValue<string>(),
+                    IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
+                    IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
+                    IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
+                    IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                    Temperature = p["temperature"]?.AsValue().GetValue<double>(),
+                    Acid = p["acid"]?.AsValue().GetValue<double>(),
+                    ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
+                    WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
+                    WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
+                };
             }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
                 Year = year,
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList());
+            })).ToList(),
+            wbRde,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
     }
 }

Elwig/Helpers/Export/Ods.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
@@ -300,6 +301,7 @@ namespace Elwig.Helpers.Export {
                 if (units != null && units.Length > 0) {
                     int n = -1;
                     switch (units[0]) {
+                        case "#": n = 0; data = $"{v:N0}"; break;
                         case "%": n = 1; data = $"{v:N1}"; break;
                         case "€": n = 2; data = $"{v:N2}"; break;
                         case "€/kg": n = 4; data = $"{v:N4}"; break;
@@ -312,10 +314,10 @@ namespace Elwig.Helpers.Export {
                 }
                 c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
             } else {
-                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
+                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
             }
 
-            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
         }
     }
 }

Elwig/Helpers/ExportMode.cs

@@ -1,4 +1,4 @@
-namespace Elwig.Helpers {
+namespace Elwig.Helpers {
     public enum ExportMode {
         Show, SaveList, SavePdf, Print, Email, Export, Upload
     }

Elwig/Helpers/Extensions.cs

@@ -1,5 +1,7 @@
-using System;
+using System;
 using System.IO;
+using System.IO.Compression;
+using System.IO.Hashing;
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -23,7 +25,7 @@ namespace Elwig.Helpers {
         }
 
         public static string? ReadUntil(this StreamReader reader, char delimiter) {
-            return ReadUntil(reader, new char[] { delimiter });
+            return ReadUntil(reader, [ delimiter ]);
         }
 
         public static string? ReadUntil(this StreamReader reader, char[] delimiter) {
@@ -45,7 +47,7 @@ namespace Elwig.Helpers {
         }
 
         public static Task<string?> ReadUntilAsync(this StreamReader reader, char delimiter) {
-            return ReadUntilAsync(reader, new char[] { delimiter });
+            return ReadUntilAsync(reader, [ delimiter ]);
         }
 
         public static async Task<string?> ReadUntilAsync(this StreamReader reader, char[] delimiter) {
@@ -95,5 +97,16 @@ namespace Elwig.Helpers {
             await download.CopyToAsync(destination, 81920, relativeProgress, cancellationToken);
             progress.Report(100.0);
         }
+
+        public static async Task CheckIntegrity(this ZipArchive zip) {
+            var crc = new Crc32();
+            foreach (var entry in zip.Entries) {
+                crc.Reset();
+                using var stream = entry.Open();
+                await crc.AppendAsync(stream);
+                if (crc.GetCurrentHashAsUInt32() != entry.Crc32)
+                    throw new InvalidDataException($"CRC-32 mismatch in '{entry.FullName}'");
+            }
+        }
     }
 }

Elwig/Helpers/Printing/Html.cs

@@ -10,7 +10,7 @@ namespace Elwig.Helpers.Printing {
 
         public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DataPath + "resources")
+                .UseFileSystemProject(App.DocumentsPath)
                 .UseMemoryCachingProvider()
                 .Build();
 

Elwig/Helpers/Printing/Pdf.cs

@@ -8,17 +8,13 @@ using System.Windows;
 using System.Text.RegularExpressions;
 using System.Linq;
 using System.Net.Sockets;
-using System.Text;
+using PdfiumViewer;
+using System.Drawing.Printing;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string PdfToPrinter = new string[] { App.ExePath }
-            .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
-            .Select(x => Path.Combine(x, "PDFtoPrinter.exe"))
-            .Where(File.Exists)
-            .FirstOrDefault() ?? throw new FileNotFoundException("PDFtoPrinter executable not found");
-        private static readonly string WinziPrint = new string[] { App.ExePath }
+        private static readonly string WinziPrint = new string[] { App.InstallPath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
             .Where(File.Exists)
@@ -92,17 +88,24 @@ namespace Elwig.Helpers.Printing {
             });
         }
 
-        public static async Task Print(string path, int copies = 1) {
+        public static async Task Print(string path, int copies = 1, bool doublePaged = false) {
+            await Print(path, new() {
+                Copies = (short)copies,
+                Collate = true,
+                Duplex = doublePaged ? Duplex.Vertical : Duplex.Simplex,
+            });
+        }
+
+        public static Task Print(string path, PrinterSettings settings) {
             try {
-                var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
-                p.StartInfo.ArgumentList.Add(path);
-                p.StartInfo.ArgumentList.Add("/s");
-                p.StartInfo.ArgumentList.Add($"copies={copies}");
-                p.Start();
-                await p.WaitForExitAsync();
+                using var doc = PdfDocument.Load(path);
+                using var printDoc = doc.CreatePrintDocument(PdfPrintMode.CutMargin);
+                printDoc.PrinterSettings = settings;
+                printDoc.Print();
             } catch (Exception e) {
-                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken");
+                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            return Task.CompletedTask;
         }
     }
 }

Elwig/Helpers/Utils.cs

@@ -1,42 +1,46 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-using System.IO.Ports;
-using System.Net.Sockets;
 using Elwig.Dialogs;
-using System.Text;
-using System.Numerics;
-using Elwig.Models.Entities;
+using Elwig.Documents;
 using Elwig.Helpers.Billing;
-using System.Runtime.InteropServices;
-using System.Net.Http;
-using System.Text.Json.Nodes;
-using System.IO;
+using Elwig.Models;
+using Elwig.Models.Entities;
+using LinqKit;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.EntityFrameworkCore;
-using System.Reflection;
-using System.Collections;
-using Elwig.Documents;
-using MimeKit;
-using System.Windows.Input;
-using LinqKit;
-using System.Linq.Expressions;
-using Elwig.Models;
 using Microsoft.Win32;
+using MimeKit;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.IO.Ports;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Net.Http;
+using System.Net.Sockets;
+using System.Numerics;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Markup;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
 
         public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
+        public static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
 
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
-        public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
+        public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 6 ? 1 : 0);
         public static int FollowingSeason => DateTime.Now.Year + (DateTime.Now.Month >= 11 ? 1 : 0);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
@@ -118,6 +122,23 @@ namespace Elwig.Helpers {
             0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,
         ];
 
+        public static void OverrideCulture() {
+            var locale = new CultureInfo("de-AT", false);
+            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
+            CultureInfo.CurrentCulture = locale;
+            CultureInfo.CurrentUICulture = locale;
+            Thread.CurrentThread.CurrentCulture = locale;
+            Thread.CurrentThread.CurrentUICulture = locale;
+            CultureInfo.DefaultThreadCurrentCulture = locale;
+            CultureInfo.DefaultThreadCurrentUICulture = locale;
+            FrameworkElement.LanguageProperty.OverrideMetadata(
+                typeof(FrameworkElement),
+                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
+            );
+        }
+
         public static SerialPort OpenSerialConnection(string connection) {
             var m = SerialRegex.Match(connection);
             if (!m.Success)
@@ -197,7 +218,7 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
-            MailTo(new string[] { emailAddress });
+            MailTo([emailAddress]);
         }
 
         public static void MailTo(IEnumerable<string> emailAddresses) {
@@ -267,9 +288,9 @@ namespace Elwig.Helpers {
             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
         }
 
-        public static int? ShowAbwertenDialog(string lsnr, string name, int weight) {
-            var d = new AbwertenDialog(lsnr, name, weight);
-            return d.ShowDialog() == true ? d.Weight : null;
+        public static (string?, int[])? ShowDeliverySplittingDialog(Delivery delivery) {
+            var d = new DeliverySplittingDialog(delivery);
+            return d.ShowDialog() == true ? (d.MgNr?.ToString() ?? d.LsNr, d.Weights ?? []) : null;
         }
 
         public static double? ShowLinearPriceIncreaseDialog() {
@@ -277,11 +298,6 @@ namespace Elwig.Helpers {
             return d.ShowDialog() == true ? d.Price : null;
         }
 
-        public static string? ShowDeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) {
-            var d = new DeliveryExtractionDialog(lsnr, name, single, lsnrs);
-            return d.ShowDialog() == true ? d.AddTo : null;
-        }
-
         public static Footer GenerateFooter(string lineBreak, string seperator) {
             return new Footer(lineBreak, seperator);
         }
@@ -348,7 +364,7 @@ namespace Elwig.Helpers {
         }
 
         public static (string, string?) SplitName(string fullName, string? familyName) {
-            if (familyName == null || familyName == "") return (fullName, null);
+            if (string.IsNullOrWhiteSpace(familyName)) return (fullName, null);
             var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
             if (p0 == -1) return (fullName, null);
             var p1 = fullName.IndexOf(" und ");
@@ -362,8 +378,10 @@ namespace Elwig.Helpers {
                     var p3 = fullName.LastIndexOf(' ', p2 - 1);
                     return (fullName[0..p3], fullName[(p3 + 1)..^0]);
                 }
-            } else {
+            } else if (p0 + familyName.Length >= fullName.Length || fullName[p0 + familyName.Length] == ' ') {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            } else {
+                return (fullName, null);
             }
         }
 
@@ -413,20 +431,24 @@ namespace Elwig.Helpers {
             var client = new HttpClient() {
                 Timeout = TimeSpan.FromSeconds(5),
             };
+            client.DefaultRequestHeaders.UserAgent.Clear();
+            client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})");
             client.DefaultRequestHeaders.Accept.Clear();
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
             if (username != null || password != null)
-                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
-                    Utils.UTF8.GetBytes($"{username}:{password}")));
+                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Utils.UTF8.GetBytes($"{username}:{password}")));
             return client;
         }
 
         public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string url) {
             try {
                 using var client = GetHttpClient(accept: "application/json");
-                var resJson = JsonNode.Parse(await client.GetStringAsync(url));
-                var data = resJson!["data"]![0]!;
+                using var res = await client.GetAsync(url);
+                if (!res.IsSuccessStatusCode)
+                    return null;
+                var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
+                var data = resJson!["data"]!.AsArray()[^1]!;
                 return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
             } catch {
                 return null;
@@ -434,15 +456,19 @@ namespace Elwig.Helpers {
         }
 
         public static async Task UploadExportData(string zip, string url, string username, string password) {
+            if (url.StartsWith("https://elwig.at/clients/"))
+                url = "https://sync.elwig.at/" + url[25..];
             if (!url.EndsWith('/')) url += "/";
             using var client = GetHttpClient(username, password, accept: "application/json");
-            var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
+            using var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
             content.Headers.ContentType = new("application/zip");
             using var res = await client.PutAsync(url + Path.GetFileName(zip), content);
             res.EnsureSuccessStatusCode();
         }
 
         public static async Task<JsonArray> GetExportMetaData(string url, string username, string password) {
+            if (url.StartsWith("https://elwig.at/clients/"))
+                url = "https://sync.elwig.at/" + url[25..];
             using var client = GetHttpClient(username, password, accept: "application/json");
             using var res = await client.GetAsync(url);
             res.EnsureSuccessStatusCode();
@@ -475,44 +501,43 @@ namespace Elwig.Helpers {
         public static async Task<bool> SendEmail(Member member, string subject, string text, IEnumerable<Document> docs) {
             if (App.Config.Smtp == null)
                 return false;
+            return await Task.Run(async () => {
+                SmtpClient? client = null;
+                try {
+                    client = await GetSmtpClient();
 
-            SmtpClient? client = null;
-            try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                client = await GetSmtpClient();
-
-                using var msg = new MimeMessage();
-                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
-                msg.Subject = subject;
-                var body = new Multipart("mixed") {
-                    new TextPart("plain") { Text = text }
-                };
-                foreach (var doc in docs) {
-                    var name = NormalizeFileName(doc.Title);
-                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                    using var msg = new MimeMessage();
+                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                    msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                    msg.Subject = subject;
+                    var body = new Multipart("mixed") {
+                        new TextPart("plain") { Text = text }
+                    };
+                    foreach (var doc in docs) {
+                        var name = NormalizeFileName(doc.Title);
+                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                    }
+                    msg.Body = body;
+                    await client!.SendAsync(msg);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return false;
+                } finally {
+                    if (client != null)
+                        await client.DisconnectAsync(true);
+                    client?.Dispose();
                 }
-                msg.Body = body;
-                await client!.SendAsync(msg);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                return false;
-            } finally {
-                if (client != null)
-                    await client.DisconnectAsync(true);
-                client?.Dispose();
-                Mouse.OverrideCursor = null;
-            }
-            return true;
+                return true;
+            });
         }
 
-        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member Member, string Subject, string Text)? emailData = null) {
             if (mode == ExportMode.Print && !App.Config.Debug) {
                 await doc.Generate();
                 await doc.Print();
             } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
                 await doc.Generate();
-                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
+                var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
                 if (success)
                     MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
                         MessageBoxButton.OK, MessageBoxImage.Information);
@@ -534,6 +559,19 @@ namespace Elwig.Helpers {
             }
         }
 
+        public static List<EventLogEntry> GetLogEntries() {
+            using var log = new EventLog {
+                Log = "Application",
+                Source = ".NET Runtime",
+            };
+            return [.. log.Entries.OfType<EventLogEntry>().Where(e => e.InstanceId == 1026).Where(e => e.Message.StartsWith("Application: Elwig.exe"))];
+        }
+
+        public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
+            var pk = primaryKey.Select(k => k?.GetHashCode() ?? 0).ToArray();
+            return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
+        }
+
         public static int? GetEntityIdentifier(object? obj) {
             if (obj == null) {
                 return null;
@@ -549,15 +587,86 @@ namespace Elwig.Helpers {
         }
 
         public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
-        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int yearTo) =>
-            c => (c.YearFrom <= yearTo) && (c.YearTo == null || c.YearTo >= yearTo);
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
+            c => (c.YearFrom == null || c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
 
         public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int yearTo) =>
-            query.Where(ActiveAreaCommitments(yearTo));
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int year) =>
+            query.Where(ActiveAreaCommitments(year));
 
         public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
-        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int yearTo) =>
-            query.Where(c => ActiveAreaCommitments(yearTo).Invoke(c));
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int year) =>
+            query.Where(c => ActiveAreaCommitments(year).Invoke(c));
+
+        public static async Task<(DateTime DateTime, string Type, int MgNr, string Name, string[] Addresses, string Subject, string[] Attachments)[]> GetSentMails(DateOnly? fromDate = null, DateOnly? toDate = null) {
+            var f = $"{fromDate:yyyy-MM-dd}";
+            var t = $"{toDate:yyyy-MM-dd}";
+            try {
+                var rows = new List<(DateTime, string, int, string, string[], string, string[])>();
+                var filenames = Directory.GetFiles(App.MailsPath, "????.csv")
+                    .Where(n => fromDate == null || Path.GetFileName(n).CompareTo($"{fromDate.Value.Year}.csv") >= 0)
+                    .Where(n => toDate   == null || Path.GetFileName(n).CompareTo($"{toDate.Value.Year}.csv")   <= 0)
+                    .Order();
+                foreach (var filename in filenames) {
+                    using var reader = new StreamReader(filename, Utils.UTF8);
+                    string? line;
+                    while ((line = await reader.ReadLineAsync()) != null) {
+                        try {
+                            if (line.Length < 20 || line[10] != ';' || line[19] != ';')
+                                continue;
+                            var date = line[..10];
+                            if (fromDate != null && date.CompareTo(f) < 0) {
+                                continue;
+                            } else if (toDate != null && date.CompareTo(t) > 0) {
+                                break;
+                            }
+                            var p = line.Split(';');
+                            rows.Add((
+                                DateOnly.ParseExact(p[0], "yyyy-MM-dd").ToDateTime(TimeOnly.ParseExact(p[1], "HH:mm:ss")),
+                                p[2],
+                                int.Parse(p[3]),
+                                p[4],
+                                p[5].Split(',').Select(a => a.Replace(" | ", "\n")).ToArray(),
+                                p[6],
+                                p[7].Split(',')
+                            ));
+                        } catch {
+                            continue;
+                        }
+                    }
+                }
+                return [.. rows];
+            } catch {
+                return [];
+            }
+        }
+
+        public static async Task AddSentMails(IEnumerable<(string Type, int MgNr, string Name, string[] Addresses, string Subject, string[] Attachments)> data) {
+            var now = DateTime.Now;
+            var filename = Path.Combine(App.MailsPath, $"{now.Year}.csv");
+            await File.AppendAllLinesAsync(filename, data.Select(d =>
+                $"{now:yyyy-MM-dd;HH:mm:ss};{d.Type};" +
+                $"{d.MgNr};{d.Name.Replace(';', ' ')};" +
+                $"{string.Join(',', d.Addresses.Select(a => a.Replace(';', ' ').Replace(',', ' ').Replace("\n", " | ")))};" +
+                $"{d.Subject.Replace(';', ' ')};" +
+                $"{string.Join(',', d.Attachments.Select(a => a.Replace(';', ' ').Replace(',', ' ')))}"
+            ), Utils.UTF8);
+        }
+
+        public static async Task<string?> FindSentMailBody(DateTime target) {
+            var dt = $"{target:yyyy-MM-dd_HH-mm-ss}_";
+            var filename = Directory.GetFiles(App.MailsPath, "????-??-??_??-??-??_*.txt")
+                .Where(n => Path.GetFileName(n).CompareTo(dt) <= 0)
+                .Order()
+                .LastOrDefault();
+            if (filename == null)
+                return null;
+            return await File.ReadAllTextAsync(filename, Utils.UTF8);
+        }
+
+        public static async Task AddSentMailBody(string subject, string body, int recipients) {
+            var filename = Path.Combine(App.MailsPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{NormalizeFileName(subject)}.txt");
+            await File.WriteAllTextAsync(filename, $"# {subject}\r\n# Vorgesehene Empfänger: {recipients}\r\n\r\n" + body, Utils.UTF8);
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -8,7 +8,7 @@ namespace Elwig.Helpers {
     public static class Validator {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
-            { "43", new string[][] {
+            { "43", [
                 [],
                 ["57", "59"],
                 [
@@ -17,17 +17,17 @@ namespace Elwig.Helpers {
                     "650", "651", "652", "653", "655", "657", "659", "660", "661",
                     "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
                 ]
-            } },
-            { "49", Array.Empty<string[]>() },
-            { "48", Array.Empty<string[]>() },
-            { "420", Array.Empty<string[]>() },
-            { "421", Array.Empty<string[]>() },
-            { "36", Array.Empty<string[]>() },
-            { "386", Array.Empty<string[]>() },
-            { "39", Array.Empty<string[]>() },
-            { "33", Array.Empty<string[]>() },
-            { "41", Array.Empty<string[]>() },
-            { "423", Array.Empty<string[]>() },
+            ] },
+            { "49", [] },
+            { "48", [] },
+            { "420", [] },
+            { "421", [] },
+            { "36", [] },
+            { "386", [] },
+            { "39", [] },
+            { "33", [] },
+            { "41", [] },
+            { "423", [] },
         };
 
         public static ValidationResult CheckInteger(TextBox input, bool required) {
@@ -628,5 +628,55 @@ namespace Elwig.Helpers {
 
             return new(true, null);
         }
+
+        public static ValidationResult CheckOrganicAuthorityCode(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            for (int i = 0, v = 0; i < input.Text.Length; i++) {
+                char ch = char.ToUpper(input.Text[i]);
+                if (v < 2 && char.IsAsciiLetter(ch)) {
+                    v++;
+                    text += ch;
+                } else if ((v == 2 || v == 6) && ch == '-') {
+                    v++;
+                    text += ch;
+                } else if (v >= 2 && char.IsLetterOrDigit(ch)) {
+                    if (text.StartsWith("AT")) {
+                        if (v == 3 && ch == 'B' || v == 4 && ch == 'I' || v == 5 && ch == 'O') {
+                            v++;
+                            text += ch;
+                        } else if (v > 6 && char.IsAsciiDigit(ch)) {
+                            v++;
+                            text += ch;
+                        }
+                    } else {
+                        v++;
+                        text += ch;
+                    }
+                }
+
+                if (i == input.CaretIndex - 1) {
+                    pos = text.Length;
+                } else if (text.StartsWith("AT") && v >= 10) {
+                    break;
+                }
+            }
+
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0)
+                return required ? new(false, "Bio-Kontrollstellen-Code ist nicht optional") : new(true, null);
+
+            if (text.StartsWith("AT")) {
+                if (text.Length != 10) {
+                    return new(false, "Bio-Kontrollstellen-Code ist ungültig");
+                }
+            } else {
+                return new(false, "Not implemented yet");
+            }
+
+            return new(true, null);
+        }
     }
 }

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -58,11 +58,19 @@ namespace Elwig.Helpers.Weighing {
         }
 
         protected async Task<WeighingResult?> Receive() {
-            var line = await Reader.ReadUntilAsync("\r\n");
+            var line = "";
+            while (line.Length < 33) {
+                var ch = Reader.Read();
+                if (ch == -1) {
+                    return null;
+                } else if (line.Length > 0 || ch == ' ') {
+                    line += char.ToString((char)ch);
+                }
+            }
             if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
             if (line == null || line == "") {
                 return null;
-            } else if (line.Length != 35 || line[0] != ' ' || line[9] != ' ' || line[15] != ' ' || line[20] != ' ' || line[32] != ' ') {
+            } else if (line.Length != 33 || line[0] != ' ' || line[9] != ' ' || line[15] != ' ' || line[20] != ' ' || line[32] != ' ') {
                 throw new IOException($"Invalid event from scale: '{line}'");
             }
 
@@ -79,7 +87,7 @@ namespace Elwig.Helpers.Weighing {
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
             var parsedDate = DateOnly.Parse(date);
             return new() {
-                Weight = int.Parse(netto),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                 Date = parsedDate,

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Ports;
 using System.Text;
@@ -60,23 +60,23 @@ namespace Elwig.Helpers.Weighing {
                 throw new IOException("Invalid response from scale: Received record has invalid size");
             var line = record[2..];
 
-            var status  = line[ 0.. 2];
-            var brutto  = line[ 2.. 9].Trim();
-            var tara    = line[ 9..16].Trim();
-            var netto   = line[16..23].Trim();
-            var scaleNr = line[23..25].Trim();
-            var identNr = line[25..31].Trim();
-            var date    = line[31..39];
-            var time    = line[39..45];
+            var brutto  = line[ 0.. 7].Trim();
+            var tara    = line[ 7..14].Trim();
+            var netto   = line[14..21].Trim();
+            var scaleNr = line[21..23].Trim();
+            var identNr = line[23..29].Trim();
+            var date    = line[29..37];
+            var time    = line[37..43];
 
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
-            var parsedDate = DateOnly.ParseExact(date, "yyyyMMdd");
             return new() {
-                Weight = int.Parse(netto),
+                GrossWeight = int.Parse(brutto),
+                TareWeight = int.Parse(tara),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr,
-                Date = parsedDate,
-                Time = TimeOnly.ParseExact(time, "HHmmss"),
+                Date = DateOnly.TryParseExact(date, "yyyyMMdd", out var d) ? d : null,
+                Time = TimeOnly.TryParseExact(time, "HHmmss", out var t) ? t : null,
             };
         }
 
@@ -118,5 +118,9 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
+        }
     }
 }

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -1,8 +1,9 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a a scale which responds to commands sent to it
+    /// Interface for controlling a weighing scale which responds to commands sent to it
     /// </summary>
     public interface ICommandScale : IScale {
         /// <summary>
@@ -31,5 +32,10 @@ namespace Elwig.Helpers.Weighing {
         /// Revoke clearance to fill the scale container
         /// </summary>
         Task RevokeFillingClearance();
+
+        /// <summary>
+        /// Try to set date and time on the scale
+        /// </summary>
+        Task SetDateAndTime(DateTime dateTime);
     }
 }

Elwig/Helpers/Weighing/IEventScale.cs

@@ -1,6 +1,6 @@
-namespace Elwig.Helpers.Weighing {
+namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a a scale which automatically sends weighing updates
+    /// Interface for controlling a weighing scale which automatically sends weighing updates
     /// </summary>
     public interface IEventScale : IScale {
 

Elwig/Helpers/Weighing/IScale.cs

@@ -2,7 +2,7 @@ using System;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a industrial scale (industrial terminal, "IT")
+    /// Interface for controlling a industrial weighing scale (industrial terminal, "IT")
     /// </summary>
     public interface IScale : IDisposable {
         /// <summary>

Elwig/Helpers/Weighing/Scale.cs

@@ -1,4 +1,4 @@
-using System.IO.Ports;
+using System.IO.Ports;
 using System.IO;
 using System.Net.Sockets;
 using System;

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -38,12 +38,12 @@ namespace Elwig.Helpers.Weighing {
             }
 
             var error = line[1..3];
+            string msg = $"Unbekannter Fehler (Fehler code {error})";
             if (error[0] == '0') {
                 if (error[1] != '0') {
                     throw new IOException($"Invalid response from scale (error code {error})");
                 }
             } else if (error[0] == '1') {
-                string msg = $"Unbekannter Fehler (Fehler code {error})";
                 switch (error[1]) {
                     case '1': msg = "Allgemeiner Waagenfehler"; break;
                     case '2': msg = "Waage in Überlast"; break;
@@ -53,8 +53,12 @@ namespace Elwig.Helpers.Weighing {
                     case '7': msg = "Druckmuster enthält ungültiges Kommando"; break;
                 }
                 throw new IOException($"Waagenfehler {error}: {msg}");
+            } else if (error[0] == '2') {
+                switch (error[1]) {
+                    case '0': msg = "Brutto negativ"; break;
+                }
+                throw new IOException($"Fehler {error}: {msg}");
             } else if (error[0] == '3') {
-                string msg = $"Unbekannter Fehler (Fehler code {error})";
                 switch (error[1]) {
                     case '1': msg = "Übertragunsfehler"; break;
                     case '2': msg = "Ungültiger Befehl"; break;
@@ -98,7 +102,9 @@ namespace Elwig.Helpers.Weighing {
             identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
             var parsedDate = DateOnly.Parse(date);
             return new() {
-                Weight = int.Parse(netto),
+                GrossWeight = int.Parse(brutto),
+                TareWeight = int.Parse(tara),
+                NetWeight = int.Parse(netto),
                 WeighingId = identNr,
                 FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                 Date = parsedDate,
@@ -155,5 +161,10 @@ namespace Elwig.Helpers.Weighing {
         public async Task RevokeFillingClearance() {
             await SetFillingClearance(false);
         }
+
+        public async Task SetDateAndTime(DateTime dateTime) {
+            await SendCommand($"ST{dateTime:dd.MM.yyHH:mm:ss}");
+            await ReceiveResponse();
+        }
     }
 }

Elwig/Helpers/Weighing/WeighingEventArgs.cs

@@ -1,12 +1,7 @@
-using System;
+using System;
 
 namespace Elwig.Helpers.Weighing {
-    public class WeighingEventArgs : EventArgs {
-
-        public WeighingResult Result { get; set; }
-
-        public WeighingEventArgs(WeighingResult result) {
-            Result = result;
-        }
+    public class WeighingEventArgs(WeighingResult result) : EventArgs {
+        public readonly WeighingResult Result = result;
     }
 }

Elwig/Helpers/Weighing/WeighingResult.cs

@@ -1,14 +1,25 @@
 using System;
+using System.Text.Json.Nodes;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Result of a weighing process on an industrial scale
+    /// Result of a weighing process on an industrial weighing scale
     /// </summary>
     public struct WeighingResult {
+        /// <summary>
+        /// Measured gross weight in kg
+        /// </summary>
+        public int? GrossWeight;
+
+        /// <summary>
+        /// Measured tare weight in kg
+        /// </summary>
+        public int? TareWeight;
+
         /// <summary>
         /// Measured net weight in kg
         /// </summary>
-        public int? Weight;
+        public int? NetWeight;
 
         /// <summary>
         /// Weighing id (or IdentNr) provided by the scale
@@ -30,12 +41,22 @@ namespace Elwig.Helpers.Weighing {
         /// </summary>
         public TimeOnly? Time;
 
-        /// <returns>&lt;Weight/WeighingId/Date/Time&gt;</returns>
+        /// <returns>&lt;[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time&gt;</returns>
         public override readonly string ToString() {
-            var w = Weight != null ? $"{Weight}kg" : "";
+            var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
             return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
         }
 
-
+        public readonly JsonObject ToJson() {
+            var obj = new JsonObject();
+            if (FullWeighingId != null) obj["id"] = FullWeighingId;
+            if (WeighingId != null) obj["nr"] = int.Parse(WeighingId);
+            if (Date != null) obj["date"] = $"{Date:yyyy-MM-dd}";
+            if (Time != null) obj["time"] = $"{Time:HH:mm:ss}";
+            if (GrossWeight != null) obj["gross_weight"] = GrossWeight;
+            if (TareWeight != null) obj["tare_weight"] = TareWeight;
+            if (NetWeight != null) obj["net_weight"] = NetWeight;
+            return obj;
+        }
     }
 }

Elwig/Models/Dtos/AreaComUnderDeliveryData.cs

@@ -1,4 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -34,18 +34,18 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
-            return await table.FromSqlRaw($"""
-                    SELECT m.mgnr, m.family_name AS name_1,
+            return await table.FromSql($"""
+                    SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                            p.plz, o.name AS ort, m.address,
                            c.bucket, c.area, u.min_kg, u.weight
-                    FROM member m
+                    FROM v_area_commitment_bucket_strict c
+                        LEFT JOIN member m ON m.mgnr = c.mgnr
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz
-                        LEFT JOIN v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
                         JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
-                    WHERE m.active = 1
+                    WHERE c.year = {year}
                     ORDER BY m.mgnr, c.bucket
                     """).ToListAsync();
         }
@@ -54,7 +54,7 @@ namespace Elwig.Models.Dtos {
     public class AreaComUnderDeliveryRow {
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -88,7 +88,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/CreditNoteData.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
@@ -49,8 +49,8 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
-            return await table.FromSqlRaw($"""
-                SELECT m.mgnr, m.family_name AS name_1,
+            return await table.FromSql($"""
+                SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                        p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
@@ -79,7 +79,7 @@ namespace Elwig.Models.Dtos {
     public class CreditNoteRow {
         public int MgNr;
         public string Name1;
-        public string Name2;
+        public string? Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -144,7 +144,7 @@ namespace Elwig.Models.Dtos {
         [Column("name_1")]
         public required string Name1 { get; set; }
         [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -27,14 +27,14 @@ namespace Elwig.Models.Dtos {
             MgNr = mgnr;
         }
 
-        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
-            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
+            var variant = await paymentVariants.FindAsync(year, avnr);
             BillingData? varData = null;
             try { varData = variant != null ? BillingData.FromJson(variant.Data) : null; } catch { }
             return (await FromDbSet(table, year, avnr))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
-                    (k, g) => new CreditNoteDeliveryRow(g, seasons, varData?.NetWeightModifier ?? 0.0, varData?.GrossWeightModifier ?? 0.0))
+                    (k, g) => new CreditNoteDeliveryRow(g, variant, varData))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
                     (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
@@ -86,13 +86,13 @@ namespace Elwig.Models.Dtos {
         public decimal? Amount;
         public double WeighingModifier;
 
-        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons, double netWeightModifier, double grossWeightModifier) {
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, PaymentVar paymentVariant, BillingData? varData) {
             var f = rows.First();
             Year = f.Year;
             TgNr = f.TgNr;
             AvNr = f.AvNr;
             MgNr = f.MgNr;
-            var season = seasons.Find(Year);
+            var season = paymentVariant.Season;
 
             LsNr = f.LsNr;
             DPNr = f.DPNr;
@@ -115,7 +115,7 @@ namespace Elwig.Models.Dtos {
                               b.Price != null ? season?.DecFromDb((long)b.Price) : null,
                               b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
                 .ToArray();
-            WeighingModifier = f.NetWeight ? netWeightModifier : grossWeightModifier;
+            WeighingModifier = (varData == null || !varData.ConsiderDelieryModifiers) ? 0 : f.NetWeight ? varData.NetWeightModifier : varData.GrossWeightModifier;
             Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
             var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
             var amt = netAmount * (decimal)(1.0 + WeighingModifier);

Elwig/Models/Dtos/DataTable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -0,0 +1,74 @@
+using Elwig.Documents;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class DeliveryAncmtListData : DataTable<DeliveryAncmtListRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("Date", "Datum", null, 20),
+            ("Branch", "Zweigstelle", null, 30),
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("DefaultKg", "Ort", null, 40),
+            ("SortId", "Sorte", null, 10),
+            ("Weight", "Menge", "kg", 20),
+            ("CreatedAt", "Angemeldet", null, 35),
+            ("ModifiedAt", "Geändert", null, 35),
+            ("Status", "Status", null, 20),
+        ];
+
+        public DeliveryAncmtListData(IEnumerable<DeliveryAncmtListRow> rows, List<string> filterNames) :
+            base(DeliveryAncmtList.Name, DeliveryAncmtList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<DeliveryAncmtListData> FromQuery(IQueryable<DeliveryAncmt> query, List<string> filterNames) {
+            return new((await query
+                .Include(a => a.Schedule.Branch)
+                .Include(a => a.Member)
+                .Include(a => a.Variety)
+                .AsSplitQuery()
+                .ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
+        }
+    }
+
+    public class DeliveryAncmtListRow {
+        public DateOnly Date;
+        public string Branch;
+        public int MgNr;
+        public string Name1;
+        public string? Name2;
+        public string AdministrativeName;
+        public string? DefaultKg;
+        public string SortId;
+        public string Variety;
+        public DateTime CreatedAt;
+        public DateTime? ModifiedAt;
+        public int Weight;
+        public string? Status;
+
+        public DeliveryAncmtListRow(DeliveryAncmt a) {
+            var s = a.Schedule;
+            var m = a.Member;
+
+            Date = s.Date;
+            Branch = s.Branch.Name;
+            MgNr = m.MgNr;
+            Name1 = m.AdministrativeName1;
+            Name2 = m.AdministrativeName2;
+            AdministrativeName = m.AdministrativeName;
+            DefaultKg = m.DefaultKg?.Name;
+            SortId = a.SortId;
+            Variety = a.Variety.Name;
+            CreatedAt = a.CreatedAt;
+            ModifiedAt = a.ModifiedAt == a.CreatedAt ? null : a.ModifiedAt;
+            Weight = a.Weight;
+            Status = s.AncmtTo == null ? null : a.CreatedAt >= s.AncmtTo ? "verspät." : "ok";
+        }
+    }
+}

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -1,4 +1,4 @@
-using Elwig.Models.Entities;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,7 +16,7 @@ namespace Elwig.Models.Dtos {
             ("QualityLevel", "Qualitätsstufe", null, 25),
             ("Gradation", "Gradation", "°Oe|°KMW", 32),
             ("Buckets", "Flächenbindung", "|kg", 36),
-            ("Weight", "Gewicht", "kg", 16),
+            ("Weight", "Menge", "kg", 16),
         ];
 
         private readonly int MgNr;