[#57] MainWindow: Use Task.Run()

CHANGELOG.md

@@ -3,17 +3,46 @@ Changelog
 =========
 
 
+[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 {#0.13.7-bugfixes}
+### 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 {#0.13.7-misc}
+### Sonstiges {#v0.13.7-misc}
 
 * Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) ist es nun möglich das Datum einer Auszahlungsvariante zu ändern. (bd4ebb8c35)
 
@@ -25,12 +54,12 @@ Changelog
 [v0.13.6][v0.13.6] (2025-01-14) {#v0.13.6}
 ------------------------------------------
 
-### Behobene Fehler {#0.13.6-bugfixes}
+### 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 {#0.13.6-misc}
+### Sonstiges {#v0.13.6-misc}
 
 * Abhängigkeiten aktualisiert. (95ccb2627c, 80fec4473a)
 
@@ -42,12 +71,12 @@ Changelog
 [v0.13.5][v0.13.5] (2025-01-02) {#v0.13.5}
 ------------------------------------------
 
-### Neue Funktionen {#0.13.5-features}
+### 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 {#0.13.5-misc}
+### Sonstiges {#v0.13.5-misc}
 
 * Abhängigkeiten aktualisiert. (c9e483ba9d, 633b560a67)
 
@@ -59,12 +88,12 @@ Changelog
 [v0.13.4][v0.13.4] (2024-11-25) {#v0.13.4}
 ------------------------------------------
 
-### Behobene Fehler {#0.13.4-bugfixes}
+### 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 {#0.13.4-misc}
+### Sonstiges {#v0.13.4-misc}
 
 * Abhängigkeiten aktualisiert. (c3a2f983d5, 70e01849be, a99a23fd08, 4a10e94d71, 6c7f10cb26)
 
@@ -76,17 +105,17 @@ Changelog
 [v0.13.3][v0.13.3] (2024-11-13) {#v0.13.3}
 ------------------------------------------
 
-### Neue Funktionen {#0.13.3-features}
+### 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 {#0.13.3-bugfixes}
+### Behobene Fehler {#v0.13.3-bugfixes}
 
 * Im Rundschreiben-Fenster (`MailWindow`) kleinere Fehler behoben und alle Einstellungen werden nun gespeichert. (0a9731af09)
 
-### Sonstiges {#0.13.3-misc}
+### 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)
@@ -100,17 +129,17 @@ Changelog
 [v0.13.2][v0.13.2] (2024-10-13) {#v0.13.2}
 ------------------------------------------
 
-### Neue Funktionen {#0.13.2-features}
+### Neue Funktionen {#v0.13.2-features}
 
 * Im Lieferungen-Fenster den Menüpunkt _Abwertungsliste_ (`DeliveryDepreciationList`) hinzugefügt. (3cbffdbf27)
 
-### Behobene Fehler {#0.13.2-bugfixes}
+### 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 {#0.13.2-misc}
+### 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)
@@ -126,15 +155,15 @@ Changelog
 [v0.13.1][v0.13.1] (2024-09-29) {#v0.13.1}
 ------------------------------------------
 
-### Neue Funktionen {#0.13.1-features}
+### 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 {#0.13.1-bugfixes}
+### 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 {#0.13.1-misc}
+### Sonstiges {#v0.13.1-misc}
 
 * Abhängigkeiten aktualisiert. (b6ae1f5675)
 
@@ -149,7 +178,7 @@ Changelog
 > [!NOTE]
 > Ab dieser Version verhält sich die Berechnung der Unterlieferungen bei Flächenbindungen anders.
 
-### Behobene Fehler {#0.13.0-bugfixes}
+### 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)
 

Elwig/App.xaml.cs

@@ -25,10 +25,13 @@ namespace Elwig {
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
-        public static readonly string DataPath = @"C:\ProgramData\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 ExePath = @"C:\Program Files\Elwig\";
+        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 Config Config { get; private set; } = new(ConfigPath);
@@ -197,10 +200,12 @@ namespace Elwig {
             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) {

Elwig/Dialogs/AreaComDialog.xaml

@@ -51,7 +51,7 @@
         <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 MaintainYearTo}"/>
+                  IsChecked="{Binding MaintainYearFrom}"/>
 
         <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComDialog.xaml.cs

@@ -7,7 +7,7 @@ namespace Elwig.Dialogs {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
-        public bool MaintainYearTo { get; set; }
+        public bool MaintainYearFrom { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
@@ -43,13 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
-            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

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.cshtml

@@ -3,7 +3,7 @@
 @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">

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
 @model Elwig.Documents.DeliveryAncmtList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryAncmtList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
 <main>
     <h1>Anmeldeliste</h1>
     <h2>@Model.Filter</h2>
@@ -24,7 +24,7 @@
                 <th rowspan="2" style="text-align: left;">Ort</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th rowspan="2">Anmldg.</th>
-                <th>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[kg]</th>

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -3,7 +3,7 @@
 @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">
@@ -30,7 +30,7 @@
                 <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="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"

Elwig/Documents/DeliveryDepreciationList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
 @model Elwig.Documents.DeliveryDepreciationList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryDepreciationList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
 <main>
     <h1>Abwertungsliste</h1>
     <h2>@Model.Filter</h2>
@@ -27,7 +27,7 @@
                 <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>Gewicht</th>
+                <th>Menge</th>
             </tr>
             <tr>
                 <th class="unit">[°Oe]</th>

Elwig/Documents/DeliveryJournal.cshtml

@@ -2,7 +2,7 @@
 @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>
@@ -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>

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>

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;

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.DocumentsPath)\Document.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
     @if (Model.DoublePaged) {
         <style>
             @@page :left {

Elwig/Documents/MemberDataSheet.cshtml

@@ -3,7 +3,7 @@
 @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">

Elwig/Documents/MemberList.cshtml

@@ -2,7 +2,7 @@
 @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>

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>
@@ -111,8 +111,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
                 @{
                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.Price);
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
-                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                    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>
@@ -123,8 +123,8 @@
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
                 }
                 <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>
@@ -135,8 +135,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
-                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
-                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
                     var minGeb = gebRows.Min();
                     var maxGeb = gebRows.Max();
                 }
@@ -219,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>
@@ -241,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>
@@ -258,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>
@@ -267,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.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.13.7</Version>
+    <Version>0.13.9</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,26 +20,22 @@
     <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="LinqKit" Version="1.3.7" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
-    <PackageReference Include="MailKit" Version="4.9.0" />
+    <PackageReference Include="MailKit" Version="4.12.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
-    <PackageReference Include="NJsonSchema" Version="11.1.0" />
+    <PackageReference Include="NJsonSchema" Version="11.3.2" />
     <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.53" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
-    <PackageReference Include="System.IO.Ports" Version="9.0.1" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.4" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 31;
+        public static readonly int RequiredSchemaVersion = 32;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/ClientParameters.cs

@@ -23,6 +23,10 @@ namespace Elwig.Helpers {
         public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
         public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
 
+        public bool HasBoxWeighing(string? zwstId) => IsWinzerkeller && (zwstId != "W");
+        public bool HasBoxWeighing(Branch? b) => HasBoxWeighing(b?.ZwstId);
+        public bool HasBoxWeighing() => HasBoxWeighing(App.ZwstId);
+
         public string NameToken;
         public string NameShort;
         public string Name;

Elwig/Helpers/Export/ElwigData.cs

@@ -1,14 +1,15 @@
-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;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
@@ -63,7 +64,8 @@ namespace Elwig.Helpers.Export {
                     List<WbRd> Riede,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
-                    List<DeliveryPartModifier> Modifiers)>();
+                    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,
@@ -94,7 +96,11 @@ namespace Elwig.Helpers.Export {
                         areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
                         deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
 
-                    data.Add(new([], [], [], [], [], [], [], new([], [])));
+                    data.Add(new([], [], [], [], [], [], [], new([], [], new() {
+                        ["member"] = [],
+                        ["area_commitment"] = [],
+                        ["delivery"] = [],
+                    })));
                     var r = data[^1];
 
                     var membersJson = zip.GetEntry("members.json");
@@ -103,11 +109,13 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
+                            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));
                         }
                     }
 
@@ -117,12 +125,14 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
+                            var (areaCom, wbrd, timestamps) = obj.ToAreaCom(kgs, currentWbRde);
                             r.AreaCommitments.Add(areaCom);
                             if (wbrd != null) {
                                 currentWbRde[wbrd.KgNr].Add(wbrd);
                                 r.Riede.Add(wbrd);
                             }
+                            if (timestamps.HasValue)
+                                r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                         }
                     }
 
@@ -132,10 +142,12 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids);
+                            var (d, parts, mods, timestamps) = obj.ToDelivery(currentLsNrs, currentDids);
                             r.Deliveries.Add(d);
                             r.DeliveryParts.AddRange(parts);
                             r.Modifiers.AddRange(mods);
+                            if (timestamps.HasValue)
+                                r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                         }
                     }
                 }
@@ -144,7 +156,7 @@ namespace Elwig.Helpers.Export {
                 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, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
@@ -272,6 +284,26 @@ namespace Elwig.Helpers.Export {
                     }
 
                     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));
                 }
                 App.HintContextChange();
@@ -460,15 +492,19 @@ namespace Elwig.Helpers.Export {
                     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>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+        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>(),
@@ -502,6 +538,7 @@ namespace Elwig.Helpers.Export {
                 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>(),
@@ -519,7 +556,10 @@ namespace Elwig.Helpers.Export {
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            }).ToList());
+            }).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) {
@@ -535,10 +575,12 @@ namespace Elwig.Helpers.Export {
                 ["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?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             WbRd? rd = null;
@@ -556,6 +598,8 @@ namespace Elwig.Helpers.Export {
                     rde.Add(rd);
                 }
             }
+            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>(),
@@ -568,7 +612,11 @@ namespace Elwig.Helpers.Export {
                 YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
-            }, newRd ? rd : null);
+                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) {
@@ -596,6 +644,8 @@ namespace Elwig.Helpers.Export {
                         ["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;
@@ -609,10 +659,12 @@ namespace Elwig.Helpers.Export {
                     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>) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -621,6 +673,8 @@ namespace Elwig.Helpers.Export {
                 did = ++currentDids[year];
             }
             currentLsNrs[lsnr] = did;
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -631,6 +685,7 @@ namespace Elwig.Helpers.Export {
                 LsNr = lsnr,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
                 Year = year,
                 DId = did,
@@ -661,7 +716,10 @@ namespace Elwig.Helpers.Export {
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList());
+            })).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)));
         }
     }
 }

Elwig/Helpers/Export/Ods.cs

@@ -317,7 +317,7 @@ namespace Elwig.Helpers.Export {
                 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/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

@@ -14,7 +14,7 @@ using System.Drawing.Printing;
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        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)

Elwig/Helpers/Utils.cs

@@ -434,8 +434,7 @@ namespace Elwig.Helpers {
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
             if (username != null || password != null)
-                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
+                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Utils.UTF8.GetBytes($"{username}:{password}")));
-                    Utils.UTF8.GetBytes($"{username}:{password}")));
             return client;
         }
 
@@ -454,6 +453,8 @@ 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));
@@ -463,6 +464,8 @@ namespace Elwig.Helpers {
         }
 
         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();
@@ -496,9 +499,11 @@ namespace Elwig.Helpers {
             if (App.Config.Smtp == null)
                 return false;
 
+            Mouse.OverrideCursor = Cursors.Wait;
+
+            var success = await Task.Run(async () => {
                 SmtpClient? client = null;
                 try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
                     client = await GetSmtpClient();
 
                     using var msg = new MimeMessage();
@@ -521,9 +526,12 @@ namespace Elwig.Helpers {
                     if (client != null)
                         await client.DisconnectAsync(true);
                     client?.Dispose();
-                Mouse.OverrideCursor = null;
                 }
                 return true;
+            });
+
+            Mouse.OverrideCursor = null;
+            return success;
         }
 
         public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -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) {
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
-            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
+            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/DeliveryAncmtListData.cs

@@ -17,9 +17,9 @@ namespace Elwig.Models.Dtos {
             ("Name2", "Vorname", null, 40),
             ("DefaultKg", "Ort", null, 40),
             ("SortId", "Sorte", null, 10),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
-            ("CreatedTimestamp", "Angemeldet", null, 35),
+            ("CreatedAt", "Angemeldet", null, 35),
-            ("ModifiedTimestamp", "Geändert", null, 35),
+            ("ModifiedAt", "Geändert", null, 35),
             ("Status", "Status", null, 20),
         ];
 
@@ -47,8 +47,8 @@ namespace Elwig.Models.Dtos {
         public string? DefaultKg;
         public string SortId;
         public string Variety;
-        public DateTime CreatedTimestamp;
+        public DateTime CreatedAt;
-        public DateTime? ModifiedTimestamp;
+        public DateTime? ModifiedAt;
         public int Weight;
         public string? Status;
 
@@ -65,10 +65,10 @@ namespace Elwig.Models.Dtos {
             DefaultKg = m.DefaultKg?.Name;
             SortId = a.SortId;
             Variety = a.Variety.Name;
-            CreatedTimestamp = a.CreatedTimestamp;
+            CreatedAt = a.CreatedAt;
-            ModifiedTimestamp = a.ModifiedTimestamp == a.CreatedTimestamp ? null : a.ModifiedTimestamp;
+            ModifiedAt = a.ModifiedAt == a.CreatedAt ? null : a.ModifiedAt;
             Weight = a.Weight;
-            Status = s.AncmtTo == null ? null : a.CreatedTimestamp >= s.AncmtTo ? "verspät." : "ok";
+            Status = s.AncmtTo == null ? null : a.CreatedAt >= s.AncmtTo ? "verspät." : "ok";
         }
     }
 }

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -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;

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -24,7 +24,7 @@ namespace Elwig.Models.Dtos {
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qualität", null, 15),
             ("Gradation", "Gradation", "°Oe|°KMW", 40),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
             ("IsNetWeight", "Gerebelt", null, 20),
             ("HkId", "Herkunft", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 40),

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -18,8 +18,9 @@ namespace Elwig.Models.Dtos {
             ("Cultivation", "Bewirt.", null, 20),
             ("QualityLevel", "Qualitätsstufe", null, 30),
             ("Oe", "Gradation", "°Oe", 20),
-            ("Ungeb", "ungebunden", "kg|€/kg", 40),
+            ("Ungeb", "ungebunden", "kg|€/kg|€/kg", 60),
-            ("Geb", "gebunden", "kg|€/kg", 40),
+            ("LowGeb", "attributlos gebunden", "kg|€/kg|€/kg", 60),
+            ("Geb", "gebunden", "kg|€/kg|€/kg", 60),
             ("Amount", "Gesamt", "€", 25),
         ];
 
@@ -30,8 +31,9 @@ namespace Elwig.Models.Dtos {
             string? Cultivation,
             string QualityLevel,
             double Oe,
-            (int Weight, decimal? Price) Ungeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ungeb,
-            (int Weight, decimal? Price) Geb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowGeb,
+            (int Weight, decimal? MinPrice, decimal? MaxPrice) Geb,
             decimal Amount
         );
 
@@ -42,8 +44,9 @@ namespace Elwig.Models.Dtos {
         public static async Task<PaymentVariantSummaryData> ForPaymentVariant(PaymentVar v, DbSet<PaymentVariantSummaryRow> table) {
             return new(v, (await FromDbSet(table, v.Year, v.AvNr))
                 .Select(r => new PaymentRow(r.Type, r.Variety, r.Attribute, r.Cultivation, r.QualityLevel, r.Oe,
-                    (r.WeightUngeb, r.PriceUngeb != null ? Utils.DecFromDb(r.PriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightUngeb, r.MinPriceUngeb != null ? Utils.DecFromDb(r.MinPriceUngeb.Value, v.Season.Precision) : null, r.MaxPriceUngeb != null ? Utils.DecFromDb(r.MaxPriceUngeb.Value, v.Season.Precision) : null),
-                    (r.WeightGeb, r.PriceGeb != null ? Utils.DecFromDb(r.PriceGeb.Value, v.Season.Precision) : null),
+                    (r.WeightLowGeb, r.MinPriceLowGeb != null ? Utils.DecFromDb(r.MinPriceLowGeb.Value, v.Season.Precision) : null, r.MaxPriceLowGeb != null ? Utils.DecFromDb(r.MaxPriceLowGeb.Value, v.Season.Precision) : null),
+                    (r.WeightGeb, r.MinPriceGeb != null ? Utils.DecFromDb(r.MinPriceGeb.Value, v.Season.Precision) : null, r.MaxPriceGeb != null ? Utils.DecFromDb(r.MaxPriceGeb.Value, v.Season.Precision) : null),
                     Utils.DecFromDb(r.Amount, v.Season.Precision)))
                 .ToArray());
         }
@@ -57,19 +60,23 @@ namespace Elwig.Models.Dtos {
                        q.name AS quality_level,
                        ROUND(kmw * (4.54 + 0.022 * kmw)) AS oe,
                        SUM(IIF(w.discr = '_', w.value, 0)) AS weight_ungeb,
-                       MAX(IIF(w.discr = '_', b.price, NULL)) AS price_ungeb,
+                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_ungeb,
-                       SUM(IIF(w.discr != '_', w.value, 0)) AS weight_geb,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_ungeb,
-                       MAX(IIF(w.discr != '_', b.price, NULL)) AS price_geb,
+                       SUM(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), w.value, 0)) AS weight_lowgeb,
+                       MIN(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS min_price_lowgeb,
+                       MAX(IIF(w.discr NOT IN (COALESCE(p.attrid, ''), '_'), b.price, NULL)) AS max_price_lowgeb,
+                       SUM(IIF(w.discr = COALESCE(p.attrid, ''), w.value, 0)) AS weight_geb,
+                       MIN(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS min_price_geb,
+                       MAX(IIF(w.discr = COALESCE(p.attrid, ''), b.price, NULL)) AS max_price_geb,
                        SUM(b.amount) AS amount
                 FROM payment_delivery_part_bucket b
                     LEFT JOIN delivery_part_bucket w ON (w.year, w.did, w.dpnr, w.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
                     LEFT JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (b.year, b.did, b.dpnr)
-                    LEFT JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
                     LEFT JOIN wine_variety v ON v.sortid = p.sortid
                     LEFT JOIN wine_attribute a ON a.attrid = p.attrid
                     LEFT JOIN wine_cultivation c ON c.cultid = p.cultid
                     LEFT JOIN wine_quality_level q ON q.qualid = p.qualid
-                WHERE d.year = {year} AND b.avnr = {avnr}
+                WHERE p.year = {year} AND b.avnr = {avnr}
                 GROUP BY variety, attribute, cultivation, q.min_kmw, oe
                 ORDER BY variety, attribute, cultivation, q.min_kmw, oe
                 """).ToListAsync();
@@ -92,12 +99,22 @@ namespace Elwig.Models.Dtos {
         public double Oe { get; set; }
         [Column("weight_ungeb")]
         public int WeightUngeb { get; set; }
-        [Column("price_ungeb")]
+        [Column("min_price_ungeb")]
-        public long? PriceUngeb { get; set; }
+        public long? MinPriceUngeb { get; set; }
+        [Column("max_price_ungeb")]
+        public long? MaxPriceUngeb { get; set; }
+        [Column("weight_lowgeb")]
+        public int WeightLowGeb { get; set; }
+        [Column("min_price_lowgeb")]
+        public long? MinPriceLowGeb { get; set; }
+        [Column("max_price_lowgeb")]
+        public long? MaxPriceLowGeb { get; set; }
         [Column("weight_geb")]
         public int WeightGeb { get; set; }
-        [Column("price_geb")]
+        [Column("min_price_geb")]
-        public long? PriceGeb { get; set; }
+        public long? MinPriceGeb { get; set; }
+        [Column("max_price_geb")]
+        public long? MaxPriceGeb { get; set; }
         [Column("amount")]
         public long Amount { get; set; }
     }

Elwig/Models/Dtos/WeightBreakdownData.cs

@@ -14,7 +14,7 @@ namespace Elwig.Models.Dtos {
             ("CultId", "Bewirt.", null, 15),
             ("QualId", "Qual.", null, 15),
             ("Geb", "gebunden", null, 20),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
         ];
 
         public WeightBreakdownData(IEnumerable<WeightBreakdownRow> rows, int year, string name) :

Elwig/Models/Dtos/WineLocalityStatisticsData.cs

@@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos {
             ("Members", "Mitgl.", "#", 15),
             ("Deliveries", "Lfrg.", "#", 15),
             ("Parts", "Teill.", "#", 15),
-            ("Weight", "Gewicht", "kg", 20),
+            ("Weight", "Menge", "kg", 20),
             ("Gradation", "Gradation", "°Oe|°KMW", 30),
         ];
 

Elwig/Models/Entities/AreaCom.cs

@@ -41,14 +41,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;

Elwig/Models/Entities/Credit.cs

@@ -84,14 +84,36 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("Year, AvNr, MgNr")]
         public virtual PaymentMember Payment { get; private set; } = null!;

Elwig/Models/Entities/Delivery.cs

@@ -62,14 +62,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;

Elwig/Models/Entities/DeliveryAncmt.cs

@@ -27,14 +27,36 @@ namespace Elwig.Models.Entities {
         public required string Type { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("Year, DsNr")]
         public virtual DeliverySchedule Schedule { get; private set; } = null!;

Elwig/Models/Entities/DeliveryPart.cs

@@ -129,14 +129,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [InverseProperty(nameof(DeliveryPartModifier.Part))]
         public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;

Elwig/Models/Entities/Member.cs

@@ -145,14 +145,36 @@ namespace Elwig.Models.Entities {
         public AT_Kg? DefaultKg => DefaultWbKg?.AtKg;
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }

Elwig/Models/Entities/PaymentVar.cs

@@ -46,14 +46,36 @@ namespace Elwig.Models.Entities {
         public required string Data { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;

Elwig/Resources/Sql/31-32.sql

@@ -0,0 +1,33 @@
+-- schema version 31 to 32
+
+INSERT INTO client_parameter (param, value) VALUES ('ENABLE_TIME_TRIGGERS', '1');
+
+ALTER TABLE member ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE member ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE area_commitment ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE area_commitment ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_announcement ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_announcement ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_part ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE delivery_part ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE payment_variant ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE payment_variant ADD COLUMN itime INTEGER DEFAULT NULL;
+ALTER TABLE credit ADD COLUMN xtime INTEGER DEFAULT NULL;
+ALTER TABLE credit ADD COLUMN itime INTEGER DEFAULT NULL;
+
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(REPLACE(sql,
+'    WHEN',
+'    WHEN (SELECT value FROM client_parameter WHERE param = ''ENABLE_TIME_TRIGGERS'') = 1 AND'),
+'FOR EACH ROW' || char(10) ||
+'BEGIN',
+'FOR EACH ROW' || char(10) ||
+'    WHEN (SELECT value FROM client_parameter WHERE param = ''ENABLE_TIME_TRIGGERS'') = 1' || char(10) ||
+'BEGIN')
+WHERE type = 'trigger' AND name LIKE '%time%';
+
+PRAGMA writable_schema = OFF;
+PRAGMA schema_version = 3101;

Elwig/Services/AreaComService.cs

@@ -108,7 +108,8 @@ namespace Elwig.Services {
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
             int newFbNr = (int)vm.FbNr!;
 
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
                     MgNr = (int)vm.MgNr!,
@@ -140,7 +141,7 @@ namespace Elwig.Services {
                 if (newFbNr != a.FbNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
-            }
+            });
 
             App.HintContextChange();
 
@@ -253,5 +254,16 @@ namespace Elwig.Services {
             }
             return grid;
         }
+
+        public static async Task DeleteAreaCom(int fbnr) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
+                ctx.Remove(l);
+                await ctx.SaveChangesAsync();
+            });
+
+            App.HintContextChange();
+        }
     }
 }

Elwig/Services/DeliveryAncmtService.cs

@@ -37,8 +37,8 @@ namespace Elwig.Services {
             vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
             vm.SortId = a.SortId;
             vm.Weight = a.Weight;
-            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtCreated = $"{a.CreatedAt:dd.MM.yyyy, HH:mm} ({a.Type})";
-            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
+            vm.StatusAncmtModified = a.ModifiedAt != a.CreatedAt ? $"{a.ModifiedAt:dd.MM.yyyy, HH:mm}" : "-";
         }
 
         public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
@@ -326,7 +326,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryAncmts.SumAsync(p => p.Weight);
             text = $"{weight:N0} kg";
-            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);
 
             if (await deliveryAncmts.AnyAsync()) {
                 var attrGroups = await deliveryAncmts

Elwig/Services/DeliveryService.cs

@@ -430,9 +430,10 @@ namespace Elwig.Services {
         }
 
         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
+            var p = await Task.Run(async () => {
                 DeliveryPart p;
 
-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                 int year = oldYear ?? Utils.CurrentYear;
                 int did = oldDid ?? await ctx.NextDId(year);
                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -524,7 +525,9 @@ namespace Elwig.Services {
                 }
 
                 await ctx.SaveChangesAsync();
-            }
+
+                return p;
+            });
 
             App.HintContextChange();
 
@@ -532,9 +535,10 @@ namespace Elwig.Services {
         }
 
         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
+            var n = await Task.Run(async () => {
                 Delivery n;
 
-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                 bool anyLeft = false;
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
@@ -577,7 +581,9 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
                 if (!anyLeft)
                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-            }
+
+                return n;
+            });
 
             App.HintContextChange();
 
@@ -585,9 +591,9 @@ namespace Elwig.Services {
         }
 
         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
+            var n = await Task.Run(async () => {
                 Delivery n;
-
+                using var ctx = new AppDbContext();
-            using (var ctx = new AppDbContext()) {
                 var anyLeft = false;
                 n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
@@ -616,7 +622,9 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
                 if (!anyLeft && n.LsNr != d.LsNr)
                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-            }
+
+                return n;
+            });
 
             App.HintContextChange();
 
@@ -624,7 +632,8 @@ namespace Elwig.Services {
         }
 
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var dpnr = await ctx.NextDPNr(year, did);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
@@ -648,13 +657,14 @@ namespace Elwig.Services {
                     }
                 }
                 await ctx.SaveChangesAsync();
-            }
+            });
 
             App.HintContextChange();
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     using var ctx = new AppDbContext();
                     var d = (await ctx.Deliveries.FindAsync(year, did))!;
@@ -663,6 +673,7 @@ namespace Elwig.Services {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -707,7 +718,8 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         try {
                             var data = await DeliveryJournalData.FromQuery(query, filterNames);
                             using var ods = new OdsFile(d.FileName);
@@ -715,6 +727,7 @@ namespace Elwig.Services {
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -725,7 +738,8 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         try {
                             await ElwigData.Export(d.FileName, await query
                                 .Select(p => p.Delivery)
@@ -737,10 +751,12 @@ namespace Elwig.Services {
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                         var path = Path.Combine(App.TempPath, filename);
@@ -767,9 +783,11 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         var data = await DeliveryJournalData.FromQuery(query, filterNames);
                         using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
@@ -777,6 +795,7 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -798,7 +817,8 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
                     using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
@@ -806,6 +826,7 @@ namespace Elwig.Services {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -829,7 +850,8 @@ namespace Elwig.Services {
                 Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         using var ods = new OdsFile(d.FileName);
                         var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
@@ -837,6 +859,7 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -875,7 +898,8 @@ namespace Elwig.Services {
                     Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         try {
                             using var ods = new OdsFile(d.FileName);
                             var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
@@ -891,10 +915,12 @@ namespace Elwig.Services {
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         var data = await DeliveryJournalData.FromQuery(query, filterNames);
                         using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
@@ -902,6 +928,7 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -946,7 +973,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryParts.SumAsync(p => p.Weight);
             wText = $"{weight:N0} kg";
-            wGrid.Add(("Gewicht", null, weight, null, weight));
+            wGrid.Add(("Menge", null, weight, null, weight));
 
             if (await deliveryParts.AnyAsync()) {
                 var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
@@ -1070,10 +1097,12 @@ namespace Elwig.Services {
         }
 
         public static async Task DeleteDelivery(string lsnr) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
                 await ctx.SaveChangesAsync();
-            }
+            });
+
             App.HintContextChange();
         }
     }

Elwig/Services/MemberService.cs

@@ -1,20 +1,20 @@
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System;
-using Microsoft.EntityFrameworkCore;
 using Elwig.Documents;
-using System.Windows.Input;
+using Elwig.Helpers;
-using System.Windows;
 using Elwig.Helpers.Billing;
-using Elwig.Models.Dtos;
 using Elwig.Helpers.Export;
-using Microsoft.Win32;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -49,6 +49,11 @@ namespace Elwig.Services {
             vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
             vm.StatusAreaCommitmentToolTip = null;
             vm.Age = "-";
+            vm.CreatedAt = "-";
+            vm.ModifiedAt = "-";
+            vm.ModifiedAtShort = "-";
+            vm.ExportedAt = "-";
+            vm.ImportedAt = "-";
         }
 
         public static void FillInputs(this MemberAdminViewModel vm, Member m) {
@@ -137,6 +142,12 @@ namespace Elwig.Services {
             vm.ContactViaPost = m.ContactViaPost;
             vm.ContactViaEmail = m.ContactViaEmail;
 
+            vm.CreatedAt = $"{m.CreatedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAt = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAtShort = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm}";
+            vm.ExportedAt = m.ExportedAt == null ? "-" : $"{m.ExportedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ImportedAt = m.ImportedAt == null ? "-" : $"{m.ImportedAt:dd.MM.yyyy, HH:mm:ss}";
+
             vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
             vm.StatusDeliveriesLastSeason = "...";
             vm.StatusDeliveriesLastSeasonToolTip = null;
@@ -357,8 +368,8 @@ namespace Elwig.Services {
                 if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
                 if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
                 if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
-                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).Any(c => filterAreaCom.Contains(c.VtrgId)));
-                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).All(c => filterNotAreaCom.Contains(c.VtrgId)));
+                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).All(c => filterNotAreaCom.Contains(c.VtrgId)));
                 if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
                 if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
             }
@@ -367,7 +378,8 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     using var ctx = new AppDbContext();
                     using var doc = new MemberDataSheet(m, ctx);
@@ -375,11 +387,13 @@ namespace Elwig.Services {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var b = new Billing(year);
                     await b.FinishSeason();
@@ -393,15 +407,17 @@ namespace Elwig.Services {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     using var ctx = new AppDbContext();
                     var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr);
+                    var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr);
                     var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
                     var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
 
@@ -412,6 +428,7 @@ namespace Elwig.Services {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -464,7 +481,8 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         try {
                             var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                             using var ods = new OdsFile(d.FileName);
@@ -472,6 +490,7 @@ namespace Elwig.Services {
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -482,7 +501,8 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         try {
                             var members = await query
                                 .OrderBy(m => m.MgNr)
@@ -499,10 +519,12 @@ namespace Elwig.Services {
                         } catch (Exception exc) {
                             MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         }
+                    });
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                         var path = Path.Combine(App.TempPath, filename);
@@ -533,9 +555,11 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     try {
                         var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                         using var doc = new MemberList(string.Join(" / ", filterNames), data);
@@ -543,14 +567,13 @@ namespace Elwig.Services {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
+                });
                 Mouse.OverrideCursor = null;
             }
         }
 
         public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
             var newMgNr = (int)vm.MgNr!;
-
-            using (var ctx = new AppDbContext()) {
             var m = new Member {
                 MgNr = oldMgNr ?? newMgNr,
                 PredecessorMgNr = vm.PredecessorMgNr,
@@ -588,6 +611,8 @@ namespace Elwig.Services {
                 ContactViaEmail = vm.ContactViaEmail,
             };
 
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 if (oldMgNr != null) {
                     ctx.Update(m);
                 } else {
@@ -644,7 +669,7 @@ namespace Elwig.Services {
                         KgNr = c.KgNr,
                         GstNr = c.GstNr,
                         RdNr = c.RdNr,
-                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
                         YearTo = c.YearTo,
                     }));
 
@@ -670,7 +695,7 @@ namespace Elwig.Services {
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                 }
-            }
+            });
 
             App.HintContextChange();
 
@@ -678,7 +703,8 @@ namespace Elwig.Services {
         }
 
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var l = (await ctx.Members.FindAsync(mgnr))!;
                 if (deletePaymentData) {
                     ctx.RemoveRange(l.Credits);
@@ -691,7 +717,8 @@ namespace Elwig.Services {
                 }
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
-            }
+            });
+
             App.HintContextChange();
         }
     }

Elwig/Services/PaymentVariantService.cs

@@ -0,0 +1,346 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Services {
+    public static class PaymentVariantService {
+
+        private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
+
+        public static void ClearInputs(this PaymentVariantsViewModel vm) {
+            vm.IsPaymentVariantSelected = false;
+            vm.EditText = "Bearbeiten";
+            vm.SaveIsEnabled = false;
+            vm.DeleteIsEnabled = false;
+            vm.CalculateIsEnabled = false;
+            vm.CommitIsEnabled = false;
+            vm.CommitVisibility = Visibility.Visible;
+            vm.RevertIsEnabled = false;
+            vm.RevertVisibility = Visibility.Hidden;
+            vm.Arrow = "\xF0AF";
+            vm.ExportIsEnabled = false;
+
+            vm.IsReadOnly = true;
+            vm.DataIsReadOnly = true;
+            vm.BillingData = null;
+            vm.Name = "";
+            vm.Comment = "";
+            vm.Date = null;
+            vm.TransferDate = null;
+            vm.WeightModifier = null;
+            vm.ConsiderModifiers = false;
+            vm.ConsiderPenalties = false;
+            vm.ConsiderPenalty = false;
+            vm.ConsiderAuto = false;
+            vm.ConsiderCustom = false;
+            vm.IsEnabled = false;
+            vm.Data = "";
+
+            vm.StatusModifierSum = "-";
+            vm.StatusTotalSum = "-";
+            vm.StatusVatSum = "-";
+            vm.StatusDeductionSum = "-";
+            vm.StatusPaymentSum = "-";
+        }
+
+        public static void FillInputs(this PaymentVariantsViewModel vm, PaymentVar v) {
+            var locked = !v.TestVariant;
+            vm.IsPaymentVariantSelected = true;
+            vm.SaveIsEnabled = !locked;
+            vm.DeleteIsEnabled = !locked;
+            vm.CalculateIsEnabled = !locked;
+            vm.CommitIsEnabled = !locked && !vm.SeasonLocked;
+            vm.CommitVisibility = !locked ? Visibility.Visible : Visibility.Hidden;
+            vm.RevertIsEnabled = locked && !vm.SeasonLocked;
+            vm.RevertVisibility = locked ? Visibility.Visible : Visibility.Hidden;
+            vm.Arrow = locked ? "\xF0B0" : "\xF0AF";
+            vm.EditText = locked ? "Ansehen" : "Bearbeiten";
+            vm.ExportIsEnabled = locked;
+
+            vm.IsReadOnly = false;
+            vm.DataIsReadOnly = locked;
+            vm.Name = v.Name;
+            vm.Comment = v.Comment ?? "";
+            vm.Date = v.Date;
+            vm.TransferDate = v.TransferDate;
+            try {
+                vm.BillingData = BillingData.FromJson(v.Data);
+                vm.ConsiderModifiers = vm.BillingData.ConsiderDelieryModifiers;
+                vm.ConsiderPenalties = vm.BillingData.ConsiderContractPenalties;
+                vm.ConsiderPenalty = vm.BillingData.ConsiderTotalPenalty;
+                vm.ConsiderAuto = vm.BillingData.ConsiderAutoBusinessShares;
+                vm.ConsiderCustom = vm.BillingData.ConsiderCustomModifiers;
+                if (vm.BillingData.NetWeightModifier != 0) {
+                    vm.WeightModifier = Math.Round(vm.BillingData.NetWeightModifier * 100.0, 8);
+                } else if (vm.BillingData.GrossWeightModifier != 0) {
+                    vm.WeightModifier = Math.Round(vm.BillingData.GrossWeightModifier * 100.0, 8);
+                } else {
+                    vm.WeightModifier = null;
+                }
+                vm.Data = JsonSerializer.Serialize(vm.BillingData.Data, JsonOpt);
+            } catch {
+                vm.BillingData = null;
+                vm.ConsiderModifiers = false;
+                vm.ConsiderPenalties = false;
+                vm.ConsiderPenalty = false;
+                vm.ConsiderAuto = false;
+                vm.ConsiderCustom = false;
+                vm.WeightModifier = null;
+                vm.Data = v.Data;
+            }
+            vm.IsEnabled = !locked;
+
+            vm.StatusModifierSum = "...";
+            vm.StatusTotalSum = "...";
+            vm.StatusVatSum = "...";
+            vm.StatusDeductionSum = "...";
+            vm.StatusPaymentSum = "...";
+            Utils.RunBackground("Variantendaten laden", async () => {
+                await vm.UpdateSums(v);
+            });
+        }
+
+        private static async Task UpdateSums(this PaymentVariantsViewModel vm, PaymentVar v) {
+            if (App.MainDispatcher == null)
+                return;
+            var modText = "-";
+            var totalText = "-";
+            var vatText = "-";
+            var deductionText = "-";
+            var paymentText = "-";
+
+            using var ctx = new AppDbContext();
+            var sym = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
+
+            var modSum = await ctx.PaymentDeliveryParts
+                .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                .SumAsync(p => p.AmountValue - p.NetAmountValue);
+            modText = $"{v.Season.DecFromDb(modSum):N2} {sym}";
+
+            var totalSum = await ctx.MemberPayments
+                .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                .SumAsync(p => p.AmountValue);
+            totalText = $"{v.Season.DecFromDb(totalSum):N2} {sym}";
+
+            await App.MainDispatcher.BeginInvoke(() => {
+                if (vm.SelectedPaymentVariant != v)
+                    return;
+                vm.StatusModifierSum = modText;
+                vm.StatusTotalSum = totalText;
+            });
+
+            var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
+            if (!credits.Any()) {
+                long lastTotalSum = 0;
+                decimal vatSum = 0;
+                var currentPayments = await ctx.MemberPayments
+                        .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                        .ToDictionaryAsync(p => p.MgNr);
+                var lastV = await ctx.PaymentVariants
+                    .Where(l => l.Year == v.Year && !l.TestVariant)
+                    .OrderByDescending(l => l.TransferDateString ?? l.DateString)
+                    .ThenByDescending(l => l.AvNr)
+                    .FirstOrDefaultAsync();
+                if (lastV != null) {
+                    var lastPayments = await ctx.MemberPayments
+                        .Where(p => p.Year == v.Year && p.AvNr == lastV.AvNr)
+                        .ToDictionaryAsync(p => p.MgNr);
+                    lastTotalSum = lastPayments.Sum(e => e.Value.AmountValue);
+                    foreach (int mgnr in currentPayments.Keys) {
+                        var c = currentPayments[mgnr];
+                        var l = lastPayments[mgnr];
+                        vatSum += (c.Amount - l.Amount) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
+                    }
+                } else {
+                    vatSum = currentPayments.Sum(e => e.Value.Amount * (decimal)(e.Value.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate));
+                }
+                vatText = $"~{vatSum:N2} {sym}";
+                deductionText = $"- {sym}";
+                paymentText = $"~{v.Season.DecFromDb(totalSum - lastTotalSum) + vatSum:N2} {sym}";
+            } else {
+                // all values in the credit table are stored with precision 2!
+                totalText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.NetAmountValue), 2):N2} {sym}";
+                vatText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.VatAmountValue), 2):N2} {sym}";
+                deductionText = $"{-Utils.DecFromDb(await credits.SumAsync(c => c.ModifiersValue ?? 0), 2):N2} {sym}";
+                paymentText = $"{Utils.DecFromDb(await credits.SumAsync(c => c.AmountValue), 2):N2} {sym}";
+            }
+
+            await App.MainDispatcher.BeginInvoke(() => {
+                if (vm.SelectedPaymentVariant != v)
+                    return;
+                vm.StatusModifierSum = modText;
+                vm.StatusTotalSum = totalText;
+                vm.StatusVatSum = vatText;
+                vm.StatusDeductionSum = deductionText;
+                vm.StatusPaymentSum = paymentText;
+            });
+        }
+
+        public static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                using var doc = new PaymentVariantSummary((await ctx.PaymentVariants.FindAsync(v.Year, v.AvNr))!, data);
+                await Utils.ExportDocument(doc, mode);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
+        }
+
+        public static async Task GenerateEbics(int year, int avnr) {
+            using var ctx = new AppDbContext();
+            var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+
+            var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
+            if (withoutIban > 0) {
+                var r = MessageBox.Show($"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert.",
+                    "Mitglieder ohne IBAN", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (r != MessageBoxResult.OK) return;
+            }
+            var withNegAmount = v.Credits.Count(c => c.Amount <= 0);
+            if (withNegAmount > 0) {
+                var r = MessageBox.Show($"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert.",
+                    "Traubengutschriften mit negativem Betrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.OK);
+                if (r != MessageBoxResult.OK) return;
+            }
+
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
+                DefaultExt = Ebics.FileExtension,
+                Filter = "EBICS-Datei (*.xml)|*.xml",
+                Title = $"Überweisungsdaten speichern unter - Elwig",
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
+                    await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task GenerateAccountingList(int year, int avnr, string name) {
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Buchungsliste-{year}-{name.Trim().Replace(' ', '-')}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Buchungsliste speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var ctx = new AppDbContext();
+                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, year, avnr);
+                    using var ods = new OdsFile(d.FileName);
+                    await ods.AddTable(tbl);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task<PaymentVar> CreatePaymentVariant(int year) {
+            PaymentVar? v;
+            using (var ctx = new AppDbContext()) {
+                v = new PaymentVar {
+                    Year = year,
+                    AvNr = await ctx.NextAvNr(year),
+                    Name = "Neue Auszahlungsvariante",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                };
+                ctx.Add(v);
+                await ctx.SaveChangesAsync();
+            }
+            App.HintContextChange();
+            return v;
+        }
+
+        public static async Task<PaymentVar> Duplicate(this PaymentVar orig) {
+            PaymentVar? n;
+            using (var ctx = new AppDbContext()) {
+                n = new PaymentVar {
+                    Year = orig.Year,
+                    AvNr = await ctx.NextAvNr(orig.Year),
+                    Name = $"{orig.Name} (Kopie)",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = orig.Data,
+                };
+
+                ctx.Add(n);
+                await ctx.SaveChangesAsync();
+            }
+            App.HintContextChange();
+            return n;
+        }
+
+        public static async Task<(int, int)> UpdatePaymentVariant(this PaymentVariantsViewModel vm, int? oldYear, int? oldAvNr) {
+            var year = oldYear ?? Utils.CurrentYear;
+            int avnr = 0;
+
+            var d = App.Config.Debug ? BillingData.FromJson(vm.Data ?? "{}") : vm.BillingData!;
+            d.ConsiderDelieryModifiers = vm.ConsiderModifiers;
+            d.ConsiderContractPenalties = vm.ConsiderPenalties;
+            d.ConsiderTotalPenalty = vm.ConsiderPenalty;
+            d.ConsiderAutoBusinessShares = vm.ConsiderAuto;
+            d.ConsiderCustomModifiers = vm.ConsiderCustom;
+            var modVal = vm.WeightModifier ?? 0;
+            d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
+            d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
+
+            using (var ctx = new AppDbContext()) {
+                var v = new PaymentVar {
+                    Year = year,
+                    AvNr = oldAvNr ?? await ctx.NextAvNr(year),
+                    Name = vm.Name!,
+                    DateString = $"{vm.Date!.Value:yyyy-MM-dd}",
+                    TransferDate = vm.TransferDate,
+                    TestVariant = vm.SelectedPaymentVariant?.TestVariant ?? true,
+                    CalcTimeUnix = vm.SelectedPaymentVariant?.CalcTimeUnix,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    Data = JsonSerializer.Serialize(d.Data),
+                };
+                avnr = v.AvNr;
+                ctx.Update(v);
+                await ctx.SaveChangesAsync();
+            }
+            vm.WeightModifierChanged = false;
+            App.HintContextChange();
+            return (year, avnr);
+        }
+
+        public static async Task DeletePaymentVariant(int year, int avnr) {
+            using (var ctx = new AppDbContext()) {
+                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
+                ctx.Remove(v);
+                await ctx.SaveChangesAsync();
+            }
+            App.HintContextChange();
+        }
+
+        public static async Task Calculate(int year, int avnr) {
+            var b = new BillingVariant(year, avnr);
+            await b.Calculate();
+        }
+    }
+}

Elwig/ViewModels/AreaComAdminViewModel.cs

@@ -15,7 +15,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _searchQuery = "";
         public List<string> TextFilter {
-            get => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+            get => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
             set => SearchQuery = string.Join(' ', value.Where(e => e.Length > 0));
         }
 

Elwig/ViewModels/DeliveryAdminViewModel.cs

@@ -18,7 +18,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private string? _lastScaleError;

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

@@ -10,7 +10,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _filterOnlyUpcoming;

Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs

@@ -11,7 +11,7 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _filterOnlyUpcoming;

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -11,14 +11,14 @@ namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
-        public bool MaintainAreaComYearTo = false;
+        public bool MaintainAreaComYearFrom = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _showOnlyActiveMembers;
@@ -153,6 +153,17 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _contactViaEmail;
 
+        [ObservableProperty]
+        private string _createdAt = "-";
+        [ObservableProperty]
+        private string _modifiedAt = "-";
+        [ObservableProperty]
+        private string _modifiedAtShort = "-";
+        [ObservableProperty]
+        private string _exportedAt = "-";
+        [ObservableProperty]
+        private string _importedAt = "-";
+
         public ObservableCollection<string?> EmailAddresses { get; private set; } = [null, null, null, null, null, null, null, null, null];
 
         public partial class PhoneNr(int? type = null, string? number = null, string? comment = null) : ObservableObject {

Elwig/ViewModels/PaymentVariantsViewModel.cs

@@ -0,0 +1,95 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Elwig.ViewModels {
+    public partial class PaymentVariantsViewModel : ObservableObject {
+
+        [ObservableProperty]
+        private PaymentVar? _selectedPaymentVariant;
+        [ObservableProperty]
+        private IEnumerable<PaymentVar> _paymentVariants = [];
+
+        public BillingData? BillingData;
+        public bool SeasonLocked;
+        public bool WeightModifierChanged;
+
+        [ObservableProperty]
+        private string _name = "";
+        [ObservableProperty]
+        private string _comment = "";
+        [ObservableProperty]
+        private string _dateString = "";
+        public DateOnly? Date {
+            get => DateOnly.TryParseExact(DateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => DateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _transferDateString = "";
+        public DateOnly? TransferDate {
+            get => DateOnly.TryParseExact(TransferDateString, "dd.MM.yyyy", out var d) ? d : null;
+            set => TransferDateString = $"{value:dd.MM.yyyy}";
+        }
+        [ObservableProperty]
+        private string _weightModifierString = "";
+        public double? WeightModifier {
+            get => double.TryParse(WeightModifierString, out var d) ? d : null;
+            set => WeightModifierString = $"{value}";
+        }
+        [ObservableProperty]
+        private string _data = "";
+        [ObservableProperty]
+        private bool _considerModifiers;
+        [ObservableProperty]
+        private bool _considerPenalties;
+        [ObservableProperty]
+        private bool _considerPenalty;
+        [ObservableProperty]
+        private bool _considerAuto;
+        [ObservableProperty]
+        private bool _considerCustom;
+
+        [ObservableProperty]
+        private bool _isPaymentVariantSelected;
+        [ObservableProperty]
+        private bool _isReadOnly = true;
+        [ObservableProperty]
+        private bool _dataIsReadOnly = true;
+        [ObservableProperty]
+        private bool _isEnabled = false;
+        [ObservableProperty]
+        private bool _saveIsEnabled = false;
+        [ObservableProperty]
+        private bool _deleteIsEnabled = false;
+        [ObservableProperty]
+        private bool _calculateIsEnabled = false;
+        [ObservableProperty]
+        private bool _exportIsEnabled = false;
+        [ObservableProperty]
+        private bool _commitIsEnabled = false;
+        [ObservableProperty]
+        private Visibility _commitVisibility = Visibility.Visible;
+        [ObservableProperty]
+        private bool _revertIsEnabled = false;
+        [ObservableProperty]
+        private Visibility _revertVisibility = Visibility.Hidden;
+        [ObservableProperty]
+        private string _arrow = "\xF0AF";
+        [ObservableProperty]
+        private string _editText = "Bearbeiten";
+
+        [ObservableProperty]
+        private string _statusModifierSum = "-";
+        [ObservableProperty]
+        private string _statusTotalSum = "-";
+        [ObservableProperty]
+        private string _statusVatSum = "-";
+        [ObservableProperty]
+        private string _statusDeductionSum = "-";
+        [ObservableProperty]
+        private string _statusPaymentSum = "-";
+    }
+}

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -203,13 +203,9 @@ namespace Elwig.Windows {
                 $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
                 "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    using (var ctx = new AppDbContext()) {
+                    await AreaComService.DeleteAreaCom(a.FbNr);
-                        ctx.Remove(a);
-                        await ctx.SaveChangesAsync();
-                    }
-                    App.HintContextChange();
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                     if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -227,7 +223,7 @@ namespace Elwig.Windows {
 
         private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
             AreaCommitmentSaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
 
             int fbnr;
             try {
@@ -237,9 +233,8 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 AreaCommitmentSaveButton.IsEnabled = true;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -252,6 +247,7 @@ namespace Elwig.Windows {
             FinishInputFilling();
             await RefreshList();
             RefreshInputs();
+            Mouse.OverrideCursor = null;
             ViewModel.SearchQuery = "";
             ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
         }

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -157,7 +157,7 @@ namespace Elwig.Windows {
             }
             var d = new NewSeasonDialog(s, currencies);
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Add(new Season {
@@ -209,7 +209,7 @@ namespace Elwig.Windows {
                 $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
                 "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Remove(s);

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -318,8 +318,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
-
             try {
                 await Save();
             } catch (Exception exc) {
@@ -327,9 +326,8 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -349,6 +347,7 @@ namespace Elwig.Windows {
             }
 
             App.HintContextChange();
+            Mouse.OverrideCursor = null;
         }
 
         private void FillInputs(ClientParameters p, Season? s) {

Elwig/Windows/ChartWindow.xaml

@@ -101,7 +101,7 @@
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+        <Button x:Name="SaveButton" Content="Speichern &amp; Berechnen" IsEnabled="False"
             HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,10" Grid.Column="0" Grid.Row="2"
             Click="SaveButton_Click"/>
 

Elwig/Windows/ChartWindow.xaml.cs

@@ -651,6 +651,12 @@ namespace Elwig.Windows {
                     ctx.Update(PaymentVar);
                     await ctx.SaveChangesAsync();
                 }
+                try {
+                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
+                    await b.Calculate();
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 LockContext = false;
                 App.HintContextChange();
             } catch (Exception exc) {

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -217,7 +217,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Menge der gesamten Lieferung)<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                         <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                         <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@@ -272,7 +272,7 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -516,7 +516,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="70"/>
@@ -669,7 +669,7 @@
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -310,19 +310,23 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
 
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
                 LesewagenInput.IsEnabled = false;
                 SetDefaultValue(LesewagenInput, false);
-                HandPickedInput.IsThreeState = false;
-                UnsetDefaultValue(HandPickedInput);
             } else {
                 LesewagenInput.IsEnabled = true;
                 UnsetDefaultValue(LesewagenInput);
+            }
+
+            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+                HandPickedInput.IsThreeState = false;
+                UnsetDefaultValue(HandPickedInput);
+            } else {
                 HandPickedInput.IsThreeState = true;
                 SetDefaultValue(HandPickedInput, null);
             }
 
-            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller || App.Client.IsBaden || App.Client.IsWeinland) {
                 GebundenInput.IsEnabled = false;
                 SetDefaultValue(GebundenInput, null);
             } else {
@@ -715,7 +719,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -753,7 +757,7 @@ namespace Elwig.Windows {
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -884,7 +888,7 @@ namespace Elwig.Windows {
             if (res == null)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 var id = res.Value.Item1;
                 var weights = res.Value.Item2;
@@ -955,7 +959,7 @@ namespace Elwig.Windows {
                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await DeliveryService.DeleteDelivery(d.LsNr);
                 } catch (Exception exc) {
@@ -975,7 +979,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
 
             DeliveryPart? p;
             try {
@@ -992,9 +996,8 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -1011,6 +1014,7 @@ namespace Elwig.Windows {
             await RefreshDeliveryParts();
             RefreshInputs();
 
+            Mouse.OverrideCursor = null;
             DepreciateButton.IsEnabled = true;
         }
 
@@ -1380,7 +1384,7 @@ namespace Elwig.Windows {
         }
 
         private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                 HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
             }
             if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
@@ -1390,7 +1394,7 @@ namespace Elwig.Windows {
         }
 
         private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                 GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
             }
             CheckBox_Changed(sender, evt);

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -125,7 +125,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Menge</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                     </TextBlock>
                 </TextBox.ToolTip>
@@ -191,7 +191,7 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -328,7 +328,7 @@
                         </ComboBox.ItemTemplateSelector>
                     </ComboBox>
 
-                    <Label Content="Gewicht:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Menge:" Margin="10,70,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" Text="{Binding WeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Grid.Column="1" Margin="0,70,10,10" Width="61" HorizontalAlignment="Left"
                                       TextChanged="WeightInput_TextChanged" KeyUp="Input_KeyUp"/>
@@ -364,7 +364,7 @@
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="3"/>

Elwig/Windows/DeliveryScheduleAdminWindow.xaml

@@ -127,7 +127,7 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Beschreibung" Binding="{Binding Description}" Width="200"/>
-                    <DataGridTextColumn Header="Max. Gew." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                    <DataGridTextColumn Header="Max. Mg." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -211,7 +211,7 @@
                              Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="TextBox_TextChanged"/>
 
-                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
+                    <Label Content="Max. Menge:" Margin="10,70,0,10"/>
                     <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
                                       TextChanged="MaxWeightInput_TextChanged"/>

Elwig/Windows/MailLogWindow.xaml

@@ -3,7 +3,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:local="clr-namespace:Elwig.Windows"
-        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000">
+        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000"
+        Loaded="Window_Loaded">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="3*"/>

Elwig/Windows/MailLogWindow.xaml.cs

@@ -2,6 +2,7 @@ using Elwig.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -18,8 +19,16 @@ namespace Elwig.Windows {
             FilterInput.TextChanged -= FilterInput_TextChanged;
         }
 
+        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
+            await Load();
+        }
+
         private async void TimeSpanInput_SelectionChanged(object sender, RoutedEventArgs evt) {
             if (!IsLoaded) return;
+            await Load();
+        }
+
+        private async Task Load() {
             DateTime? fromDate = DateTime.Now;
             if (TimeSpanInput.SelectedIndex == 0) {
                 fromDate = fromDate.Value.AddDays(-7);

Elwig/Windows/MailWindow.xaml.cs

@@ -671,7 +671,7 @@ namespace Elwig.Windows {
                     var avnr = details.Item2;
                     try {
                         cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr),
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
                             await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
                             BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                         );

Elwig/Windows/MainWindow.xaml

@@ -207,7 +207,7 @@
                 <Button x:Name="BreakdownButton"
                         Click="BreakdownButton_Click"
                         Margin="195,90,0,10" Width="190" Padding="3,5,5,5"
-                        ToolTip="Aufschlüsselung des Gewichts nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
+                        ToolTip="Aufschlüsselung der Menge nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
                     <Grid>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
                                    TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>
@@ -252,7 +252,7 @@
                     </Grid.RowDefinitions>
 
                     <TextBlock Grid.Row="0" Grid.Column="1" TextAlignment="Right"><Bold>Mitglieder</Bold></TextBlock>
-                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Gewicht</Bold></TextBlock>
+                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Menge</Bold></TextBlock>
                     <TextBlock Grid.Row="0" Grid.Column="3" TextAlignment="Right"><Bold>Fläche</Bold></TextBlock>
 
                     <TextBlock Grid.Row="1" Grid.Column="0">Gesamt:</TextBlock>

Elwig/Windows/MainWindow.xaml.cs

@@ -62,7 +62,7 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 using var client = await Utils.GetSmtpClient();
                 await client!.DisconnectAsync(true);
@@ -133,8 +133,10 @@ namespace Elwig.Windows {
                     Multiselect = true,
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                         await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
+                    });
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -145,7 +147,8 @@ namespace Elwig.Windows {
         private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                     var files = data
@@ -181,13 +184,15 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
         private async void UploadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
                     using var ctx = new AppDbContext();
@@ -212,10 +217,11 @@ namespace Elwig.Windows {
                 } catch (HttpRequestException exc) {
                     MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (TaskCanceledException exc) {
-                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -270,24 +276,31 @@ namespace Elwig.Windows {
             AreaCommitmentsButton.IsEnabled = valid;
             BreakdownMemberVarietyButton.IsEnabled = valid;
 
-            if (valid) {
-                var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
-                var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
-                var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
-                SeasonStatMembersTotal.Text = $"{await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync():N0}";
-                SeasonStatMembersGeb.Text = $"{await areaComs.Select(c => c.Member).Distinct().CountAsync():N0}";
-                SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
-                SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
-                SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
-                SeasonStatArea.Text = $"{await areaComs.SumAsync(c => c.Area):N0} m²";
-            } else {
             SeasonStatMembersTotal.Text = "-";
             SeasonStatMembersGeb.Text = "-";
             SeasonStatWeightTotal.Text = "-";
             SeasonStatWeightGeb.Text = "-";
             SeasonStatWeightUngeb.Text = "-";
             SeasonStatArea.Text = "-";
-            }
+            if (valid) {
+                await Task.Run(async () => {
+                    var membersTotal = await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync();
+                    var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
+                    var membersGeb = await areaComs.Select(c => c.Member).Distinct().CountAsync();
+                    var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
+                    var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
+                    var area = await areaComs.SumAsync(c => c.Area);
+                    await App.MainDispatcher.BeginInvoke(() => {
+                        if (year != SeasonInput.Value) return;
+                        SeasonStatMembersTotal.Text = $"{membersTotal:N0}";
+                        SeasonStatMembersGeb.Text = $"{membersGeb:N0}";
+                        SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
+                        SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
+                        SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
+                        SeasonStatArea.Text = $"{area:N0} m²";
+                    });
+                });
+            };
         }
 
         private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@@ -315,7 +328,8 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var b = new Billing(year);
                     await b.FinishSeason();
@@ -331,6 +345,7 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -346,7 +361,8 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var b = new Billing(year);
                     await b.FinishSeason();
@@ -364,6 +380,7 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -379,7 +396,8 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var b = new Billing(year);
                     await b.FinishSeason();
@@ -393,6 +411,7 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
 
@@ -408,7 +427,8 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                 try {
                     var b = new Billing(year);
                     await b.FinishSeason();
@@ -422,6 +442,7 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
+            });
             Mouse.OverrideCursor = null;
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -653,13 +653,40 @@
                              TextChanged="TextBox_TextChanged"
                              VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
-                    <Label Content="Kontaktart:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
+                    <Label Content="Kontaktart:" Margin="10,10,0,40" Grid.Column="0" VerticalAlignment="Bottom"/>
                     <CheckBox x:Name="ContactPostalInput" Content="Post" IsChecked="{Binding ContactViaPost, Mode=TwoWay}" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="0,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="0,0,0,45" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
                     <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsChecked="{Binding ContactViaEmail, Mode=TwoWay}" IsEnabled="False"
                               Checked="ContactEmailInput_Changed" Unchecked="ContactEmailInput_Changed"
-                              HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="60,0,0,45" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+                    <Label Content="Zuletzt geändert:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
+                    <TextBlock x:Name="LastModified" Text="{Binding ModifiedAtShort}"
+                               Margin="0,10,0,15" Grid.Column="1" TextWrapping="NoWrap" VerticalAlignment="Bottom">
+                        <TextBlock.ToolTip>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="110"/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Erstellt:"/>
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CreatedAt}"/>
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Zuletzt geändert:"/>
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding ModifiedAt}"/>
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Zuletzt von diesem Gerät exportiert:"/>
+                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding ExportedAt}"/>
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="Zuletzt auf dieses Gerät importiert:"/>
+                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding ImportedAt}"/>
+                            </Grid>
+                        </TextBlock.ToolTip>
+                    </TextBlock>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" IsEnabled="{Binding IsMemberSelected}"
                             Click="DeliveryButton_Click"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -389,7 +389,7 @@ namespace Elwig.Windows {
             }
             var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
                 } catch (Exception exc) {
@@ -408,7 +408,7 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             SaveButton.IsEnabled = false;
 
             int mgnr;
@@ -419,9 +419,8 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -436,6 +435,7 @@ namespace Elwig.Windows {
             await RefreshList();
             RefreshInputs();
             ViewModel.SearchQuery = "";
+            Mouse.OverrideCursor = null;
             if (mgnr is int m)
                 FocusMember(m);
         }
@@ -491,8 +491,9 @@ namespace Elwig.Windows {
 
         private async void Menu_Contact_Letterhead_Click(object sender, RoutedEventArgs evt) {
             if (ViewModel.SelectedMember is not Member m) return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
+                await Task.Run(async () => {
                     using var doc = new Letterhead(m);
                     await doc.Generate();
                     if (!App.Config.Debug) {
@@ -500,6 +501,7 @@ namespace Elwig.Windows {
                     } else {
                         doc.Show();
                     }
+                });
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -784,7 +786,7 @@ namespace Elwig.Windows {
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
-                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
+                ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -5,8 +5,12 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="850">
+    <Window.DataContext>
+        <vm:PaymentVariantsViewModel/>
+    </Window.DataContext>
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -55,25 +59,25 @@
 
         <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Variantendaten">
-                <MenuItem x:Name="Menu_SummaryShow" Header="...anzeigen (PDF)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryShow" Header="...anzeigen (PDF)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryShow_Click" InputGestureText="Strg+P">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8FF;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummarySave" Header="...speichern... (PDF)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummarySave" Header="...speichern... (PDF)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummarySave_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA90;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummaryExport" Header="...speichern... (Excel)" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryExport" Header="...speichern... (Excel)" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryExport_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem x:Name="Menu_SummaryPrint" Header="...drucken" IsEnabled="False"
+                <MenuItem x:Name="Menu_SummaryPrint" Header="...drucken" IsEnabled="{Binding IsPaymentVariantSelected}"
                           Click="Menu_SummaryPrint_Click" InputGestureText="Strg+Shift+P">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE749;"/>
@@ -81,7 +85,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Buchungsliste">
-                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="False"
+                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="{Binding ExportIsEnabled}"
                           Click="Menu_ExportSave_Click" InputGestureText="Strg+L">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
@@ -89,7 +93,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Überweisungsdaten">
-                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="False"
+                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="{Binding ExportIsEnabled}"
                           Click="Menu_EbicsSave_Click" InputGestureText="Strg+Ü">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE792;"/>
@@ -99,7 +103,9 @@
         </Menu>
 
         <Grid Grid.Row="1">
-            <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2" SelectionChanged="PaymentVariantList_SelectionChanged">
+            <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2"
+                     SelectionChanged="PaymentVariantList_SelectionChanged"
+                     ItemsSource="{Binding PaymentVariants, Mode=TwoWay}" SelectedItem="{Binding SelectedPaymentVariant, Mode=TwoWay}">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -109,17 +115,20 @@
                     </DataTemplate>
                 </ListBox.ItemTemplate>
             </ListBox>
-            <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+            <Button x:Name="AddButton"
+                    Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"
                     Click="AddButton_Click"/>
-            <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+            <Button x:Name="CopyButton" IsEnabled="{Binding IsPaymentVariantSelected}"
+                    Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"
                     Click="CopyButton_Click"/>
-            <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+            <Button x:Name="DeleteButton" IsEnabled="{Binding DeleteIsEnabled}"
+                    Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Ausgewählte Auszahlungsvariante löschen"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"
                     Click="DeleteButton_Click"/>
 
-            <TextBox x:Name="DataInput" Margin="10,200,35,10"
+            <TextBox x:Name="DataInput" Margin="10,200,35,10" IsReadOnly="{Binding DataIsReadOnly}"
                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
                      AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
                      FontFamily="Cascadia Code Light" FontSize="13"
@@ -133,23 +142,28 @@
             </Grid.ColumnDefinitions>
 
             <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-            <TextBox x:Name="NameInput" Width="200" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+            <TextBox x:Name="NameInput" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Width="200" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
                      TextChanged="NameInput_TextChanged"/>
 
             <Label Content="Beschreibung:" Margin="10,40,0,0" Grid.Column="0"/>
-            <TextBox x:Name="CommentInput" Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,40,10,0"
+            <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,40,10,0"
                      TextChanged="CommentInput_TextChanged"/>
 
             <Label Content="Datum:" Margin="10,70,0,0" Grid.Column="0"/>
-            <TextBox x:Name="DateInput" Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"
+            <TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"
                      TextChanged="DateInput_TextChanged"/>
 
             <Label Content="Überwiesen am:" Margin="10,100,0,0" Grid.Column="0"/>
-            <TextBox x:Name="TransferDateInput" Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
+            <TextBox x:Name="TransferDateInput" Text="{Binding TransferDateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
                      TextChanged="TransferDateInput_TextChanged"/>
 
             <Label Content="Rebelzuschlag:" Margin="10,130,0,0" Grid.Column="0"/>
-            <ctrl:UnitTextBox x:Name="WeightModifierInput" Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
+            <ctrl:UnitTextBox x:Name="WeightModifierInput" Text="{Binding WeightModifierString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
+                              Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
                               HorizontalAlignment="Left" VerticalAlignment="Top"
                               TextChanged="WeightModifierInput_TextChanged" LostFocus="WeightModifierInput_LostFocus"/>
 
@@ -160,19 +174,24 @@
             </TextBlock>
 
             <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="1"/>
-            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
+            <CheckBox x:Name="ConsiderModifiersInput" IsChecked="{Binding ConsiderModifiers, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Zu-/Abschläge bei Lieferungen (inkl. Rebelzuschl.)"
                       Margin="110,95,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
-            <CheckBox x:Name="ConsiderPenaltiesInput" Content="Pönalen bei Unterlieferungen (FB)"
+            <CheckBox x:Name="ConsiderPenaltiesInput" IsChecked="{Binding ConsiderPenalties, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Pönalen bei Unterlieferungen (FB)"
                       Margin="110,115,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltiesInput_Changed" Unchecked="ConsiderPenaltiesInput_Changed"/>
-            <CheckBox x:Name="ConsiderPenaltyInput" Content="Strafen bei Unterlieferungen (GA)"
+            <CheckBox x:Name="ConsiderPenaltyInput" IsChecked="{Binding ConsiderPenalty, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Strafen bei Unterlieferungen (GA)"
                       Margin="110,135,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
-            <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
+            <CheckBox x:Name="ConsiderAutoInput" IsChecked="{Binding ConsiderAuto, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
-            <CheckBox x:Name="ConsiderCustomInput" Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
+            <CheckBox x:Name="ConsiderCustomInput" IsChecked="{Binding ConsiderCustom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
+                      Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
                       Margin="110,175,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderCustomInput_Changed" Unchecked="ConsiderCustomInput_Changed"/>
             <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,195,10,10"/>
@@ -206,7 +225,8 @@
                     </Style>
                 </Grid.Resources>
 
-                <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
+                <Button x:Name="EditButton" IsEnabled="{Binding IsPaymentVariantSelected}"
+                        Content="{Binding EditText}" Grid.Column="0" Grid.Row="2"
                         Click="EditButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
                 <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
@@ -219,12 +239,13 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
+                <Button x:Name="CalculateButton" IsEnabled="{Binding CalculateIsEnabled}"
+                        Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
-                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
+                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3"/>
                 <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
                         Click="PaymentAdjustmentButton_Click"/>
-                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" x:Name="Arrow4" RenderTransformOrigin="0.5,0.5" >
+                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" RenderTransformOrigin="0.5,0.5" >
                     <Label.RenderTransform>
                         <TransformGroup>
                             <RotateTransform Angle="-45"/>
@@ -232,16 +253,19 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="CommitButton" IsEnabled="{Binding CommitIsEnabled}" Visibility="{Binding CommitVisibility}"
+                        Content="Festsetzen" Grid.Column="4" Grid.Row="2"
                         Click="CommitButton_Click"/>
-                <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="RevertButton" IsEnabled="{Binding RevertIsEnabled}" Visibility="{Binding RevertVisibility}"
+                        Content="Freigeben" Grid.Column="4" Grid.Row="2"
                         Click="RevertButton_Click"/>
-                <Button x:Name="SaveButton" Content="Speichern" Grid.Column="4" Grid.Row="0"
+                <Button x:Name="SaveButton" IsEnabled="{Binding SaveIsEnabled}"
+                        Content="Speichern" Grid.Column="4" Grid.Row="0"
                         Click="SaveButton_Click"/>
             </Grid>
 
-            <Button x:Name="MailButton"
+            <Button x:Name="MailButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30" IsEnabled="False"
+                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30"
                     Click="MailButton_Click"
                     VerticalAlignment="Bottom" HorizontalAlignment="Right" HorizontalContentAlignment="Stretch" Grid.Column="1">
                 <Grid>
@@ -273,35 +297,35 @@
             <StatusBarItem Grid.Column="0" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Zu-/Abschl.:"/>
-                    <TextBlock x:Name="ModifierSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusModifierSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Gesamt:"/>
-                    <TextBlock x:Name="TotalSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusTotalSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="MwSt.:"/>
-                    <TextBlock x:Name="VatSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusVatSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Abzüge:"/>
-                    <TextBlock x:Name="DeductionSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusDeductionSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="7"/>
             <StatusBarItem Grid.Column="8" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Auszahl.:"/>
-                    <TextBlock x:Name="PaymentSum" Text="-" TextAlignment="Right"/>
+                    <TextBlock Text="{Binding StatusPaymentSum}" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
         </StatusBar>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -1,29 +1,27 @@
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using Elwig.Services;
+using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
 using System;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Elwig.Helpers.Billing;
-using Elwig.Helpers.Export;
-using Microsoft.Win32;
-using System.Text.Json;
-using Elwig.Documents;
 
 namespace Elwig.Windows {
     public partial class PaymentVariantsWindow : ContextWindow {
 
-        public readonly int Year;
+        public PaymentVariantsViewModel ViewModel => (PaymentVariantsViewModel)DataContext;
-        public readonly bool SeasonLocked;
-        private bool DataValid, DataChanged, NameChanged, CommentChanged, DateValid, DateChanged, TransferDateValid, TransferDateChanged;
-        private BillingData? BillingData;
-        private bool WeightModifierChanged = false;
 
-        private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
+        public readonly int Year;
+        private bool DataValid, DataChanged, NameChanged, CommentChanged, DateValid, DateChanged, TransferDateValid, TransferDateChanged;
 
         private readonly RoutedCommand CtrlL = new("CtrlL", typeof(MemberAdminWindow), [new KeyGesture(Key.L, ModifierKeys.Control)]);
         private readonly RoutedCommand CtrlP = new("CtrlP", typeof(MemberAdminWindow), [new KeyGesture(Key.P, ModifierKeys.Control)]);
@@ -38,7 +36,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_SummaryPrint_Click));
             Year = year;
             using (var ctx = new AppDbContext()) {
-                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+                ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
             }
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
@@ -57,192 +55,40 @@ namespace Elwig.Windows {
                 .OrderBy(v => v.AvNr)
                 .Include(v => v.Season.Currency)
                 .ToListAsync());
-            await Update();
+            Update();
         }
 
-        private async Task Update() {
+        private void Update() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
-                var locked = !v.TestVariant;
+                ViewModel.FillInputs(v);
-                DeleteButton.IsEnabled = !locked;
-                CalculateButton.IsEnabled = !locked;
-                CommitButton.IsEnabled = !locked && !SeasonLocked;
-                CommitButton.Visibility = !locked ? Visibility.Visible : Visibility.Hidden;
-                RevertButton.IsEnabled = locked && !SeasonLocked;
-                RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
-                Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
-                Arrow4.Content = locked ? "\xF0B0" : "\xF0AF";
-                CopyButton.IsEnabled = true;
-                EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
-                EditButton.IsEnabled = true;
-                SaveButton.IsEnabled = !locked;
-                MailButton.IsEnabled = true;
-                Menu_ExportSave.IsEnabled = locked;
-                Menu_EbicsSave.IsEnabled = locked;
-                Menu_SummaryExport.IsEnabled = true;
-                Menu_SummaryShow.IsEnabled = true;
-                Menu_SummarySave.IsEnabled = true;
-                Menu_SummaryPrint.IsEnabled = true;
-
-                NameInput.Text = v.Name;
-                NameInput.IsReadOnly = false;
-                CommentInput.Text = v.Comment;
-                CommentInput.IsReadOnly = false;
-                DateInput.Text = $"{v.Date:dd.MM.yyyy}";
-                DateInput.IsReadOnly = false;
-                TransferDateInput.Text = $"{v.TransferDate:dd.MM.yyyy}";
-                TransferDateInput.IsReadOnly = false;
-                try {
-                    BillingData = BillingData.FromJson(v.Data);
-                    ConsiderModifiersInput.IsChecked = BillingData.ConsiderDelieryModifiers;
-                    ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
-                    ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
-                    ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
-                    ConsiderCustomInput.IsChecked = BillingData.ConsiderCustomModifiers;
-                    if (BillingData.NetWeightModifier != 0) {
-                        WeightModifierInput.Text = $"{Math.Round(BillingData.NetWeightModifier * 100.0, 8)}";
-                    } else if (BillingData.GrossWeightModifier != 0) {
-                        WeightModifierInput.Text = $"{Math.Round(BillingData.GrossWeightModifier * 100.0, 8)}";
             } else {
-                        WeightModifierInput.Text = "";
+                ViewModel.ClearInputs();
             }
-                    DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
+            UpdateButtons();
-                } catch {
-                    BillingData = null;
-                    ConsiderModifiersInput.IsChecked = false;
-                    ConsiderPenaltiesInput.IsChecked = false;
-                    ConsiderPenaltyInput.IsChecked = false;
-                    ConsiderAutoInput.IsChecked = false;
-                    ConsiderCustomInput.IsChecked = false;
-                    WeightModifierInput.Text = "";
-                    DataInput.Text = v.Data;
-                }
-                WeightModifierInput.IsReadOnly = false;
-                ConsiderModifiersInput.IsEnabled = !locked;
-                ConsiderPenaltiesInput.IsEnabled = !locked;
-                ConsiderPenaltyInput.IsEnabled = !locked;
-                ConsiderAutoInput.IsEnabled = !locked;
-                ConsiderCustomInput.IsEnabled = !locked;
-                DataInput.IsReadOnly = locked;
-            } else {
-                EditButton.Content = "Bearbeiten";
-                EditButton.IsEnabled = false;
-                SaveButton.IsEnabled = false;
-                CopyButton.IsEnabled = false;
-                CalculateButton.IsEnabled = false;
-                CommitButton.IsEnabled = false;
-                CommitButton.Visibility = Visibility.Visible;
-                RevertButton.IsEnabled = false;
-                RevertButton.Visibility = Visibility.Hidden;
-                Arrow3.Content = "\xF0AF";
-                Arrow4.Content = "\xF0AF";
-                DeleteButton.IsEnabled = false;
-                MailButton.IsEnabled = false;
-                Menu_ExportSave.IsEnabled = false;
-                Menu_EbicsSave.IsEnabled = false;
-                Menu_SummaryExport.IsEnabled = false;
-                Menu_SummaryShow.IsEnabled = false;
-                Menu_SummarySave.IsEnabled = false;
-                Menu_SummaryPrint.IsEnabled = false;
-
-                BillingData = null;
-                NameInput.Text = "";
-                NameInput.IsReadOnly = true;
-                CommentInput.Text = "";
-                CommentInput.IsReadOnly = true;
-                DateInput.Text = "";
-                DateInput.IsReadOnly = true;
-                TransferDateInput.Text = "";
-                TransferDateInput.IsReadOnly = true;
-                WeightModifierInput.Text = "";
-                WeightModifierInput.IsReadOnly = true;
-                ConsiderModifiersInput.IsChecked = false;
-                ConsiderModifiersInput.IsEnabled = false;
-                ConsiderPenaltiesInput.IsChecked = false;
-                ConsiderPenaltiesInput.IsEnabled = false;
-                ConsiderPenaltyInput.IsChecked = false;
-                ConsiderPenaltyInput.IsEnabled = false;
-                ConsiderAutoInput.IsChecked = false;
-                ConsiderAutoInput.IsEnabled = false;
-                ConsiderCustomInput.IsChecked = false;
-                ConsiderCustomInput.IsEnabled = false;
-                DataInput.Text = "";
-                DataInput.IsReadOnly = true;
-            }
-            await UpdateSums();
-            UpdateSaveButton();
         }
 
-        private void UpdateSaveButton() {
+        private void UpdateButtons() {
-            SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
+            ViewModel.SaveIsEnabled = PaymentVariantList.SelectedItem != null &&
                 ((DataChanged && DataValid) || NameChanged || CommentChanged ||
                 (DateChanged && DateValid) ||
                 (TransferDateChanged && TransferDateValid) ||
-                (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
+                (ViewModel.ConsiderModifiers != ViewModel.BillingData?.ConsiderDelieryModifiers) ||
-                (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
+                (ViewModel.ConsiderPenalties != ViewModel.BillingData?.ConsiderContractPenalties) ||
-                (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
+                (ViewModel.ConsiderPenalty != ViewModel.BillingData?.ConsiderTotalPenalty) ||
-                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                (ViewModel.ConsiderAuto != ViewModel.BillingData?.ConsiderAutoBusinessShares) ||
-                (ConsiderCustomInput.IsChecked != BillingData?.ConsiderCustomModifiers) ||
+                (ViewModel.ConsiderCustom != ViewModel.BillingData?.ConsiderCustomModifiers) ||
-                WeightModifierChanged);
+                ViewModel.WeightModifierChanged);
-            CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
+            ViewModel.CalculateIsEnabled = !ViewModel.SaveIsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
-            CommitButton.IsEnabled = CalculateButton.IsEnabled;
+            ViewModel.CommitIsEnabled = ViewModel.CalculateIsEnabled;
         }
 
-        private async Task UpdateSums() {
+        private void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is PaymentVar v) {
+            Update();
-                using var ctx = new AppDbContext();
-                var sym = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
-                var modSum = await ctx.PaymentDeliveryParts
-                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
-                    .SumAsync(p => p.AmountValue - p.NetAmountValue);
-                ModifierSum.Text = $"{v.Season.DecFromDb(modSum):N2} {sym}";
-                var totalSum = await ctx.MemberPayments
-                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
-                    .SumAsync(p => p.AmountValue);
-                TotalSum.Text = $"{v.Season.DecFromDb(totalSum):N2} {sym}";
-                var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
-                if (!credits.Any()) {
-                    VatSum.Text = $"- {sym}";
-                    DeductionSum.Text = $"- {sym}";
-                    PaymentSum.Text = $"- {sym}";
-                } else {
-                    // all values in the credit table are stored with precision 2!
-                    TotalSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.NetAmountValue), 2):N2} {sym}";
-                    VatSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.VatAmountValue), 2):N2} {sym}";
-                    DeductionSum.Text = $"{-Utils.DecFromDb(await credits.SumAsync(c => c.ModifiersValue ?? 0), 2):N2} {sym}";
-                    PaymentSum.Text = $"{Utils.DecFromDb(await credits.SumAsync(c => c.AmountValue), 2):N2} {sym}";
-                }
-            } else {
-                ModifierSum.Text = "-";
-                TotalSum.Text = "-";
-                VatSum.Text = "-";
-                DeductionSum.Text = "-";
-                PaymentSum.Text = "-";
-            }
-        }
-
-        private async void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            await Update();
         }
 
         private async void AddButton_Click(object sender, RoutedEventArgs evt) {
             try {
-                PaymentVar? v;
+                var v = await PaymentVariantService.CreatePaymentVariant(Year);
-                using (var ctx = new AppDbContext()) {
-                    v = new PaymentVar {
-                        Year = Year,
-                        AvNr = await ctx.NextAvNr(Year),
-                        Name = "Neue Auszahlungsvariante",
-                        TestVariant = true,
-                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                        Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
-                    };
-
-                    ctx.Add(v);
-                    await ctx.SaveChangesAsync();
-                }
-
-                App.HintContextChange();
-
                 ControlUtils.SelectItem(PaymentVariantList, v);
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -254,23 +100,7 @@ namespace Elwig.Windows {
         private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
             try {
-                PaymentVar? n;
+                PaymentVar n = await orig.Duplicate();
-                using (var ctx = new AppDbContext()) {
-                    n = new PaymentVar {
-                        Year = orig.Year,
-                        AvNr = await ctx.NextAvNr(Year),
-                        Name = $"{orig.Name} (Kopie)",
-                        TestVariant = true,
-                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                        Data = orig.Data,
-                    };
-
-                    ctx.Add(n);
-                    await ctx.SaveChangesAsync();
-                }
-
-                App.HintContextChange();
-
                 ControlUtils.SelectItem(PaymentVariantList, n);
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -282,11 +112,7 @@ namespace Elwig.Windows {
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
             try {
-                using (var ctx = new AppDbContext()) {
+                await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);
-                    ctx.Remove(v);
-                    await ctx.SaveChangesAsync();
-                }
-                App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -297,17 +123,16 @@ namespace Elwig.Windows {
         private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            CalculateButton.IsEnabled = false;
+            ViewModel.CalculateIsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                var b = new BillingVariant(v.Year, v.AvNr);
+                await PaymentVariantService.Calculate(v.Year, v.AvNr);
-                await b.Calculate();
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             App.HintContextChange();
             Mouse.OverrideCursor = null;
-            CalculateButton.IsEnabled = true;
+            ViewModel.CalculateIsEnabled = true;
         }
 
         private void EditButton_Click(object sender, RoutedEventArgs evt) {
@@ -359,38 +184,25 @@ namespace Elwig.Windows {
         private async void Menu_SummaryShow_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.Show);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.Show);
         }
 
         private async void Menu_SummarySave_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.SavePdf);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.SavePdf);
         }
 
         private async void Menu_SummaryPrint_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await GenerateSummary(v, ExportMode.Print);
+            await PaymentVariantService.GenerateSummary(v, ExportMode.Print);
-        }
-
-        private static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                using var ctx = new AppDbContext();
-                var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                using var doc = new PaymentVariantSummary((await ctx.PaymentVariants.FindAsync(v.Year, v.AvNr))!, data);
-                await Utils.ExportDocument(doc, mode);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            Mouse.OverrideCursor = null;
         }
 
         private async void CommitButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            CommitButton.IsEnabled = false;
+            ViewModel.CommitIsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 var b = new BillingVariant(v.Year, v.AvNr);
@@ -399,7 +211,7 @@ namespace Elwig.Windows {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
-            RevertButton.IsEnabled = true;
+            ViewModel.RevertIsEnabled = true;
             App.HintContextChange();
         }
 
@@ -412,13 +224,13 @@ namespace Elwig.Windows {
                 "Traubengutschriften löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (res != MessageBoxResult.Yes)
                 return;
-            RevertButton.IsEnabled = false;
+            ViewModel.RevertIsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             var b = new BillingVariant(v.Year, v.AvNr);
             await b.Revert();
             App.HintContextChange();
             Mouse.OverrideCursor = null;
-            CommitButton.IsEnabled = true;
+            ViewModel.CommitIsEnabled = true;
         }
 
         private async void Menu_EbicsSave_Click(object sender, RoutedEventArgs evt) {
@@ -428,107 +240,35 @@ namespace Elwig.Windows {
                 MessageBox.Show("Überweisungsdatum muss gesetzt sein!", "Exportieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
-
+            await PaymentVariantService.GenerateEbics(v.Year, v.AvNr);
-            using var ctx = new AppDbContext();
-            v = (await ctx.PaymentVariants.FindAsync(v.Year, v.AvNr))!;
-
-            var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
-            if (withoutIban > 0) {
-                var r = MessageBox.Show($"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert.",
-                    "Mitglieder ohne IBAN", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                if (r != MessageBoxResult.OK) return;
-            }
-            var withNegAmount = v.Credits.Count(c => c.Amount <= 0);
-            if (withNegAmount > 0) {
-                var r = MessageBox.Show($"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert.",
-                    "Traubengutschriften mit negativem Betrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.OK);
-                if (r != MessageBoxResult.OK) return;
-            }
-
-            var d = new SaveFileDialog() {
-                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
-                DefaultExt = Ebics.FileExtension,
-                Filter = "EBICS-Datei (*.xml)|*.xml",
-                Title = $"Überweisungsdaten speichern unter - Elwig",
-            };
-            if (d.ShowDialog() == true) {
-                Menu_EbicsSave.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                try {
-                    using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
-                    await e.ExportAsync(Transaction.FromPaymentVariant(v));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                Mouse.OverrideCursor = null;
-                Menu_EbicsSave.IsEnabled = true;
-            }
         }
 
         private async void Menu_ExportSave_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            }
+            await PaymentVariantService.GenerateAccountingList(v.Year, v.AvNr, v.Name);
-            var d = new SaveFileDialog() {
-                FileName = $"{App.Client.NameToken}-Buchungsliste-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.ods",
-                DefaultExt = "ods",
-                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                Title = $"Buchungsliste speichern unter - Elwig"
-            };
-            if (d.ShowDialog() == true) {
-                Menu_ExportSave.IsEnabled = false;
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                try {
-                    using var ctx = new AppDbContext();
-                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, v.Year, v.AvNr);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                Mouse.OverrideCursor = null;
-                Menu_ExportSave.IsEnabled = true;
-            }
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || BillingData == null) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null) return;
             try {
-                v.Name = NameInput.Text;
+                await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
-                v.Comment = (CommentInput.Text != "") ? CommentInput.Text : null;
-                v.DateString = string.Join("-", DateInput.Text.Split(".").Reverse());
-                v.TransferDateString = (TransferDateInput.Text != "") ? string.Join("-", TransferDateInput.Text.Split(".").Reverse()) : null;
-                var d = App.Config.Debug ? BillingData.FromJson(DataInput.Text) : BillingData;
-                d.ConsiderDelieryModifiers = ConsiderModifiersInput.IsChecked ?? false;
-                d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
-                d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
-                d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
-                d.ConsiderCustomModifiers = ConsiderCustomInput.IsChecked ?? false;
-                var modVal = WeightModifierInput.Text.Length > 0 ? double.Parse(WeightModifierInput.Text) : 0;
-                d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
-                d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
-                WeightModifierChanged = false;
-                v.Data = JsonSerializer.Serialize(d.Data);
-
-                using (var ctx = new AppDbContext()) {
-                    ctx.Update(v);
-                    await ctx.SaveChangesAsync();
-                }
-
-                App.HintContextChange();
-                CommentInput_TextChanged(null, null);
-                ConsiderModifiersInput_Changed(null, null);
-                ConsiderPenaltiesInput_Changed(null, null);
-                ConsiderPenaltyInput_Changed(null, null);
-                ConsiderAutoInput_Changed(null, null);
-                ConsiderCustomInput_Changed(null, null);
-                WeightModifierInput_TextChanged(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            await HintContextChange();
+            CommentInput_TextChanged(null, null);
+            DateInput_TextChanged(null, null);
+            TransferDateInput_TextChanged(null, null);
+            ConsiderModifiersInput_Changed(null, null);
+            ConsiderPenaltiesInput_Changed(null, null);
+            ConsiderPenaltyInput_Changed(null, null);
+            ConsiderAutoInput_Changed(null, null);
+            ConsiderCustomInput_Changed(null, null);
+            WeightModifierInput_TextChanged(null, null);
         }
 
         private void ModifierButton_Click(object sender, RoutedEventArgs evt) {
@@ -547,7 +287,7 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(NameInput);
                 NameChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void CommentInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
@@ -562,10 +302,10 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(CommentInput);
                 CommentChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
-        private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void DateInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(DateInput);
                 return;
@@ -583,10 +323,10 @@ namespace Elwig.Windows {
                 DateValid = true;
                 DateChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
-        private void TransferDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void TransferDateInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(TransferDateInput);
                 return;
@@ -604,7 +344,7 @@ namespace Elwig.Windows {
                 TransferDateValid = true;
                 TransferDateChanged = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void DataInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -630,89 +370,89 @@ namespace Elwig.Windows {
                 ControlUtils.SetInputInvalid(DataInput);
                 DataValid = false;
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderModifiersInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
                 return;
             }
-            if (BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderModifiersInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderPenaltiesInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
                 return;
             }
-            if (BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltiesInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderPenaltyInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
                 return;
             }
-            if (BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltyInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderAutoInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
                 return;
             }
-            if (BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderAutoInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void ConsiderCustomInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
                 return;
             }
-            if (BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
+            if (ViewModel.BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderCustomInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             var res = Validator.CheckDecimal(WeightModifierInput, false, 3, 2, true);
-            if (BillingData == null) {
+            if (ViewModel.BillingData == null) {
                 ControlUtils.ClearInputState(WeightModifierInput);
                 return;
             }
             var val = WeightModifierInput.Text.Length > 0 && res.IsValid ? double.Parse(WeightModifierInput.Text) : 0;
-            WeightModifierChanged = (val != Math.Round(BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(BillingData.GrossWeightModifier * 100.0, 8)) ||
+            ViewModel.WeightModifierChanged = (val != Math.Round(ViewModel.BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(ViewModel.BillingData.GrossWeightModifier * 100.0, 8)) ||
-                (val == 0 && (BillingData.NetWeightModifier != 0 || BillingData.GrossWeightModifier != 0));
+                (val == 0 && (ViewModel.BillingData.NetWeightModifier != 0 || ViewModel.BillingData.GrossWeightModifier != 0));
-            if (WeightModifierChanged) {
+            if (ViewModel.WeightModifierChanged) {
                 ControlUtils.SetInputChanged(WeightModifierInput);
             } else {
                 ControlUtils.ClearInputState(WeightModifierInput);
             }
-            UpdateSaveButton();
+            UpdateButtons();
         }
 
         private void WeightModifierInput_LostFocus(object sender, RoutedEventArgs evt) {

Elwig/fetch-resources.bat

@@ -1,5 +0,0 @@
-::mkdir "C:\Program Files\Elwig"
-mkdir "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
-copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
-::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"

Installer/Folders.wxs

@@ -1,15 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
     <!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-		<Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+        <Directory Id="InstallFolderResources" Name="resources">
+          <Directory Id="InstallFolderDocuments" Name="Documents" />
+        </Directory>
+      </Directory>
     </StandardDirectory>
 
     <!-- C:\ProgramData\Elwig -->
     <StandardDirectory Id="CommonAppDataFolder">
-		<Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)">
+      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
-			<Directory Id="ConfigFolderResources" Name="resources" />
-		</Directory>
     </StandardDirectory>
 
     <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
@@ -17,7 +20,7 @@
       <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
     </StandardDirectory>
 
-	<!-- C:\Users{USERNAME}\Desktop -->
+    <!-- C:\Users\{USERNAME}\Desktop -->
     <StandardDirectory Id="DesktopFolder" />
   </Fragment>
 </Wix>

Installer/HeatComponents.wxs

@@ -6,7 +6,7 @@
         <Exclude Files="..\Elwig\bin\Publish\**.exe" />
         <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
       </Files>
-		  <Files Directory="ConfigFolderResources" Include="..\Elwig\Documents\**">
+      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
         <Exclude Files="..\Elwig\Documents\**.cs" />
       </Files>
     </ComponentGroup>

Installer/Installer.wixproj

@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6">
   <PropertyGroup>
     <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
     <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>

README.md

@@ -2,3 +2,6 @@
 Elwig
 =====
 
+**El**ektronische **Wi**nzer**g**enossenschaftsverwaltung (Electronic Management for Vintners' Cooperatives).
+
+Further information may be found on [the website](https://elwig.at).

Setup/Bundle.wxs

@@ -1,4 +1,6 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7"
           IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico">
     <BootstrapperApplication>

Setup/Setup.wixproj

@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/5.0.0">
+<Project Sdk="WixToolset.Sdk/6">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
     <OutputName>Elwig</OutputName>
@@ -13,7 +13,7 @@
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.2" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.0" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.0" />
   </ItemGroup>
 </Project>

Tests/DocumentTests/PaymentVariantSummaryTest.cs

@@ -1,28 +0,0 @@
-using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Dtos;
-
-namespace Tests.DocumentTests {
-    [TestFixture]
-    public class PaymentVariantSummaryTest {
-
-        [Test]
-        public async Task Test_01_PaymentVariant2020() {
-            using var ctx = new AppDbContext();
-            var v = (await ctx.PaymentVariants.FindAsync(2020, 1))!;
-            var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-            using var doc = new PaymentVariantSummary(v, data);
-            var text = await Utils.GeneratePdfText(doc);
-            Assert.Multiple(() => {
-                Assert.That(text, Contains.Substring("Auszahlungsvariante"));
-                Assert.That(text, Contains.Substring(v.Name));
-                Assert.That(text, Contains.Substring("""
-                    Gradation ungebunden gebunden Gesamt
-                    [°Oe] [kg] [€/kg] [kg] [€/kg] [€]
-                    Grüner Veltliner 3 219 0 1 609,50
-                    Qualitätswein 73 3 219 0,5000 - - 1 609,50
-                    """));
-            });
-        }
-    }
-}

Tests/E2ETests/DeliveryAdminWindowReceiptTest.cs

@@ -1,6 +1,6 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Appium.Windows;
-using Tests.WeighingTests;
+using Tests.UnitTests.WeighingTests;
 
 namespace Tests.E2ETests {
     [TestFixture, Order(2)]

Tests/Tests.csproj

@@ -19,16 +19,16 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
     <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.3">
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Tests/UnitTests/DocumentTests/CreditNoteTest.cs

@@ -3,7 +3,7 @@ using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class CreditNoteTest {
 
@@ -12,7 +12,7 @@ namespace Tests.DocumentTests {
             using var ctx = new AppDbContext();
             var m = await ctx.Members.FindAsync(101);
             var p = await ctx.MemberPayments.Where(p => p.Year == 2020 && p.AvNr == 1).SingleAsync();
-            var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 2020, 1);
+            var data = await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, 2020, 1);
             using var doc = new CreditNote(ctx, p, data[m!.MgNr], false, false, false, false,
                 ctx.GetMemberUnderDelivery(2020, m!.MgNr).GetAwaiter().GetResult());
             var text = await Utils.GeneratePdfText(doc);

Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryAncmtListTest {
 

Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryConfirmationTest {
 

Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryDepreciationListTest {
 

Tests/UnitTests/DocumentTests/DeliveryJournalTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryJournalTest {
 

Tests/UnitTests/DocumentTests/DeliveryNoteTest.cs

@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class DeliveryNoteTest {
 

Tests/UnitTests/DocumentTests/LetterheadTest.cs

@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class LetterheadTest {
 

Tests/UnitTests/DocumentTests/MemberDataSheetTest.cs

@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class MemberDataSheetTest {
 

Tests/UnitTests/DocumentTests/MemberListTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class MemberListTest {
 

Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs

@@ -0,0 +1,29 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+
+namespace Tests.UnitTests.DocumentTests {
+    [TestFixture]
+    public class PaymentVariantSummaryTest {
+
+        [Test]
+        public async Task Test_01_PaymentVariant2020() {
+            using var ctx = new AppDbContext();
+            var v = (await ctx.PaymentVariants.FindAsync(2020, 1))!;
+            var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+            using var doc = new PaymentVariantSummary(v, data);
+            var text = await Utils.GeneratePdfText(doc, true);
+            var table = Utils.ExtractTable(text);
+            Assert.Multiple(() => {
+                Assert.That(text, Contains.Substring("Auszahlungsvariante"));
+                Assert.That(text, Contains.Substring(v.Name));
+                Assert.That(table.Skip(17).ToArray(), Is.EqualTo(new string[][] {
+                     [                   "Gradation",   "ungebunden",   "attributlos gebunden",    "gebunden",     "Gesamt" ],
+                     [                     "[°Oe]",   "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[€]"  ],
+                     ["Grüner Veltliner",            "3 219",                 "0",                 "0",           "1 609,50"],
+                     ["Qualitätswein",      "73",    "3 219", "0,5000",       "-",      "-",       "-",      "-", "1 609,50"]
+                }));
+            });
+        }
+    }
+}

Tests/UnitTests/DocumentTests/Setup.cs

@@ -3,7 +3,7 @@ using System.Reflection;
 using Microsoft.Data.Sqlite;
 using Elwig.Helpers.Printing;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [SetUpFixture]
     public class Setup {
 

Tests/UnitTests/DocumentTests/Utils.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using NReco.PdfRenderer;
 using System.Text.RegularExpressions;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     public static class Utils {
 
         private static readonly string FileName = Path.Combine(Path.GetTempPath(), "test_document.pdf");

Tests/UnitTests/DocumentTests/WineQualityStatisticsTest.cs

@@ -2,7 +2,7 @@ using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 
-namespace Tests.DocumentTests {
+namespace Tests.UnitTests.DocumentTests {
     [TestFixture]
     public class WineQualityStatisticsTest {
 

Tests/UnitTests/HelperTests/BillingDataTest.cs

@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using System.Text.Json;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class BillingDataTest {
 

Tests/UnitTests/HelperTests/BillingTest.cs

@@ -3,7 +3,7 @@ using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
 using System.Reflection;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class BillingTest {
 

Tests/UnitTests/HelperTests/EbicsTest.cs

@@ -5,7 +5,7 @@ using Elwig.Models.Entities;
 using System.Reflection;
 using System.Xml;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     // see https://www.iso20022.org/iso-20022-message-definitions
     // and https://www.iso20022.org/catalogue-messages/iso-20022-messages-archive?search=pain
     [TestFixture]

Tests/UnitTests/HelperTests/UtilsTest.cs

@@ -1,6 +1,6 @@
 using Elwig.Helpers;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     public class UtilsTest {
 

Tests/UnitTests/HelperTests/ValidatorTest.cs

@@ -1,7 +1,7 @@
 using Elwig.Helpers;
 using System.Windows.Controls;
 
-namespace Tests.HelperTests {
+namespace Tests.UnitTests.HelperTests {
     [TestFixture]
     [Apartment(ApartmentState.STA)]
     public class ValidatorTest {

Tests/UnitTests/ServiceTests/DeliveryServiceTest.cs

@@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [TestFixture]
     public class DeliveryServiceTest {
 

Tests/UnitTests/ServiceTests/MemberServiceTest.cs

@@ -4,7 +4,7 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [TestFixture]
     public class MemberServiceTest {
 

Tests/UnitTests/ServiceTests/Setup.cs

@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using System.Reflection;
 using Microsoft.Data.Sqlite;
 
-namespace Tests.ServiceTests {
+namespace Tests.UnitTests.ServiceTests {
     [SetUpFixture]
     public class Setup {