Bump version to 1.0.0.0

.gitea/workflows/deploy.yaml

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

CHANGELOG.md

@@ -2,247 +2,22 @@
 Changelog
 =========
 
-[v1.0.1.5][v1.0.1.5] (2025-10-29) {#v1.0.1.5}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.1.5-bugfixes}
-
-* Im Rundschreiben-Fenster (`MailWindow`) kam es zu einem Absturz, wenn man das Fenster über den "Anlieferungsbestätigung"-Knopf im Leseabschluss-Abschnitt geöffnet hat. (af98c32026)
-
-[v1.0.1.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.5
-
-
-
-
-[v1.0.1.4][v1.0.1.4] (2025-10-28) {#v1.0.1.4}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.1.4-bugfixes}
-
-* Im Rundschreiben-Fenster (`MailWindow`) kam es zu einem Absturz, wenn man die Zustelloptionen "Post zusenden an Mitglieder, die keine E-Mail erhalten würden" und "E-Mail zusenden an niemanden" kombiniert hat. (2de8af878b)
-
-### Sonstiges {#v1.0.1.4-misc}
-
-* Im Auszahlungsvariante-Fenster (`ChartWindow`) gibt es keine Fehlermeldung mehr wenn nicht für alle Sorten ein Preis definiert ist, nur noch eine Warnung. (428cd6ddc2)
-
-[v1.0.1.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.4
-
-
-
-
-[v1.0.1.3][v1.0.1.3] (2025-10-13) {#v1.0.1.3}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.1.3-features}
-
-* In der Liste des Lieferungen-Fenster (`DeliveryAdminWindow`) werden
-	* statt ausschließlich der Sorte auch Attribut und Bewirtschaftungsart angezeigt. (a0d4f19f30)
-	* Kommentare der Lieferungen (und Teillieferungen) angezeigt. (548aeb2ce9)
-
-### Sonstiges {#v1.0.1.3-misc}
-
-* Verzögerung der Überprüfung auf automatische Updates auf einige Sekunden verlängert. (67ba342c28)
-* Verbesserung der Ladezeiten im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (7edd888aa2)
-
-[v1.0.1.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.3
-
-
-
-
-[v1.0.1.2][v1.0.1.2] (2025-09-25) {#v1.0.1.2}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.1.2-bugfixes}
-
-* Beim automatischen Importieren/Synchronisieren wird bei einem Fehlerfall der Benutzer verständigt, aber der Vorgang nicht abgebrochen. (9d02f18bac)
-
-### Sonstiges {#v1.0.1.2-misc}
-
-* Beim Sichern der Datenbank werden Meta-Informationen in der ZIP-Datei gespeichert. (c8a95422af)
-
-[v1.0.1.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.2
-
-
-
-
-[v1.0.1.1][v1.0.1.1] (2025-09-21) {#v1.0.1.1}
----------------------------------------------
-
-### Sonstiges {#v1.0.1.1-misc}
-
-* Eingabe von Sorten und Qualitätsstufen im Übernahme-Fenster (`DeliveryAdminWindows`) verbessert. (e2de7a1f1c, b27b89f599)
-
-[v1.0.1.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.1
-
-
-
-
-[v1.0.1.0][v1.0.1.0] (2025-09-18) {#v1.0.1.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.1.0-features}
-
-* Neue Weinsorten gemäß Kürzelliste der Bundeskellereiinspektion hinzugefügt. (a0dcaf7b4f)
-
-### Sonstiges {#v1.0.1.0-misc}
-
-* HTTP-Anfragen haben jetzt das Feld `User-Agent` gesetzt. (844fc5217a)
-* Auto-Update-Funktion wird auch beim Erlangen von Netzwerkverbindung ausgeführt. (8bc053053c)
-
-[v1.0.1.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.1.0
-
-
-
-
-[v1.0.0.6][v1.0.0.6] (2025-09-17) {#v1.0.0.6}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.0.6-bugfixes}
-
-* Die automatische Erkennung des Wiege-Modus hat im WKW nicht funktioniert. (463769b549)
-
-### Sonstiges {#v1.0.0.6-misc}
-
-* Tippfehler im Über-Fenster (`AboutWindow`) behoben. (2c383d0c55)
-* `SaveFileDialog` mit Multi-File-Extensions verbessert. (9e02b15ff1)
-
-[v1.0.0.6]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.6
-
-
-
-
-[v1.0.0.5][v1.0.0.5] (2025-09-15) {#v1.0.0.5}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.0.5-features}
-
-* Die Datenbank kann im Haupt-Fenster (`MainWindow`) gesichert und wiederhergestellt werden. (f02598760f)
-
-### Sonstiges {#v1.0.0.5-misc}
-
-* In der WGM ist eine Auswahl eines Zu/-Abschlags im Übernahme-Fenster (`DeliveryAdminWindow`) nun erforderlich. (a9b5317e79)
-* In der Konfigurationsdatei kann im `[general]` Block `weighing = gross`, `weighing = net`, oder `weighing = box` angegeben werden. (d7012ebfa1)
-* Über-Fenser (`AboutWindow`) hinzugefügt. (3c9b3c2db1)
-* Abhängigkeiten aktualisiert. (44dcc5e19f, 98f8907817)
-
-[v1.0.0.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.5
-
-
-
-
-[v1.0.0.4][v1.0.0.4] (2025-09-01) {#v1.0.0.4}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.0.4-bugfixes}
-
-* Absturz beim Verschicken von einzelnen E-Mails außerhalb des Rundschreiben-Fensters (`MailWindow`) behoben. (07f9a0f522)
-
-### Sonstiges {#v1.0.0.4-misc}
-
-* Ladezeit des Fehler-Protokoll-Fensters (`LogWindow`) verbessert. (4653a4f129)
-* Im Übernahme-Fenster (`DeliveryAdminWindow`) ist es nun möglich die Qualitätsstufe zu verändern. (104798d4f2)
-
-[v1.0.0.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.4
-
-
-
-
-[v1.0.0.3][v1.0.0.3] (2025-08-11) {#v1.0.0.3}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.0.3-features}
-
-* Im Haupt-Fenster (`MainWindow`) ist es nun möglich die gesamte Datenbank zu hochzuladen bzw. herunterzuladen. ([#69][i69])
-
-### Sonstiges {#v1.0.0.3-misc}
-
-* Die Intigrität von Elwig-Export-Dateien (`.elwig.zip`) und anderen `.zip` Dateien wir nun überprüft. (d3157e4d48)
-* Die Herkunftshierarchie wird nun auch automatisch synchronisiert (benötigt für Stamm-KG bei Mitglied, Ried/KG bei Flächenbindung, und Herkunft bei Lieferung). ([#70][i70], b6c03892b1)
-* Abhängigkeiten aktualisiert. (1f165055c1, 4e2eca295d)
-
-[v1.0.0.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.3
-[i69]: https://git.necronda.net/winzer/elwig/issues/69
-[i70]: https://git.necronda.net/winzer/elwig/issues/70
-
-
-
-
-[v1.0.0.2][v1.0.0.2] (2025-08-05) {#v1.0.0.2}
----------------------------------------------
-
-### Sonstiges {#v1.0.0.2-misc}
-
-* Explizit native SQLite-Bibliothek hinzugefügt. (77c3f388e7)
-
-[v1.0.0.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.2
-
-
-
-
-[v1.0.0.1][v1.0.0.1] (2025-08-05) {#v1.0.0.1}
----------------------------------------------
-
-### Sonstiges {#v1.0.0.1-misc}
-
-* Abhängigkeiten aktualisiert. (466c8a322c)
-* Angepasste Fehlermeldung, wenn Importieren fehlschlägt. (ab7c7404e2)
-
-[v1.0.0.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.1
-
-
-
-
-[v1.0.0.0][v1.0.0.0] (2025-07-30) {#v1.0.0.0}
+[v1.0.0.0][v1.0.0.0] (2025-XX-YY) {#v1.0.0.0}
 ---------------------------------------------
 
 ### Neue Funktionen {#v1.0.0.0-features}
 
-* Es wird nun gespeichert, wann Mitglieder/Flächenbindungen/Lieferungen importiert bzw. exporiert wurden. (4234c7f994)
-* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird der Auszahlungsbetrag für nicht-festgesetzte Varianten nun überschlagsmäßig angezeigt. (913129f155)
-* Wenn eine Variante im Auszahlungsvariante-Fenster (`ChartWindow`) gespeichert wird, wird sie nun automatisch auch berechnet. (c6c8fd9b68)
-* Überall wo Weinsorten vorkommen werden diese jetzt rot oder grün eingefärbt angezeigt. ([#61][i61])
-* Das Flächenbindungs-Fenster (`AreaComAdminWindow`) wurde überarbeitet. (53d82604a1, 267aa3d47c, [#64][i64])
-* Auf allen Dokumenten wird der Bio-Kontrollstellen-Code in der Fußzeile angeführt (sofern dieser in den Stammdaten gesetzt wurde). (fad1e28c06)
+* Something.
 
 ### Behobene Fehler {#v1.0.0.0-bugfixes}
 
-* Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
-* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
-* Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
-* Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])
+* Something.
 
 ### Sonstiges {#v1.0.0.0-misc}
 
-* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird angeführt, dass "Zu- und Abschläge bei Lieferungen" auch den Rebelzuschlag umfassen. (0dff3986b7)
-* Im gesamten Program wird an passenden Stellen statt "Gewicht" nun "Menge" verwendet. (0f3ce39f35)
-* Verbesserungen der Code-Qualität und der Leistung. ([#59][i59], b580e1bf79, 623f55f5b0, 3493ff6df1, 267797b55d, 41811925be, [#57][i57], 38d0ff969d, e6746f76b1, 7e9a27c75d)
-* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Flächenbindungen jetzt für die momentane Saison angezeigt statt für das aktuelle Jahr. (953532cae4)
-* Abhängigkeiten aktualisiert. (4b27ebf81b, 7153bfab6f, 9b48242f0e)
-* GPLv3 Lizenz hinzugefügt. (93e920f61a)
+* Something.
 
 [v1.0.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.0
-[i57]: https://git.necronda.net/winzer/elwig/issues/57
-[i58]: https://git.necronda.net/winzer/elwig/issues/58
-[i59]: https://git.necronda.net/winzer/elwig/issues/59
-[i61]: https://git.necronda.net/winzer/elwig/issues/61
-[i62]: https://git.necronda.net/winzer/elwig/issues/62
-[i64]: https://git.necronda.net/winzer/elwig/issues/64
-[i65]: https://git.necronda.net/winzer/elwig/issues/65
-
-
-
-
-[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
-------------------------------------------
-
-### Sonstiges {#v0.13.9-misc}
-
-* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
-* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
-
-[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
-
 
 
 

Elwig/App.xaml

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

Elwig/App.xaml.cs

@@ -1,22 +1,20 @@
-using Elwig.Dialogs;
-using Elwig.Helpers;
-using Elwig.Helpers.Billing;
-using Elwig.Helpers.Export;
-using Elwig.Helpers.Printing;
-using Elwig.Helpers.Weighing;
-using Elwig.Models.Entities;
-using Elwig.Windows;
 using System;
-using System.Collections.Generic;
 using System.Data;
-using System.IO;
 using System.Linq;
-using System.Net.NetworkInformation;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
+using System.IO;
+using Elwig.Helpers;
+using Elwig.Helpers.Weighing;
+using System.Collections.Generic;
 using System.Windows.Threading;
+using System.Reflection;
+using Elwig.Helpers.Printing;
+using Elwig.Windows;
+using Elwig.Dialogs;
+using System.Threading.Tasks;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
+using System.Text;
 
 namespace Elwig {
     public partial class App : Application {
@@ -27,13 +25,10 @@ namespace Elwig {
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
-        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
+        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string MailsPath = Path.Combine(DataPath, "mails");
         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
-        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
-        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
-            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
-            Path.Combine(InstallPath, "resources/Documents");
+        public static readonly string ExePath = @"C:\Program Files\Elwig\";
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
 
         public static Config Config { get; private set; } = new(ConfigPath);
@@ -128,11 +123,10 @@ namespace Elwig {
             if (Config.UpdateAuto && Config.UpdateUrl != null) {
                 if (Utils.HasInternetConnectivity()) {
                     Utils.RunBackground("Auto Updater", async () => {
-                        await Task.Delay(1000);
+                        await Task.Delay(500);
                         await CheckForUpdates();
                     });
                 }
-                NetworkChange.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
                 _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
                 _autoUpdateTimer.Start();
             }
@@ -164,16 +158,6 @@ namespace Elwig {
                 Shutdown();
             }
 
-            if (Config.WeighingMode == null) {
-                if (Client.IsMatzen || Client.IsWolkersdorf) {
-                    Config.WeighingMode = WeighingMode.Net;
-                } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
-                    Config.WeighingMode = WeighingMode.Box;
-                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
-                    Config.WeighingMode = WeighingMode.Gross;
-                }
-            }
-
             base.OnStartup(evt);
 
             var window = new MainWindow();
@@ -213,12 +197,10 @@ 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);
-                }
-            });
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is not ContextWindow c) continue;
+                MainDispatcher.BeginInvoke(c.HintContextChange);
+            }
         }
 
         private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
@@ -230,16 +212,6 @@ namespace Elwig {
             }
         }
 
-        private void OnNetworkAvailabilityChanged(object? sender, NetworkAvailabilityEventArgs evt) {
-            if (!evt.IsAvailable) return;
-            if (Utils.HasInternetConnectivity()) {
-                Utils.RunBackground("Auto Updater", async () => {
-                    await Task.Delay(2000);
-                    await CheckForUpdates();
-                });
-            }
-        }
-
         public static async Task CheckForUpdates(bool showAlert = false) {
             if (Config.UpdateUrl == null) return;
             var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
@@ -262,19 +234,6 @@ namespace Elwig {
             }
         }
 
-        public static async Task ReplaceDatabase(string filename) {
-            try {
-                await Task.Run(async () => {
-                    await Database.Import(filename);
-                });
-                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
-                ForceShutdown = true;
-                Current.Shutdown();
-            } catch (Exception exc) {
-                MessageBox.Show("Fehler beim Ersetzen:\n\n" + exc.Message, "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
         private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
             foreach (Window w in CurrentApp.Windows) {
                 if (w is T t && (selector == null || selector(t))) {

Elwig/Dialogs/AreaComDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
+<Window x:Class="Elwig.Dialogs.AreaComDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -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 MaintainYearFrom}"/>
+                  IsChecked="{Binding MaintainYearTo}"/>
 
         <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComDialog.xaml.cs

@@ -3,16 +3,16 @@ using System.Windows;
 using System.Windows.Controls;
 
 namespace Elwig.Dialogs {
-    public partial class AreaComTransferDialog : Window {
+    public partial class AreaComDialog : Window {
 
         public int CancelSeason { get; set; }
         public int SuccessorSeason => CancelSeason + 1;
-        public bool MaintainYearFrom { get; set; }
+        public bool MaintainYearTo { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
 
-        public AreaComTransferDialog(string name, int areaComNum, int area) {
+        public AreaComDialog(string name, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -29,7 +29,7 @@ namespace Elwig.Dialogs {
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
-        public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
+        public AreaComDialog(string name, string successorName, int areaComNum, int area) {
             CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
@@ -43,13 +43,13 @@ namespace Elwig.Dialogs {
             CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
-            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/AreaComModifyDialog.xaml

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

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

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

Elwig/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.DocumentsPath)\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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.DocumentsPath)\CreditNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
@@ -136,10 +136,7 @@
             }
         </tbody>
         <tbody style="break-inside: avoid;">
-            @{
-                decimal penalty = 0;
-                string? comment = null;
-            }
+            @{ decimal penalty = 0; }
 
             @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
                 <tr class="small">
@@ -161,13 +158,7 @@
                 penalty += Model.MemberAutoBusinessSharesAmount;
             }
             @if (Model.CustomPayment?.Amount != null) {
-                comment = Model.CustomPayment.Comment;
-                string text = (Model.CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
-                if (comment != null && comment!.Length <= 30) {
-                    text = comment;
-                    comment = null;
-                }
-                @Raw(FormatRow(text, Model.CustomPayment.Amount.Value, add: true));
+                @Raw(FormatRow(Model.CustomPayment.Comment ?? ((Model.CustomPayment.Amount.Value) < 0 ? "Weitere Abzüge" : "Weitere Zuschläge"), Model.CustomPayment.Amount.Value, add: true));
                 penalty += Model.CustomPayment.Amount.Value;
             }
 
@@ -185,9 +176,6 @@
             }
         </tbody>
     </table>
-    @if (comment != null) {
-        <p>* @comment</p>
-    }
     <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
     <div style="margin-top: 1em;">
         @if (Model.Text != null) {

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
 @model Elwig.Documents.DeliveryAncmtList
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>Menge</th>
+                <th>Gewicht</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.DocumentsPath)\DeliveryConfirmation.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>Menge</th>
+                <th>Gewicht</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.DocumentsPath)\DeliveryDepreciationList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>Menge</th>
+                <th>Gewicht</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.DocumentsPath)\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>Menge</th>
+                <th>Gewicht</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.DocumentsPath)\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>Menge</th>
+            <th>Gewicht</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 DocumentsPath;
+        public string DataPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
@@ -34,7 +34,7 @@ namespace Elwig.Documents {
 
         public Document(string title) {
             var c = App.Client;
-            DocumentsPath = App.DocumentsPath;
+            DataPath = App.DataPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
@@ -44,8 +44,8 @@ namespace Elwig.Documents {
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
                 .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
                     .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
-                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
-                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
+                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
             Date = DateOnly.FromDateTime(Utils.Today);
         }

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.DocumentsPath)\Document.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
     @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.DocumentsPath)\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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.DocumentsPath)\MemberList.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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.DocumentsPath)\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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.MinPrice);
-                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
+                    var minWei = weiRows.Min(r => r.Ungeb.Price);
+                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
                 }
                 <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.MinPrice);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
+                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
                 }
                 <th class="lborder">Preis (ungeb., nicht abgew.):</th>
                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
@@ -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.MaxPrice != null && r.Ungeb.MinPrice != null)
-                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
+                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
+                    .Select(r => r.Geb.Price - r.Ungeb.Price);
                     var minGeb = gebRows.Min();
                     var maxGeb = gebRows.Max();
                 }
@@ -219,22 +219,19 @@
     </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>
@@ -244,8 +241,6 @@
                 <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>
@@ -263,8 +258,6 @@
                         <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>
@@ -274,11 +267,9 @@
                     <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.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.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
                     <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price: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.DocumentsPath)\WineQualityStatistics.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>1.0.1.5</Version>
+    <Version>1.0.0.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,24 +20,26 @@
     <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.8" />
-    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="LinqKit" Version="1.3.7" />
+    <PackageReference Include="MailKit" Version="4.9.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
-    <PackageReference Include="NJsonSchema" Version="11.4.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.1" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageReference Include="NJsonSchema" Version="11.1.0" />
     <PackageReference Include="PdfiumViewer" Version="2.13.0" />
     <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.56" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="9.0.9" />
-    <PackageReference Include="System.IO.Ports" Version="9.0.9" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.53" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.1" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -248,6 +248,13 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
+        public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
+            return await WineQualityLevels
+                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
+                .OrderBy(q => q.MinKmw)
+                .LastAsync();
+        }
+
         public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = new DeliveryPartModifier {

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 = 33;
+        public static readonly int RequiredSchemaVersion = 31;
 
         private static int VersionOffset = 0;
 
@@ -28,10 +28,10 @@ namespace Elwig.Helpers {
             await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
             var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
-            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)((userVers >> 8) & 0xFF), (int)(userVers & 0xFF));
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)(userVers & 0xFFFF));
 
             if (App.Version > v) {
-                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | (App.Version.Build << 8) | App.Version.Revision;
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | App.Version.Build;
                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 

Elwig/Helpers/Billing/BillingVariant.cs

@@ -20,19 +20,13 @@ namespace Elwig.Helpers.Billing {
             Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
         }
 
-        public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
+        public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
             await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
             await DeleteInDb(cnx);
             await SetCalcTime(cnx);
-            KeyNotFoundException? exception = null;
-            try {
-                await CalculatePrices(cnx, strictPrices);
-            } catch (KeyNotFoundException e) {
-                if (strictPrices) throw;
-                exception = e;
-            }
+            await CalculatePrices(cnx);
             if (Data.ConsiderDelieryModifiers) {
                 await CalculateDeliveryModifiers(cnx);
             }
@@ -40,8 +34,6 @@ namespace Elwig.Helpers.Billing {
                 await CalculateMemberModifiers(cnx);
             }
             await tx.CommitAsync();
-            if (exception != null)
-                throw exception;
         }
 
         public async Task Commit() {
@@ -150,8 +142,7 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        protected async Task CalculatePrices(SqliteConnection cnx, bool strict = true) {
-            var invalid = new HashSet<string>();
+        protected async Task CalculatePrices(SqliteConnection cnx) {
             var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
@@ -181,25 +172,15 @@ namespace Elwig.Helpers.Billing {
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
                 var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
                 var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
-                decimal price = 0;
-                try {
-                    price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
-                } catch (KeyNotFoundException e) {
-                    invalid.Add(e.Message.Split('\'')[1]);
-                }
+                var price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
                 var priceL = PaymentVariant.Season.DecToDb(price);
                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }
 
-            var msg = invalid.Count == 0 ? null : "Für folgende Sorten wurde noch keine Preiskurve festgelegt: " + string.Join(", ", invalid);
-            if (msg != null && strict)
-                throw new KeyNotFoundException(msg);
             await AppDbContext.ExecuteBatch(cnx, $"""
                 INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
                 VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))};
                 """);
-            if (msg != null)
-                throw new KeyNotFoundException(msg);
         }
 
         protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {

Elwig/Helpers/Billing/GraphEntry.cs

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

Elwig/Helpers/ClientParameters.cs

@@ -19,6 +19,14 @@ namespace Elwig.Helpers {
         public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
         public bool IsGrInzersdorf => IsWeinland;
 
+        public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
+        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
+
+        public 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;
@@ -47,7 +55,6 @@ namespace Elwig.Helpers {
         public string? Bic;
         public string? UstIdNr;
         public string? LfbisNr;
-        public string? OrganicAuthority;
 
         public string? PhoneNr;
         public string? FaxNr;
@@ -106,7 +113,6 @@ namespace Elwig.Helpers {
                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
-                OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
 
                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
                     case "NONE": ModeDeliveryNoteStats = 0; break;
@@ -251,7 +257,6 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
-                ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics),
                 ("ORDERING_MEMBERLIST", orderingMemberList),

Elwig/Helpers/Config.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -6,8 +5,6 @@ using Microsoft.Extensions.Configuration;
 
 namespace Elwig.Helpers {
 
-    public enum WeighingMode { Gross, Net, Box }
-
     public record struct ScaleConfig {
         public string Id;
         public string? Type;
@@ -44,7 +41,6 @@ namespace Elwig.Helpers {
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
-        public WeighingMode? WeighingMode;
         public string? UpdateUrl = null;
         public bool UpdateAuto = false;
         public string? SyncUrl = null;
@@ -78,8 +74,6 @@ namespace Elwig.Helpers {
             DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null;
             Branch = config["general:branch"];
             Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
-            var weighing = config["general:weighing"];
-            WeighingMode = weighing != null && Enum.TryParse<WeighingMode>(weighing, true, out var w) ? w : null;
             UpdateUrl = config["update:url"];
             UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
             SyncUrl = config["sync:url"];

Elwig/Helpers/Export/Database.cs

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

Elwig/Helpers/Export/ElwigData.cs

@@ -1,14 +1,14 @@
-using Elwig.Models.Entities;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.IO.Compression;
-using System.Linq;
-using System.Text.Json.Nodes;
+using System.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.Text.Json;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
@@ -17,6 +17,8 @@ namespace Elwig.Helpers.Export {
 
         public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt");
 
+        private static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
+
         public static async Task<string[]> GetImportedFiles() {
             try {
                 return await File.ReadAllLinesAsync(ImportedTxt, Utils.UTF8);
@@ -38,7 +40,6 @@ namespace Elwig.Helpers.Export {
                 Dictionary<string, int> currentLsNrs;
                 Dictionary<int, List<WbRd>> currentWbRde;
                 Dictionary<int, AT_Kg> kgs;
-                List<WbGl> currentWbGls;
 
                 using (var ctx = new AppDbContext()) {
                     branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
@@ -50,7 +51,6 @@ namespace Elwig.Helpers.Export {
                     currentWbRde = await ctx.WbRde
                         .GroupBy(r => r.KgNr)
                         .ToDictionaryAsync(g => g.Key, g => g.ToList());
-                    currentWbGls = await ctx.WbGls.ToListAsync();
                     kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
                 }
 
@@ -61,12 +61,9 @@ namespace Elwig.Helpers.Export {
                     List<MemberEmailAddr> EmailAddresses,
                     List<AreaCom> AreaCommitments,
                     List<WbRd> Riede,
-                    List<WbKg> WbKgs,
-                    List<WbGl> WbGls,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
-                    List<DeliveryPartModifier> Modifiers,
-                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
+                    List<DeliveryPartModifier> Modifiers)>();
 
                 var metaData = new List<(string FileName, string ZwstId, string Device,
                     int? MemberNum, string? MemberFilters,
@@ -74,117 +71,71 @@ namespace Elwig.Helpers.Export {
                     int? DeliveryNum, string? DeliveryFilters)>();
 
                 foreach (var filename in filenames) {
-                    try {
-                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
-                            ["member"] = [],
-                            ["area_commitment"] = [],
-                            ["delivery"] = [],
-                        })));
-                        var r = data[^1];
+                    // TODO read encrypted files
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
 
-                        // TODO read encrypted files
-                        using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
-                        await zip.CheckIntegrity();
+                    var version = zip.GetEntry("version");
+                    using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
+                        if (await reader.ReadToEndAsync() != "elwig:1")
+                            throw new FileFormatException($"Ungültige Export-Datei ({filename})");
+                    }
 
-                        var version = zip.GetEntry("version");
-                        using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                            if (await reader.ReadToEndAsync() != "elwig:1")
-                                throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
+                    var metaJson = zip.GetEntry("meta.json");
+                    var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                    var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                    var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
+                    var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
+                    var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    metaData.Add((Path.GetFileName(filename),
+                        meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
+                        memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
+                        areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                        deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
+
+                    data.Add(new([], [], [], [], [], [], [], new([], [])));
+                    var r = data[^1];
+
+                    var membersJson = zip.GetEntry("members.json");
+                    if (membersJson != null) {
+                        using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
+                            r.Members.Add(m);
+                            if (b != null) r.BillingAddresses.Add(b);
+                            r.TelephoneNumbers.AddRange(telNrs);
+                            r.EmailAddresses.AddRange(emailAddrs);
                         }
+                    }
 
-                        var metaJson = zip.GetEntry("meta.json");
-                        var meta = await JsonNode.ParseAsync(metaJson!.Open());
-                        var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
-                        var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
-                        var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        metaData.Add((Path.GetFileName(filename),
-                            meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
-                            memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
-                            areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
-                            deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
-
-                        var wbKgsJson = zip.GetEntry("wb_kgs.json");
-                        if (wbKgsJson != null) {
-                            using var reader = new StreamReader(wbKgsJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var (k, g) = obj.ToWbKg(currentWbGls);
-                                r.WbKgs.Add(k);
-                                if (g != null) {
-                                    currentWbGls[g.GlNr] = g;
-                                    r.WbGls.Add(g);
-                                }
+                    var areaComsJson = zip.GetEntry("area_commitments.json");
+                    if (areaComsJson != null) {
+                        using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
+                            r.AreaCommitments.Add(areaCom);
+                            if (wbrd != null) {
+                                currentWbRde[wbrd.KgNr].Add(wbrd);
+                                r.Riede.Add(wbrd);
                             }
                         }
+                    }
 
-                        var membersJson = zip.GetEntry("members.json");
-                        if (membersJson != null) {
-                            using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
-                                r.Members.Add(m);
-                                if (b != null) r.BillingAddresses.Add(b);
-                                r.TelephoneNumbers.AddRange(telNrs);
-                                r.EmailAddresses.AddRange(emailAddrs);
-                                if (timestamps.HasValue)
-                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                            }
-                        }
-
-                        var areaComsJson = zip.GetEntry("area_commitments.json");
-                        if (areaComsJson != null) {
-                            using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var (areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
-                                r.AreaCommitments.Add(areaCom);
-                                if (wbrd != null) {
-                                    r.Riede.Add(wbrd);
-                                }
-                                if (timestamps.HasValue)
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                            }
-                        }
-
-                        var deliveriesJson = zip.GetEntry("deliveries.json");
-                        if (deliveriesJson != null) {
-                            using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
-                                r.Deliveries.Add(d);
-                                r.DeliveryParts.AddRange(parts);
-                                r.Modifiers.AddRange(mods);
-                                r.Riede.AddRange(rde);
-                                if (timestamps.HasValue)
-                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                            }
-                        }
-                    } catch (Exception exc) when (
-                            exc is InvalidDataException ||
-                            exc is FileFormatException ||
-                            exc is FileNotFoundException ||
-                            exc is IOException) {
-                        data.RemoveAt(data.Count - 1);
-                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen.\n\n" + exc.Message;
-                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                        MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
-                        await AddImportedFiles(Path.GetFileName(filename));
-                    } catch (Exception exc) {
-                        data.RemoveAt(data.Count - 1);
-                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?\n\n" + exc.Message;
-                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                        var r = MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No);
-                        if (r == MessageBoxResult.Yes) {
-                            await AddImportedFiles(Path.GetFileName(filename));
+                    var deliveriesJson = zip.GetEntry("deliveries.json");
+                    if (deliveriesJson != null) {
+                        using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids);
+                            r.Deliveries.Add(d);
+                            r.DeliveryParts.AddRange(parts);
+                            r.Modifiers.AddRange(mods);
                         }
                     }
                 }
@@ -193,18 +144,12 @@ 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, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
                     using var ctx = new AppDbContext();
 
-                    var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
-                    var duplicateKgNrs = await ctx.WbKgs
-                        .Where(k => kgnrs.Contains(k.KgNr))
-                        .Select(k => k.KgNr)
-                        .ToListAsync();
-
                     var mgnrs = members.Select(m => m.MgNr).ToList();
                     var duplicateMgNrs = await ctx.Members
                         .Where(m => mgnrs.Contains(m.MgNr))
@@ -258,12 +203,6 @@ namespace Elwig.Helpers.Export {
                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
                     }
 
-                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
-                        ctx.AddRange(wbGls);
-                        ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
-                        ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
-                    }
-
                     if (importDuplicateMembers) {
                         ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                         ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
@@ -333,26 +272,6 @@ 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();
@@ -383,9 +302,9 @@ namespace Elwig.Helpers.Export {
                     "Importieren erfolgreich",
                     MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden.\n\n" + exc.Message;
+                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, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(str, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -400,30 +319,26 @@ namespace Elwig.Helpers.Export {
             ) == MessageBoxResult.Yes;
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<string> filters) {
             return new ElwigExport {
-                Members = (members, filters),
-                WbKgs = (wbKgs, ["von exportierten Mitgliedern"]),
+                Members = (members, filters)
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
                 AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
-                WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
             return new ElwigExport {
-                Deliveries = (deliveries, filters),
-                WbKgs = (wbKgs, ["von exportierten Lieferungen"]),
+                Deliveries = (deliveries, filters)
             }.Export(filename);
         }
 
         public class ElwigExport {
-            public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
             public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
             public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
@@ -444,12 +359,6 @@ namespace Elwig.Helpers.Export {
                         ["zwstid"] = App.ZwstId,
                         ["device"] = Environment.MachineName,
                     };
-                    if (WbKgs != null) {
-                        obj["wb_kgs"] = new JsonObject {
-                            ["count"] = WbKgs.Value.WbKgs.Count(),
-                            ["filters"] = new JsonArray(WbKgs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
-                        };
-                    }
                     if (Members != null)
                         obj["members"] = new JsonObject {
                             ["count"] = Members.Value.Members.Count(),
@@ -466,69 +375,34 @@ namespace Elwig.Helpers.Export {
                             ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count),
                             ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
-                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                    await writer.WriteAsync(obj.ToJsonString(JsonOpts));
                 }
 
                 // TODO encrypt files
-                if (WbKgs != null) {
-                    var json = zip.CreateEntry("wb_kgs.json", CompressionLevel.SmallestSize);
-                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
-                    foreach (var k in WbKgs.Value.WbKgs) {
-                        await writer.WriteLineAsync(k.ToJson().ToJsonString(Utils.JsonOpts));
-                    }
-                }
                 if (Members != null) {
                     var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var m in Members.Value.Members) {
-                        await writer.WriteLineAsync(m.ToJson().ToJsonString(Utils.JsonOpts));
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(JsonOpts));
                     }
                 }
                 if (AreaComs != null) {
                     var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var c in AreaComs.Value.AreaComs) {
-                        await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(JsonOpts));
                     }
                 }
                 if (Deliveries != null) {
                     var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var d in Deliveries.Value.Deliveries) {
-                        await writer.WriteLineAsync(d.ToJson().ToJsonString(Utils.JsonOpts));
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(JsonOpts));
                     }
                 }
             }
         }
 
-        public static JsonObject ToJson(this WbKg k) {
-            return new JsonObject {
-                ["kgnr"] = k.KgNr,
-                ["großlage"] = k.Gl?.Name,
-            };
-        }
-
-        public static (WbKg, WbGl?) ToWbKg(this JsonNode json, List<WbGl> gls) {
-            var grosslage = json["großlage"]?.AsValue().GetValue<string>();
-            WbGl? gl = null;
-            bool newGl = false;
-            if (grosslage != null) {
-                gl = gls.FirstOrDefault(g => g.Name == grosslage);
-                if (gl == null) {
-                    newGl = true;
-                    gl = new WbGl {
-                        GlNr = (gls.Count == 0 ? 1 : gls.Max(g => g.GlNr)) + 1,
-                        Name = grosslage,
-                    };
-                    gls[gl.GlNr] = gl;
-                }
-            }
-            return (new WbKg {
-                KgNr = json["kgnr"]!.AsValue().GetValue<int>(),
-                GlNr = gl?.GlNr,
-            }, newGl ? gl : null);
-        }
-
         public static JsonObject ToJson(this Member m) {
             return new JsonObject {
                 ["mgnr"] = m.MgNr,
@@ -586,19 +460,15 @@ 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>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) 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>(),
@@ -632,7 +502,6 @@ 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>(),
@@ -650,10 +519,7 @@ namespace Elwig.Helpers.Export {
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            }).ToList(),
-            createdAt == null || modifiedAt == null ? null :
-            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
-             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+            }).ToList());
         }
 
         public static JsonObject ToJson(this AreaCom c) {
@@ -669,32 +535,27 @@ 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?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCom, WbRd?) 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;
             bool newRd = false;
             if (ried != null) {
-                var rde = riede.GetValueOrDefault(kgnr, []);
+                var rde = riede[kgnr] ?? throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
                 rd = rde.FirstOrDefault(r => r.Name == ried);
                 if (rd == null) {
                     newRd = true;
                     rd = new WbRd {
                         KgNr = kgnr,
-                        RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                        RdNr = (rde.Count == 0 ? 0 : rde.Max(r => r.RdNr)) + 1,
                         Name = ried,
                     };
                     rde.Add(rd);
-                    riede[rd.KgNr] = rde;
                 }
             }
-            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
-            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new AreaCom {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
@@ -703,15 +564,11 @@ namespace Elwig.Helpers.Export {
                 Area = json["area"]!.AsValue().GetValue<int>(),
                 KgNr = kgnr,
                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
-                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
+                RdNr = rd?.RdNr,
                 YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
-                ImportedAt = DateTime.Now,
-            }, newRd ? rd : null,
-            createdAt == null || modifiedAt == null ? null :
-            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
-             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+            }, newRd ? rd : null);
         }
 
         public static JsonObject ToJson(this Delivery d) {
@@ -734,13 +591,11 @@ namespace Elwig.Helpers.Export {
                         ["qualid"] = p.QualId,
                         ["hkid"] = p.HkId,
                         ["kgnr"] = p.KgNr,
-                        ["ried"] = p.Rd?.Name,
+                        ["rdnr"] = p.RdNr,
                         ["net_weight"] = p.IsNetWeight,
                         ["manual_weighing"] = p.IsManualWeighing,
                         ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
                         ["comment"] = p.Comment,
-                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
-                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
                     };
                     if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
                     if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
@@ -754,12 +609,10 @@ 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>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) 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);
@@ -768,9 +621,6 @@ 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>();
-            var wbRde = new List<WbRd>();
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -781,61 +631,37 @@ 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 => {
-                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
-                var ried = p["ried"]?.AsValue().GetValue<string>();
-                WbRd? rd = null;
-                if (ried != null) {
-                    var rde = riede.GetValueOrDefault(kgnr, []);
-                    rd = rde.FirstOrDefault(r => r.Name == ried);
-                    if (rd == null) {
-                        rd = new WbRd {
-                            KgNr = kgnr,
-                            RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
-                            Name = ried,
-                        };
-                        rde.Add(rd);
-                        riede[rd.KgNr] = rde;
-                        wbRde.Add(rd);
-                    }
-                }
-                return new DeliveryPart {
-                    Year = year,
-                    DId = did,
-                    DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
-                    SortId = p["sortid"]!.AsValue().GetValue<string>(),
-                    AttrId = p["attrid"]?.AsValue().GetValue<string>(),
-                    CultId = p["cultid"]?.AsValue().GetValue<string>(),
-                    Weight = p["weight"]!.AsValue().GetValue<int>(),
-                    Kmw = p["kmw"]!.AsValue().GetValue<double>(),
-                    QualId = p["qualid"]!.AsValue().GetValue<string>(),
-                    HkId = p["hkid"]!.AsValue().GetValue<string>(),
-                    KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
-                    RdNr = rd?.RdNr ?? p["rdnr"]?.AsValue().GetValue<int>(),
-                    IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
-                    IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
-                    Comment = p["comment"]?.AsValue().GetValue<string>(),
-                    IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
-                    IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
-                    IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
-                    IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
-                    Temperature = p["temperature"]?.AsValue().GetValue<double>(),
-                    Acid = p["acid"]?.AsValue().GetValue<double>(),
-                    ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
-                    WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
-                    WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
-                };
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
+                Year = year,
+                DId = did,
+                DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
+                SortId = p["sortid"]!.AsValue().GetValue<string>(),
+                AttrId = p["attrid"]?.AsValue().GetValue<string>(),
+                CultId = p["cultid"]?.AsValue().GetValue<string>(),
+                Weight = p["weight"]!.AsValue().GetValue<int>(),
+                Kmw = p["kmw"]!.AsValue().GetValue<double>(),
+                QualId = p["qualid"]!.AsValue().GetValue<string>(),
+                HkId = p["hkid"]!.AsValue().GetValue<string>(),
+                KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
+                RdNr = p["rdnr"]?.AsValue().GetValue<int>(),
+                IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
+                IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
+                Comment = p["comment"]?.AsValue().GetValue<string>(),
+                IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
+                IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
+                IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
+                IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                Temperature = p["temperature"]?.AsValue().GetValue<double>(),
+                Acid = p["acid"]?.AsValue().GetValue<double>(),
+                ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
+                WeighingData = p["weighing_data"]?.AsObject().ToJsonString(JsonOpts),
+                WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
             }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
                 Year = year,
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList(),
-            wbRde,
-            createdAt == null || modifiedAt == null ? null :
-            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
-             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+            })).ToList());
         }
     }
 }

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-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
         }
     }
 }

Elwig/Helpers/Extensions.cs

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

Elwig/Helpers/Printing/Html.cs

@@ -10,7 +10,7 @@ namespace Elwig.Helpers.Printing {
 
         public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DocumentsPath)
+                .UseFileSystemProject(App.DataPath + "resources")
                 .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.InstallPath }
+        private static readonly string WinziPrint = new string[] { App.ExePath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
             .Where(File.Exists)

Elwig/Helpers/Utils.cs

@@ -1,42 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+using System.IO.Ports;
+using System.Net.Sockets;
 using Elwig.Dialogs;
-using Elwig.Documents;
-using Elwig.Helpers.Billing;
-using Elwig.Models;
+using System.Text;
+using System.Numerics;
 using Elwig.Models.Entities;
-using LinqKit;
+using Elwig.Helpers.Billing;
+using System.Runtime.InteropServices;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.IO;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Win32;
-using MimeKit;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.IO.Ports;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Net.Http;
-using System.Net.Sockets;
-using System.Numerics;
 using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
+using System.Collections;
+using Elwig.Documents;
+using MimeKit;
+using System.Windows.Input;
+using LinqKit;
+using System.Linq.Expressions;
+using Elwig.Models;
+using Microsoft.Win32;
+using System.Globalization;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
 using System.Windows.Markup;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
 
         public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
-        public static readonly JsonSerializerOptions JsonOpts = new() { Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
 
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
@@ -431,13 +430,12 @@ namespace Elwig.Helpers {
             var client = new HttpClient() {
                 Timeout = TimeSpan.FromSeconds(5),
             };
-            client.DefaultRequestHeaders.UserAgent.Clear();
-            client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})");
             client.DefaultRequestHeaders.Accept.Clear();
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
             if (username != null || password != null)
-                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Utils.UTF8.GetBytes($"{username}:{password}")));
+                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
+                    Utils.UTF8.GetBytes($"{username}:{password}")));
             return client;
         }
 
@@ -456,19 +454,15 @@ 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");
-            using var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
+            var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
             content.Headers.ContentType = new("application/zip");
             using var res = await client.PutAsync(url + Path.GetFileName(zip), content);
             res.EnsureSuccessStatusCode();
         }
 
         public static async Task<JsonArray> GetExportMetaData(string url, string username, string password) {
-            if (url.StartsWith("https://elwig.at/clients/"))
-                url = "https://sync.elwig.at/" + url[25..];
             using var client = GetHttpClient(username, password, accept: "application/json");
             using var res = await client.GetAsync(url);
             res.EnsureSuccessStatusCode();
@@ -501,43 +495,44 @@ namespace Elwig.Helpers {
         public static async Task<bool> SendEmail(Member member, string subject, string text, IEnumerable<Document> docs) {
             if (App.Config.Smtp == null)
                 return false;
-            return await Task.Run(async () => {
-                SmtpClient? client = null;
-                try {
-                    client = await GetSmtpClient();
 
-                    using var msg = new MimeMessage();
-                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                    msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
-                    msg.Subject = subject;
-                    var body = new Multipart("mixed") {
-                        new TextPart("plain") { Text = text }
-                    };
-                    foreach (var doc in docs) {
-                        var name = NormalizeFileName(doc.Title);
-                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
-                    }
-                    msg.Body = body;
-                    await client!.SendAsync(msg);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return false;
-                } finally {
-                    if (client != null)
-                        await client.DisconnectAsync(true);
-                    client?.Dispose();
+            SmtpClient? client = null;
+            try {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await GetSmtpClient();
+
+                using var msg = new MimeMessage();
+                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                msg.Subject = subject;
+                var body = new Multipart("mixed") {
+                    new TextPart("plain") { Text = text }
+                };
+                foreach (var doc in docs) {
+                    var name = NormalizeFileName(doc.Title);
+                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
                 }
-                return true;
-            });
+                msg.Body = body;
+                await client!.SendAsync(msg);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            } finally {
+                if (client != null)
+                    await client.DisconnectAsync(true);
+                client?.Dispose();
+                Mouse.OverrideCursor = null;
+            }
+            return true;
         }
 
-        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member Member, string Subject, string Text)? emailData = null) {
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
             if (mode == ExportMode.Print && !App.Config.Debug) {
                 await doc.Generate();
                 await doc.Print();
             } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
                 await doc.Generate();
-                var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
+                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
                 if (success)
                     MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
                         MessageBoxButton.OK, MessageBoxImage.Information);
@@ -564,7 +559,9 @@ namespace Elwig.Helpers {
                 Log = "Application",
                 Source = ".NET Runtime",
             };
-            return [.. log.Entries.OfType<EventLogEntry>().Where(e => e.InstanceId == 1026).Where(e => e.Message.StartsWith("Application: Elwig.exe"))];
+            return log.Entries.Cast<EventLogEntry>()
+                .Where(e => e.Message.StartsWith("Application: Elwig.exe"))
+                .ToList();
         }
 
         public static int GetEntityIdetifierForPk(params object?[] primaryKey) {

Elwig/Helpers/Validator.cs

@@ -628,55 +628,5 @@ namespace Elwig.Helpers {
 
             return new(true, null);
         }
-
-        public static ValidationResult CheckOrganicAuthorityCode(TextBox input, bool required) {
-            string text = "";
-            int pos = input.CaretIndex;
-            for (int i = 0, v = 0; i < input.Text.Length; i++) {
-                char ch = char.ToUpper(input.Text[i]);
-                if (v < 2 && char.IsAsciiLetter(ch)) {
-                    v++;
-                    text += ch;
-                } else if ((v == 2 || v == 6) && ch == '-') {
-                    v++;
-                    text += ch;
-                } else if (v >= 2 && char.IsLetterOrDigit(ch)) {
-                    if (text.StartsWith("AT")) {
-                        if (v == 3 && ch == 'B' || v == 4 && ch == 'I' || v == 5 && ch == 'O') {
-                            v++;
-                            text += ch;
-                        } else if (v > 6 && char.IsAsciiDigit(ch)) {
-                            v++;
-                            text += ch;
-                        }
-                    } else {
-                        v++;
-                        text += ch;
-                    }
-                }
-
-                if (i == input.CaretIndex - 1) {
-                    pos = text.Length;
-                } else if (text.StartsWith("AT") && v >= 10) {
-                    break;
-                }
-            }
-
-            input.Text = text;
-            input.CaretIndex = pos;
-
-            if (text.Length == 0)
-                return required ? new(false, "Bio-Kontrollstellen-Code ist nicht optional") : new(true, null);
-
-            if (text.StartsWith("AT")) {
-                if (text.Length != 10) {
-                    return new(false, "Bio-Kontrollstellen-Code ist ungültig");
-                }
-            } else {
-                return new(false, "Not implemented yet");
-            }
-
-            return new(true, null);
-        }
     }
 }

Elwig/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<PaymentVar> paymentVariants, int year, int avnr) {
-            var variant = await paymentVariants.FindAsync(year, avnr);
+        public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
+            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
             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, variant, varData))
+                    (k, g) => new CreditNoteDeliveryRow(g, seasons, varData?.NetWeightModifier ?? 0.0, varData?.GrossWeightModifier ?? 0.0))
                 .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, PaymentVar paymentVariant, BillingData? varData) {
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons, double netWeightModifier, double grossWeightModifier) {
             var f = rows.First();
             Year = f.Year;
             TgNr = f.TgNr;
             AvNr = f.AvNr;
             MgNr = f.MgNr;
-            var season = paymentVariant.Season;
+            var season = seasons.Find(Year);
 
             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 = (varData == null || !varData.ConsiderDelieryModifiers) ? 0 : f.NetWeight ? varData.NetWeightModifier : varData.GrossWeightModifier;
+            WeighingModifier = f.NetWeight ? netWeightModifier : 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", "Menge", "kg", 20),
-            ("CreatedAt", "Angemeldet", null, 35),
-            ("ModifiedAt", "Geändert", null, 35),
+            ("Weight", "Gewicht", "kg", 20),
+            ("CreatedTimestamp", "Angemeldet", null, 35),
+            ("ModifiedTimestamp", "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 CreatedAt;
-        public DateTime? ModifiedAt;
+        public DateTime CreatedTimestamp;
+        public DateTime? ModifiedTimestamp;
         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;
-            CreatedAt = a.CreatedAt;
-            ModifiedAt = a.ModifiedAt == a.CreatedAt ? null : a.ModifiedAt;
+            CreatedTimestamp = a.CreatedTimestamp;
+            ModifiedTimestamp = a.ModifiedTimestamp == a.CreatedTimestamp ? null : a.ModifiedTimestamp;
             Weight = a.Weight;
-            Status = s.AncmtTo == null ? null : a.CreatedAt >= s.AncmtTo ? "verspät." : "ok";
+            Status = s.AncmtTo == null ? null : a.CreatedTimestamp >= 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", "Menge", "kg", 16),
+            ("Weight", "Gewicht", "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", "Menge", "kg", 20),
+            ("Weight", "Gewicht", "kg", 20),
             ("IsNetWeight", "Gerebelt", null, 20),
             ("HkId", "Herkunft", null, 20),
             ("Modifiers", "Zu-/Abschläge", null, 40),

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -18,9 +18,8 @@ namespace Elwig.Models.Dtos {
             ("Cultivation", "Bewirt.", null, 20),
             ("QualityLevel", "Qualitätsstufe", null, 30),
             ("Oe", "Gradation", "°Oe", 20),
-            ("Ungeb", "ungebunden", "kg|€/kg|€/kg", 60),
-            ("LowGeb", "attributlos gebunden", "kg|€/kg|€/kg", 60),
-            ("Geb", "gebunden", "kg|€/kg|€/kg", 60),
+            ("Ungeb", "ungebunden", "kg|€/kg", 40),
+            ("Geb", "gebunden", "kg|€/kg", 40),
             ("Amount", "Gesamt", "€", 25),
         ];
 
@@ -31,9 +30,8 @@ namespace Elwig.Models.Dtos {
             string? Cultivation,
             string QualityLevel,
             double Oe,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) Ungeb,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) LowGeb,
-            (int Weight, decimal? MinPrice, decimal? MaxPrice) Geb,
+            (int Weight, decimal? Price) Ungeb,
+            (int Weight, decimal? Price) Geb,
             decimal Amount
         );
 
@@ -44,9 +42,8 @@ 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.MinPriceUngeb != null ? Utils.DecFromDb(r.MinPriceUngeb.Value, v.Season.Precision) : null, r.MaxPriceUngeb != null ? Utils.DecFromDb(r.MaxPriceUngeb.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),
+                    (r.WeightUngeb, r.PriceUngeb != null ? Utils.DecFromDb(r.PriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightGeb, r.PriceGeb != null ? Utils.DecFromDb(r.PriceGeb.Value, v.Season.Precision) : null),
                     Utils.DecFromDb(r.Amount, v.Season.Precision)))
                 .ToArray());
         }
@@ -60,23 +57,19 @@ 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,
-                       MIN(IIF(w.discr = '_', b.price, NULL)) AS min_price_ungeb,
-                       MAX(IIF(w.discr = '_', b.price, NULL)) AS max_price_ungeb,
-                       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,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS price_ungeb,
+                       SUM(IIF(w.discr != '_', w.value, 0)) AS weight_geb,
+                       MAX(IIF(w.discr != '_', b.price, NULL)) AS 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 p.year = {year} AND b.avnr = {avnr}
+                WHERE d.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();
@@ -99,22 +92,12 @@ namespace Elwig.Models.Dtos {
         public double Oe { get; set; }
         [Column("weight_ungeb")]
         public int WeightUngeb { get; set; }
-        [Column("min_price_ungeb")]
-        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("price_ungeb")]
+        public long? PriceUngeb { get; set; }
         [Column("weight_geb")]
         public int WeightGeb { get; set; }
-        [Column("min_price_geb")]
-        public long? MinPriceGeb { get; set; }
-        [Column("max_price_geb")]
-        public long? MaxPriceGeb { get; set; }
+        [Column("price_geb")]
+        public long? PriceGeb { 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", "Menge", "kg", 20),
+            ("Weight", "Gewicht", "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", "Menge", "kg", 20),
+            ("Weight", "Gewicht", "kg", 20),
             ("Gradation", "Gradation", "°Oe|°KMW", 30),
         ];
 

Elwig/Models/Entities/AreaCom.cs

@@ -41,36 +41,14 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;

Elwig/Models/Entities/Credit.cs

@@ -84,36 +84,14 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("Year, AvNr, MgNr")]
         public virtual PaymentMember Payment { get; private set; } = null!;

Elwig/Models/Entities/Delivery.cs

@@ -1,11 +1,9 @@
 using Elwig.Helpers;
-using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-using System.Windows.Media;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models.Entities {
@@ -63,42 +61,15 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [NotMapped]
-        public string[] Comments => [.. Parts.Select(p => p.Comment).Prepend(Comment).Where(c => c != null).Cast<string>()];
-        [NotMapped]
-        public string CommentsString => string.Join(" / ", Comments);
-
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
@@ -114,19 +85,16 @@ namespace Elwig.Models.Entities {
         public int Weight => Parts.Select(p => p.Weight).Sum();
         public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
 
-        public IEnumerable<RawVaribute> Vaributes => Parts
-            .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
+        public IEnumerable<string> SortIds => Parts
+            .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
-        public IEnumerable<RawVaribute> FilteredVaributes => FilteredParts
-            .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
+            .Select(g => g.Key);
+        public IEnumerable<string> FilteredSortIds => FilteredParts
+            .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
-        public string VaributeString => string.Join(", ", Vaributes);
-        public string FilteredVaributeString => string.Join(", ", FilteredVaributes);
-
-        public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
-        public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
+            .Select(g => g.Key);
+        public string SortIdString => string.Join(", ", SortIds);
+        public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
         public IEnumerable<string> Modifiers => Parts
             .SelectMany(p => p.Modifiers)

Elwig/Models/Entities/DeliveryAncmt.cs

@@ -27,36 +27,14 @@ namespace Elwig.Models.Entities {
         public required string Type { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("Year, DsNr")]
         public virtual DeliverySchedule Schedule { get; private set; } = null!;

Elwig/Models/Entities/DeliveryPart.cs

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

Elwig/Models/Entities/DeliverySchedule.cs

@@ -42,9 +42,7 @@ namespace Elwig.Models.Entities {
         [Column("max_weight")]
         public int? MaxWeight { get; set; }
         [NotMapped]
-        public int AnnouncedWeight => AnnouncedWeightOverride ?? Announcements.Sum(a => a.Weight);
-        [NotMapped]
-        public int? AnnouncedWeightOverride { get; set; }
+        public int AnnouncedWeight => Announcements.Sum(a => a.Weight);
         [NotMapped]
         public double? Percent => (double)AnnouncedWeight / MaxWeight * 100;
 

Elwig/Models/Entities/Member.cs

@@ -145,36 +145,14 @@ namespace Elwig.Models.Entities {
         public AT_Kg? DefaultKg => DefaultWbKg?.AtKg;
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }

Elwig/Models/Entities/PaymentVar.cs

@@ -46,36 +46,14 @@ namespace Elwig.Models.Entities {
         public required string Data { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
+        public long CTime { get; private set; }
         [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
+        public long MTime { get; private set; }
         [NotMapped]
-        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();
-        }
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
 
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;

Elwig/Models/Entities/WbGl.cs

@@ -6,10 +6,10 @@ namespace Elwig.Models.Entities {
     [Table("wb_gl"), PrimaryKey("GlNr")]
     public class WbGl {
         [Column("glnr")]
-        public int GlNr { get; set; }
+        public int GlNr { get; private set; }
 
         [Column("name")]
-        public string Name { get; set; } = null!;
+        public string Name { get; private set; } = null!;
 
         [InverseProperty(nameof(WbKg.Gl))]
         public virtual ICollection<WbKg> Kgs { get; private set; } = null!;

Elwig/Models/Entities/WbKg.cs

@@ -15,7 +15,7 @@ namespace Elwig.Models.Entities {
         public virtual AT_Kg AtKg { get; private set; } = null!;
 
         [ForeignKey("GlNr")]
-        public virtual WbGl? Gl { get; private set; } = null!;
+        public virtual WbGl Gl { get; private set; } = null!;
 
         [InverseProperty(nameof(WbRd.Kg))]
         public virtual ICollection<WbRd> Rds { get; private set; } = null!;

Elwig/Models/Entities/WineVar.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Windows.Media;
 
 namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
@@ -11,32 +10,22 @@ namespace Elwig.Models.Entities {
         [Column("type")]
         public string Type { get; private set; } = null!;
 
-        [Column("max_qualid")]
-        public string MaxQualId { get; private set; } = null!;
-
-        [ForeignKey("MaxQualId")]
-        public virtual WineQualLevel MaxQualityLevel { get; private set; } = null!;
-
         [Column("name")]
         public string Name { get; private set; } = null!;
 
         [Column("comment")]
         public string? Comment { get; private set; }
 
-        public string SortIdFormat => IsQuw ? SortId : $"({SortId})";
         public string CommentFormat => (Comment != null) ? $" ({Comment})" : "";
 
         public bool IsRed => Type == "R";
         public bool IsWhite => Type == "W";
-        public bool IsQuw => MaxQualId == "QUW";
-        public Brush? Color => IsWhite ? Brushes.DarkGreen : IsRed ? Brushes.DarkRed : null;
 
         public WineVar() { }
 
         public WineVar(string sortId, string name) {
             SortId = sortId;
             Name = name;
-            MaxQualId = "QUW";
         }
 
         public override string ToString() {

Elwig/Resources/Sql/31-32.sql

@@ -1,33 +0,0 @@
--- 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/Resources/Sql/32-33.sql

@@ -1,17 +0,0 @@
--- schema version 32 to 33
-
-ALTER TABLE wine_variety ADD COLUMN max_qualid TEXT NOT NULL DEFAULT 'QUW';
-UPDATE wine_quality_level SET qualid = 'ALW' WHERE qualid = 'AUL';
-UPDATE wine_variety SET comment = 'Muscato' WHERE sortid = 'MO';
-
-INSERT INTO wine_variety (sortid, type, max_qualid, name, comment) VALUES
-('DR', 'W', 'QUW', 'Donauriesling', NULL),
-('DV', 'W', 'QUW', 'Donauveltliner', NULL),
-('BN', 'W', 'RSW', 'Bronner', NULL),
-('CB', 'W', 'RSW', 'Cabernet Blanc', NULL),
-('CJ', 'R', 'RSW', 'Cabernet Jura', NULL),
-('JO', 'W', 'RSW', 'Johanniter', NULL),
-('OR', 'W', 'RSW', 'Orangetraube', NULL),
-('PI', 'R', 'RSW', 'Pinot Nova', NULL),
-('RE', 'R', 'RSW', 'Regent', NULL),
-('SI', 'W', 'RSW', 'Solaris', NULL);

Elwig/Services/AreaComService.cs

@@ -106,13 +106,12 @@ namespace Elwig.Services {
         }
 
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            int newFbNr = vm.FbNr!.Value;
+            int newFbNr = (int)vm.FbNr!;
 
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
-                    MgNr = vm.MgNr!.Value,
+                    MgNr = (int)vm.MgNr!,
                     YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
                     VtrgId = vm.AreaComType!.VtrgId,
@@ -120,8 +119,8 @@ namespace Elwig.Services {
                     Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                     KgNr = vm.Kg!.KgNr,
                     RdNr = vm.Rd?.RdNr,
-                    GstNr = vm.GstNr?.Trim() ?? "-",
-                    Area = vm.Area!.Value,
+                    GstNr = vm.GstNr!.Trim(),
+                    Area = (int)vm.Area!,
                 };
 
                 if (vm.Rd?.RdNr == 0) {
@@ -141,9 +140,11 @@ namespace Elwig.Services {
                 if (newFbNr != a.FbNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
+            }
 
-                return newFbNr;
-            });
+            App.HintContextChange();
+
+            return newFbNr;
         }
 
         private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
@@ -252,14 +253,5 @@ 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();
-            });
-        }
     }
 }

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.CreatedAt:dd.MM.yyyy, HH:mm} ({a.Type})";
-            vm.StatusAncmtModified = a.ModifiedAt != a.CreatedAt ? $"{a.ModifiedAt:dd.MM.yyyy, HH:mm}" : "-";
+            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
         }
 
         public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
@@ -211,8 +211,7 @@ namespace Elwig.Services {
             int newMgNr = vm.MgNr!.Value;
             string newSortId = vm.SortId!;
 
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 var a = new DeliveryAncmt {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? dsnr,
@@ -233,9 +232,11 @@ namespace Elwig.Services {
                 if (oldDsNr != null && (oldYear != year || oldDsNr != dsnr || oldMgNr != newMgNr || oldSortId != newSortId)) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_announcement SET year = {year}, dsnr = {dsnr}, mgnr = {newMgNr}, sortid = {newSortId} WHERE (year, dsnr, mgnr, sortid) = ({a.Year}, {a.DsNr}, {a.MgNr}, {a.SortId})");
                 }
+            }
 
-                return (year, dsnr, newMgNr, newSortId);
-            });
+            App.HintContextChange();
+
+            return (year, dsnr, newMgNr, newSortId);
         }
 
         public static async Task GenerateDeliveryAncmtList(this DeliveryAncmtAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -268,29 +269,25 @@ namespace Elwig.Services {
                     Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                            using var ods = new OdsFile(d.FileName);
-                            await ods.AddTable(data);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                     try {
                         var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                        using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
-                        await Utils.ExportDocument(doc, mode);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             }
         }
@@ -329,7 +326,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryAncmts.SumAsync(p => p.Weight);
             text = $"{weight:N0} kg";
-            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);
+            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
 
             if (await deliveryAncmts.AnyAsync()) {
                 var attrGroups = await deliveryAncmts

Elwig/Services/DeliveryScheduleService.cs

@@ -152,8 +152,7 @@ namespace Elwig.Services {
         public static async Task UpdateDeliverySchedule(this DeliveryScheduleAdminViewModel vm, int? oldYear, int? oldDsNr) {
             int year = vm.Date!.Value.Year;
 
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 var s = new DeliverySchedule {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? await ctx.NextDsNr(year),
@@ -182,7 +181,9 @@ namespace Elwig.Services {
                     .ToList(), vm.MainVarieties.Select(v => (v, 1)).Union(vm.OtherVarieties.Select(v => (v, 2))).ToList());
 
                 await ctx.SaveChangesAsync();
-            });
+            }
+
+            App.HintContextChange();
         }
     }
 }

Elwig/Services/DeliveryService.cs

@@ -430,10 +430,9 @@ namespace Elwig.Services {
         }
 
         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
-            return await Task.Run(async () => {
-                DeliveryPart p;
+            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);
@@ -525,16 +524,17 @@ namespace Elwig.Services {
                 }
 
                 await ctx.SaveChangesAsync();
+            }
 
-                return p;
-            });
+            App.HintContextChange();
+
+            return p;
         }
 
         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
-            return await Task.Run(async () => {
-                Delivery n;
+            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,15 +577,17 @@ 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();
+
+            return n;
         }
 
         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
-            return await Task.Run(async () => {
-                Delivery n;
-                using var ctx = new AppDbContext();
+            Delivery n;
+
+            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))!;
@@ -614,14 +616,15 @@ 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();
+
+            return n;
         }
 
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            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)) {
@@ -645,21 +648,21 @@ namespace Elwig.Services {
                     }
                 }
                 await ctx.SaveChangesAsync();
-            });
+            }
+
+            App.HintContextChange();
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    using var ctx = new AppDbContext();
-                    var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    using var doc = new DeliveryNote(d, ctx);
-                    await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
+                using var doc = new DeliveryNote(d, ctx);
+                await Utils.ExportDocument(doc, mode, d.LsNr, (d.Member, $"{DeliveryNote.Name} Nr. {d.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {d.LsNr}"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -704,16 +707,14 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                            using var ods = new OdsFile(d.FileName);
-                            await ods.AddTable(data);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    try {
+                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -721,86 +722,61 @@ namespace Elwig.Services {
                     FileName = subject == ExportSubject.Selected ? $"Lieferung_{vm.SelectedDelivery?.LsNr}.elwig.zip" : $"Lieferungen_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
                     DefaultExt = "elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig",
-                    AddExtension = false,
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var list = await query
-                                .Select(p => p.Delivery)
-                                .Distinct()
-                                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                                .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                                .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
-                                .AsSplitQuery()
-                                .ToListAsync();
-                            var wbKgs = list
-                                .SelectMany(d => d.Parts)
-                                .Where(p => p.Kg != null)
-                                .Select(p => p.Kg!)
-                                .DistinctBy(k => k.KgNr)
-                                .OrderBy(k => k.KgNr)
-                                .ToList();
-                            await ElwigData.Export(d.FileName, list, wbKgs, filterNames);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    try {
+                        await ElwigData.Export(d.FileName, await query
+                            .Select(p => p.Delivery)
+                            .Distinct()
+                            .Include(d => d.Parts)
+                            .ThenInclude(p => p.PartModifiers)
+                            .AsSplitQuery()
+                            .ToListAsync(), filterNames);
+                    } 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.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);
-                        var list = await query
-                            .Select(p => p.Delivery)
-                            .Distinct()
-                            .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                            .Include(d => d.Parts).ThenInclude(p => p.Rd)
-                            .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
-                            .AsSplitQuery()
-                            .ToListAsync();
-                        var wbKgs = list
-                            .SelectMany(d => d.Parts)
-                            .Where(p => p.Kg != null)
-                            .Select(p => p.Kg!)
-                            .DistinctBy(k => k.KgNr)
-                            .OrderBy(k => k.KgNr)
-                            .ToList();
-                        if (list.Count == 0) {
-                            MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, list, wbKgs, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } 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);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var list = await query
+                        .Select(p => p.Delivery)
+                        .Distinct()
+                        .Include(d => d.Parts)
+                        .ThenInclude(p => p.PartModifiers)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    if (list.Count == 0) {
+                        MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, list, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
                     }
-                });
+                } 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);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             } else {
-                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);
-                        await Utils.ExportDocument(doc, mode);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             }
         }
@@ -822,16 +798,14 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            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);
-                    await Utils.ExportDocument(doc, mode);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
+                using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
+                await Utils.ExportDocument(doc, mode);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -855,16 +829,14 @@ namespace Elwig.Services {
                 Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    try {
-                        using var ods = new OdsFile(d.FileName);
-                        var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
-                        await ods.AddTable(tbl);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    using var ods = new OdsFile(d.FileName);
+                    var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
+                    await ods.AddTable(tbl);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             }
         }
@@ -903,37 +875,33 @@ namespace Elwig.Services {
                     Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            using var ods = new OdsFile(d.FileName);
-                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                            tblTotal.FullName = DeliveryDepreciationList.Name;
-                            tblTotal.Name = "Gesamt";
-                            await ods.AddTable(tblTotal);
-                            foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                                var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
-                                tbl.FullName = DeliveryDepreciationList.Name;
-                                tbl.Name = branch.Name;
-                                await ods.AddTable(tbl);
-                            }
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
-                    Mouse.OverrideCursor = null;
-                }
-            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                     try {
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                        using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
-                        await Utils.ExportDocument(doc, mode);
+                        using var ods = new OdsFile(d.FileName);
+                        var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
+                        tblTotal.FullName = DeliveryDepreciationList.Name;
+                        tblTotal.Name = "Gesamt";
+                        await ods.AddTable(tblTotal);
+                        foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                            var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
+                            tbl.FullName = DeliveryDepreciationList.Name;
+                            tbl.Name = branch.Name;
+                            await ods.AddTable(tbl);
+                        }
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                });
+                    Mouse.OverrideCursor = null;
+                }
+            } else {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                try {
+                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             }
         }
@@ -978,7 +946,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryParts.SumAsync(p => p.Weight);
             wText = $"{weight:N0} kg";
-            wGrid.Add(("Menge", null, weight, null, weight));
+            wGrid.Add(("Gewicht", null, weight, null, weight));
 
             if (await deliveryParts.AnyAsync()) {
                 var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
@@ -1079,7 +1047,7 @@ namespace Elwig.Services {
             wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             int rowNum = 0;
             foreach (var row in weightData) {
-                if (rowNum != 0 && row.Item2 == null) rowNum++;
+                if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++;
                 AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
@@ -1094,7 +1062,7 @@ namespace Elwig.Services {
             AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
             rowNum = 1;
             foreach (var row in gradationData) {
-                if (rowNum != 1 && row.Item2 == null) rowNum++;
+                if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
                 AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
@@ -1102,11 +1070,11 @@ namespace Elwig.Services {
         }
 
         public static async Task DeleteDelivery(string lsnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            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.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.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Net.Http;
 using System.Threading.Tasks;
-using System.Windows;
+using System;
+using Microsoft.EntityFrameworkCore;
+using Elwig.Documents;
 using System.Windows.Input;
+using System.Windows;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
+using Elwig.Helpers.Export;
+using Microsoft.Win32;
+using Elwig.ViewModels;
+using System.IO;
+using System.Net.Http;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -49,11 +49,6 @@ 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) {
@@ -142,12 +137,6 @@ 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;
@@ -368,8 +357,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(Utils.CurrentLastSeason)).Any(c => filterAreaCom.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 (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).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 (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));
             }
@@ -378,57 +367,51 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    using var ctx = new AppDbContext();
-                    using var doc = new MemberDataSheet(m, ctx);
-                    await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                using var doc = new MemberDataSheet(m, ctx);
+                await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+            } 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.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
-                    using var doc = new DeliveryConfirmation(ctx, year, m, data);
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
+                using var doc = new DeliveryConfirmation(ctx, year, m, data);
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
+            } 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.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.PaymentVariants, year, avnr);
-                    var p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
-                    var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            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 p = (await ctx.MemberPayments.FindAsync(year, avnr, m.MgNr))!;
+                var b = BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data);
 
-                    using var doc = new CreditNote(ctx, p, data[m.MgNr],
-                        b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
-                        await ctx.GetMemberUnderDelivery(year, m.MgNr));
-                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var doc = new CreditNote(ctx, p, data[m.MgNr],
+                    b.ConsiderContractPenalties, b.ConsiderTotalPenalty, b.ConsiderAutoBusinessShares, b.ConsiderCustomModifiers,
+                    await ctx.GetMemberUnderDelivery(year, m.MgNr));
+                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {v.Name}", $"Im Anhang finden Sie die Traubengutschrift {v.Name}"));
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -481,159 +464,130 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    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);
-                            await ods.AddTable(data);
-                        } catch (Exception exc) {
-                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        }
-                    });
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    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);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
                     Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
                 var d = new SaveFileDialog() {
                     FileName = subject == ExportSubject.Selected ? $"Mitglied_{vm.SelectedMember?.MgNr}.elwig.zip" : $"Mitglieder_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
-                    DefaultExt = "elwig.zip",
+                    DefaultExt = ".elwig.zip",
                     Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                    Title = $"{MemberList.Name} speichern unter - Elwig",
-                    AddExtension = false,
+                    Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        try {
-                            var members = await query
-                                .OrderBy(m => m.MgNr)
-                                .Include(m => m.BillingAddress)
-                                .Include(m => m.TelephoneNumbers)
-                                .Include(m => m.EmailAddresses)
-                                .Include(m => m.DefaultWbKg!.Gl)
-                                .AsSplitQuery()
-                                .ToListAsync();
-                            var areaComs = await query
-                                .SelectMany(m => m.AreaCommitments)
-                                .Include(c => c.Rd)
-                                .Include(c => c.Kg.Gl)
-                                .ToListAsync();
-                            var wbKgs = members
-                                .Where(m => m.DefaultWbKg != null)
-                                .Select(m => m.DefaultWbKg!)
-                                .Union(areaComs.Select(c => c.Kg))
-                                .Distinct()
-                                .OrderBy(k => k.KgNr)
-                                .ToList();
-                            await ElwigData.Export(d.FileName, members, areaComs, wbKgs, filterNames);
-                        } 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.Wait;
-                await Task.Run(async () => {
+                    Mouse.OverrideCursor = Cursors.AppStarting;
                     try {
-                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
-                        var path = Path.Combine(App.TempPath, filename);
                         var members = await query
                             .OrderBy(m => m.MgNr)
                             .Include(m => m.BillingAddress)
                             .Include(m => m.TelephoneNumbers)
                             .Include(m => m.EmailAddresses)
-                            .Include(m => m.DefaultWbKg!.Gl)
                             .AsSplitQuery()
                             .ToListAsync();
                         var areaComs = await query
                             .SelectMany(m => m.AreaCommitments)
-                            .OrderBy(c => c.MgNr).ThenBy(c => c.FbNr)
                             .Include(c => c.Rd)
-                            .Include(c => c.Kg.Gl)
                             .ToListAsync();
-                        var wbKgs = members
-                            .Where(m => m.DefaultWbKg != null)
-                            .Select(m => m.DefaultWbKg!)
-                            .Union(areaComs.Select(c => c.Kg))
-                            .Distinct()
-                            .OrderBy(k => k.KgNr)
-                            .ToList();
-                        if (members.Count == 0) {
-                            MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
-                                MessageBoxButton.OK, MessageBoxImage.Error);
-                        } else {
-                            await ElwigData.Export(path, members, areaComs, wbKgs, filterNames);
-                            await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                            MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
-                                MessageBoxButton.OK, MessageBoxImage.Information);
-                        }
-                    } catch (HttpRequestException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                    } catch (TaskCanceledException exc) {
-                        MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                        await ElwigData.Export(d.FileName, members, areaComs, filterNames);
                     } 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;
+                try {
+                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
+                    var path = Path.Combine(App.TempPath, filename);
+                    var members = await query
+                        .OrderBy(m => m.MgNr)
+                        .Include(m => m.BillingAddress)
+                        .Include(m => m.TelephoneNumbers)
+                        .Include(m => m.EmailAddresses)
+                        .AsSplitQuery()
+                        .ToListAsync();
+                    var areaComs = await query
+                        .SelectMany(m => m.AreaCommitments)
+                        .Include(c => c.Rd)
+                        .ToListAsync();
+                    if (members.Count == 0) {
+                        MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
+                    } else {
+                        await ElwigData.Export(path, members, areaComs, filterNames);
+                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                        MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                            MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                } catch (HttpRequestException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (TaskCanceledException exc) {
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
                 Mouse.OverrideCursor = null;
             } else {
-                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);
-                        await Utils.ExportDocument(doc, mode);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                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);
+                    await Utils.ExportDocument(doc, mode);
+                } 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!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                IsJuridicalPerson = vm.IsJuridicalPerson,
-                Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
-                Name = vm.Name!,
-                Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
-                ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,
 
-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+            using (var ctx = new AppDbContext()) {
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,
 
-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
 
-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                BusinessShares = (int)vm.BusinessShares!,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
-                IsFunktionär = vm.IsFunktionär,
-                ZwstId = vm.Branch?.ZwstId,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                ContactViaPost = vm.ContactViaPost,
-                ContactViaEmail = vm.ContactViaEmail,
-            };
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    IsBuchführend = vm.IsBuchführend,
+                    IsOrganic = vm.IsOrganic,
+
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    BusinessShares = (int)vm.BusinessShares!,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsActive = vm.IsActive,
+                    IsVollLieferant = vm.IsVollLieferant,
+                    IsFunktionär = vm.IsFunktionär,
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };
 
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
                 if (oldMgNr != null) {
                     ctx.Update(m);
                 } else {
@@ -690,7 +644,7 @@ namespace Elwig.Services {
                         KgNr = c.KgNr,
                         GstNr = c.GstNr,
                         RdNr = c.RdNr,
-                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
+                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
                         YearTo = c.YearTo,
                     }));
 
@@ -716,14 +670,15 @@ namespace Elwig.Services {
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                 }
+            }
 
-                return newMgNr;
-            });
+            App.HintContextChange();
+
+            return newMgNr;
         }
 
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
+            using (var ctx = new AppDbContext()) {
                 var l = (await ctx.Members.FindAsync(mgnr))!;
                 if (deletePaymentData) {
                     ctx.RemoveRange(l.Credits);
@@ -736,7 +691,8 @@ namespace Elwig.Services {
                 }
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
-            });
+            }
+            App.HintContextChange();
         }
     }
 }

Elwig/Services/PaymentVariantService.cs

@@ -1,387 +0,0 @@
-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) {
-            if (mode == ExportMode.SaveList) {
-                var d = new SaveFileDialog() {
-                    FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
-                    DefaultExt = "ods",
-                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                    Title = $"Variantendaten {v.Name} speichern unter - Elwig"
-                };
-                if (d.ShowDialog() == false)
-                    return;
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    try {
-                        using var ctx = new AppDbContext();
-                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                        using var ods = new OdsFile(d.FileName);
-                        await ods.AddTable(data);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    }
-                });
-                Mouse.OverrideCursor = null;
-            } else {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    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.Wait;
-                await Task.Run(async () => {
-                    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.Wait;
-                await Task.Run(async () => {
-                    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) {
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var 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();
-                return v;
-            });
-        }
-
-        public static async Task<PaymentVar> Duplicate(this PaymentVar orig) {
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var 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();
-                return n;
-            });
-        }
-
-        public static async Task<(int, int)> UpdatePaymentVariant(this PaymentVariantsViewModel vm, int? oldYear, int? oldAvNr) {
-            var year = oldYear ?? Utils.CurrentYear;
-            int avnr = 0;
-            await Task.Run(async () => {
-                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;
-            return (year, avnr);
-        }
-
-        public static async Task DeletePaymentVariant(int year, int avnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
-                ctx.Remove(v);
-                await ctx.SaveChangesAsync();
-            });
-        }
-
-        public static async Task Calculate(int year, int avnr) {
-            await Task.Run(async () => {
-                var b = new BillingVariant(year, avnr);
-                await b.Calculate();
-            });
-        }
-
-        public static async Task Commit(int year, int avnr) {
-            await Task.Run(async () => {
-                var b = new BillingVariant(year, avnr);
-                await b.Commit();
-            });
-        }
-
-        public static async Task Revert(int year, int avnr) {
-            await Task.Run(async () => {
-                var b = new BillingVariant(year, avnr);
-                await b.Revert();
-            });
-        }
-    }
-}

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 MaintainAreaComYearFrom = false;
+        public bool MaintainAreaComYearTo = 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,17 +153,6 @@ 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

@@ -1,95 +0,0 @@
-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/AboutWindow.xaml

@@ -1,32 +0,0 @@
-<Window x:Class="Elwig.Windows.AboutWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Windows"
-        Title="Über - Elwig" Height="340" Width="460" ResizeMode="NoResize">
-    <Grid>
-        <TextBlock Margin="20,10" FontSize="12">
-            <Bold>Produkt:</Bold> Elwig<LineBreak/>
-            <Bold>Beschreibung:</Bold> Elektronische Winzergenossenschaftsverwaltung<LineBreak/>
-            <Bold>Typ:</Bold> Warenwirtschaftssystem (ERP-System)<LineBreak/>
-            <Bold>Version:</Bold> <Run x:Name="Version">0.0.0.0</Run> (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungsprotokoll</Hyperlink>)<LineBreak/>
-            <Bold>Lizenz:</Bold> <Hyperlink NavigateUri="https://www.gnu.org/licenses/gpl-3.0.html" RequestNavigate="Hyperlink_RequestNavigate">GNU General Public License 3.0 (GPLv3)</Hyperlink><LineBreak/>
-            <Bold>Website:</Bold> <Hyperlink NavigateUri="https://elwig.at/" RequestNavigate="Hyperlink_RequestNavigate">https://elwig.at/</Hyperlink><LineBreak/>
-            <Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
-            <Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
-            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
-            <Bold>Entwicklungszeitraum:</Bold> 2022–2025<LineBreak/>
-            <LineBreak/>
-            <Bold>Verwendete Technologien:</Bold><LineBreak/>
-            Programmiersprache: C#<LineBreak/>
-            Framework: Windows Presentation Framework (WPF)<LineBreak/>
-            Datenbank: <Hyperlink NavigateUri="https://sqlite.org/" RequestNavigate="Hyperlink_RequestNavigate">SQLite</Hyperlink><LineBreak/>
-            PDF-Erstellung: <Hyperlink NavigateUri="https://weasyprint.org/" RequestNavigate="Hyperlink_RequestNavigate">WeasyPrint</Hyperlink>, <Hyperlink NavigateUri="https://github.com/toddams/RazorLight" RequestNavigate="Hyperlink_RequestNavigate">RazorLight</Hyperlink>, <Hyperlink NavigateUri="https://github.com/pvginkel/PdfiumViewer" RequestNavigate="Hyperlink_RequestNavigate">PdfiumViewer</Hyperlink><LineBreak/>
-            Paketierung: <Hyperlink NavigateUri="https://www.firegiant.com/wixtoolset/" RequestNavigate="Hyperlink_RequestNavigate">WiX Toolset</Hyperlink>
-        </TextBlock>
-
-        <Image Source="\Resources\Images\Elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Height="64"
-               HorizontalAlignment="Right" Margin="10" VerticalAlignment="Top"/>
-    </Grid>
-</Window>

Elwig/Windows/AboutWindow.xaml.cs

@@ -1,17 +0,0 @@
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Navigation;
-
-namespace Elwig.Windows {
-    public partial class AboutWindow : Window {
-
-        public AboutWindow() {
-            InitializeComponent();
-            Version.Text = App.Version.ToString();
-        }
-
-        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
-            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
-        }
-    }
-}

Elwig/Windows/AdministrationWindow.cs

@@ -13,8 +13,8 @@ using System.Windows.Input;
 namespace Elwig.Windows {
     public abstract class AdministrationWindow : ContextWindow {
 
-        protected Control[] ExemptInputs { get; set; }
-        protected Control[] RequiredInputs { get; set; }
+        protected Control[] ExemptInputs { private get; set; }
+        protected Control[] RequiredInputs { private get; set; }
 
         private bool _isEditing;
         private bool _isCreating;
@@ -166,10 +166,8 @@ namespace Elwig.Windows {
                     Valid[input] = false;
                 } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
-                    Valid[input] = false;
                 } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
-                    Valid[input] = false;
                 } else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
@@ -572,14 +570,6 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
 
-        protected void OrganicAuthorityCodeInput_TextChanged(object sender, TextChangedEventArgs? evt) {
-            InputTextChanged((TextBox)sender, Validator.CheckOrganicAuthorityCode);
-        }
-
-        protected void OrganicAuthorityCodeInput_LostFocus(object sender, RoutedEventArgs? evt) {
-            InputLostFocus((TextBox)sender, Validator.CheckOrganicAuthorityCode);
-        }
-
         protected void UpperCaseInput_TextChanged(object sender, TextChangedEventArgs? evt) {
             InputTextChanged((TextBox)sender, Validator.CheckUpperCase);
         }

Elwig/Windows/AreaComAdminWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860"
+        Title="{Binding Title}" Height="550" MinHeight="450" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
@@ -57,7 +57,7 @@
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*" MinWidth="500"/>
+            <ColumnDefinition Width="2*" MinWidth="555"/>
             <ColumnDefinition Width="5"/>
             <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
@@ -102,35 +102,25 @@
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
                       Margin="5,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr." Binding="{Binding FbNr, StringFormat='{}{0} '}" Width="50">
+                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/>
+                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/>
+                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/>
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50">
+                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Fläche" Binding="{Binding Area, StringFormat='{}{0:N0} m² '}" Width="80">
-                        <DataGridTextColumn.CellStyle>
-                            <Style>
-                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
-                            </Style>
-                        </DataGridTextColumn.CellStyle>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="100"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="130"/>
-                    <DataGridTextColumn Header="Bewirt."            Binding="{Binding WineCult.Name}" Width="60"/>
-                    <DataGridTextColumn Header="Von"                Binding="{Binding YearFrom}"      Width="48"/>
-                    <DataGridTextColumn Header="Bis"                Binding="{Binding YearTo}"        Width="48"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -153,19 +143,19 @@
                 </Button.ToolTip>
             </Button>
 
-            <Button x:Name="SaveButton" Content="Speichern" Click="SaveButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Strg+S</TextBlock>
                 </Button.ToolTip>
             </Button>
-            <Button x:Name="ResetButton" Content="Zurücksetzen" Click="ResetButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
                 </Button.ToolTip>
             </Button>
-            <Button x:Name="CancelButton" Content="Abbrechen" Click="CancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
+            <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2">
                 <Button.ToolTip>
                     <TextBlock FontWeight="Bold">Esc</TextBlock>
@@ -185,32 +175,33 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="48"/>
-                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="50"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False"
-                             Margin="0,10,0,0" Width="48" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"/>
-
-                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="FbNrInput" Text="{Binding FbNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Width="56" HorizontalAlignment="Left" Grid.Column="3" TextAlignment="Right"
+                             Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                    <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="False"
+                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
+
+                    <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
                     <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
+                             Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
-                    <Label Content="–" Grid.Column="1" Grid.ColumnSpan="3" Margin="45,40,0,0"/>
+
+                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
                     <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="3" TextAlignment="Right"
+                             Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
+                              DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
                               HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"/>
                     <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
                             Click="AreaComTypeDetailsButton_Click"

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -1,14 +1,13 @@
-using Elwig.Dialogs;
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using Elwig.Services;
-using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System;
+using System.Threading.Tasks;
+using Elwig.ViewModels;
+using Elwig.Services;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -26,8 +25,8 @@ namespace Elwig.Windows {
             ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ExemptInputs = [
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
-                EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
-                ResetButton, CancelButton, SearchInput, ActiveAreaCommitmentInput
+                EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
+                AreaCommitmentResetButton, AreaCommitmentCancelButton, SearchInput, ActiveAreaCommitmentInput
             ];
             RequiredInputs = [
                 FbNrInput, YearFromInput, KgInput, RdInput,
@@ -164,8 +163,8 @@ namespace Elwig.Windows {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
+            HideAreaCommitmentNewEditDeleteButtons();
+            ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
             await InitInputs();
             LockSearchInputs();
@@ -185,8 +184,8 @@ namespace Elwig.Windows {
             IsEditing = true;
             AreaCommitmentList.IsEnabled = false;
 
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
+            HideAreaCommitmentNewEditDeleteButtons();
+            ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
             LockSearchInputs();
         }
@@ -200,107 +199,70 @@ namespace Elwig.Windows {
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             if (AreaCommitmentList.SelectedItem is not AreaCom a)
                 return;
-
-            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true);
-            if (d.ShowDialog() != true)
-                return;
-
-            Mouse.OverrideCursor = Cursors.Wait;
-            try {
-                if (d.YearTo is int yearTo) {
-                    ViewModel.YearTo = yearTo;
-                    await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
-                } else {
-                    await AreaComService.DeleteAreaCom(a.FbNr);
+            var r = MessageBox.Show(
+                $"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;
+                try {
+                    using (var ctx = new AppDbContext()) {
+                        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;
+                    MessageBox.Show(str, "Flächenbindung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-                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;
-                MessageBox.Show(str, "Flächenbindung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                Mouse.OverrideCursor = null;
             }
-            Mouse.OverrideCursor = null;
         }
 
         protected override void ShortcutSave() {
-            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
+            if (!AreaCommitmentSaveButton.IsEnabled || AreaCommitmentSaveButton.Visibility != Visibility.Visible)
                 return;
-            SaveButton_Click(null, null);
+            AreaCommitmentSaveButton_Click(null, null);
         }
 
-        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            SaveButton.IsEnabled = false;
-
-            int? yearTo = null;
-            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput)) {
-                var a = (AreaCommitmentList.SelectedItem as AreaCom)!;
-                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false);
-                if (d.ShowDialog() != true)
-                    return;
-                yearTo = d.YearTo;
-            }
+        private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
+            AreaCommitmentSaveButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             int fbnr;
-            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                AreaCom? temp = null;
-                if (yearTo != null && (!ViewModel.YearTo.HasValue || yearTo < ViewModel.YearTo)) {
-                    temp = new AreaCom {
-                        FbNr = ViewModel.FbNr!.Value,
-                        MgNr = ViewModel.MgNr!.Value,
-                        YearFrom = ViewModel.YearFrom,
-                        YearTo = ViewModel.YearTo,
-                        VtrgId = ViewModel.AreaComType!.VtrgId,
-                        CultId = ViewModel.WineCult?.CultId,
-                        Comment = ViewModel.Comment,
-                        KgNr = ViewModel.Kg!.KgNr,
-                        RdNr = ViewModel.Rd?.RdNr,
-                        GstNr = ViewModel.GstNr?.Trim() ?? "-",
-                        Area = ViewModel.Area!.Value,
-                    };
-                    RefreshInputs();
-                    ViewModel.YearTo = yearTo;
-                }
                 fbnr = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
-                if (temp is AreaCom t) {
-                    await ViewModel.InitInputs();
-                    t.FbNr = ViewModel.FbNr!.Value;
-                    t.YearFrom = yearTo + 1;
-                    ViewModel.FillInputs(t);
-                    fbnr = await ViewModel.UpdateAreaCommitment(null);
-                }
-                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;
                 MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
-                SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
+                AreaCommitmentSaveButton.IsEnabled = true;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
+            HideAreaCommitmentSaveResetCancelButtons();
+            ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
             UnlockSearchInputs();
             FinishInputFilling();
             await RefreshList();
             RefreshInputs();
-            Mouse.OverrideCursor = null;
             ViewModel.SearchQuery = "";
             ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
         }
 
         protected override void ShortcutReset() {
-            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
+            if (!AreaCommitmentResetButton.IsEnabled || AreaCommitmentResetButton.Visibility != Visibility.Visible)
                 return;
-            ResetButton_Click(null, null);
+            AreaCommitmentResetButton_Click(null, null);
         }
 
-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
                 RefreshInputs();
             } else if (IsCreating) {
@@ -309,12 +271,12 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
+        private void AreaCommitmentCancelButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
+            HideAreaCommitmentSaveResetCancelButtons();
+            ShowAreaCommitmentNewEditDeleteButtons();
             RefreshInputs();
             ClearInputStates();
             LockInputs();
@@ -324,49 +286,49 @@ namespace Elwig.Windows {
         override protected void UpdateButtons() {
             if (!IsEditing && !IsCreating) return;
             bool ch = HasChanged, v = IsValid;
-            ResetButton.IsEnabled = (ch);
-            SaveButton.IsEnabled = (ch && v);
+            AreaCommitmentResetButton.IsEnabled = (ch);
+            AreaCommitmentSaveButton.IsEnabled = (ch && v);
         }
 
-        private void DisableNewEditDeleteButtons() {
+        private void DisableAreaCommitmentNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = false;
             EditAreaCommitmentButton.IsEnabled = false;
             DeleteAreaCommitmentButton.IsEnabled = false;
         }
 
-        private void EnableNewEditDeleteButtons() {
+        private void EnableAreaCommitmentNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = true;
             EditAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
             DeleteAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
         }
 
-        private void ShowSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = true;
-            SaveButton.Visibility = Visibility.Visible;
-            ResetButton.Visibility = Visibility.Visible;
-            CancelButton.Visibility = Visibility.Visible;
+        private void ShowAreaCommitmentSaveResetCancelButtons() {
+            AreaCommitmentSaveButton.IsEnabled = false;
+            AreaCommitmentResetButton.IsEnabled = false;
+            AreaCommitmentCancelButton.IsEnabled = true;
+            AreaCommitmentSaveButton.Visibility = Visibility.Visible;
+            AreaCommitmentResetButton.Visibility = Visibility.Visible;
+            AreaCommitmentCancelButton.Visibility = Visibility.Visible;
         }
 
-        private void HideSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = false;
-            SaveButton.Visibility = Visibility.Hidden;
-            ResetButton.Visibility = Visibility.Hidden;
-            CancelButton.Visibility = Visibility.Hidden;
+        private void HideAreaCommitmentSaveResetCancelButtons() {
+            AreaCommitmentSaveButton.IsEnabled = false;
+            AreaCommitmentResetButton.IsEnabled = false;
+            AreaCommitmentCancelButton.IsEnabled = false;
+            AreaCommitmentSaveButton.Visibility = Visibility.Hidden;
+            AreaCommitmentResetButton.Visibility = Visibility.Hidden;
+            AreaCommitmentCancelButton.Visibility = Visibility.Hidden;
         }
 
-        private void ShowNewEditDeleteButtons() {
-            EnableNewEditDeleteButtons();
+        private void ShowAreaCommitmentNewEditDeleteButtons() {
+            EnableAreaCommitmentNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Visible;
             EditAreaCommitmentButton.Visibility = Visibility.Visible;
             DeleteAreaCommitmentButton.Visibility = Visibility.Visible;
         }
 
-        private void HideNewEditDeleteButtons() {
-            DisableNewEditDeleteButtons();
+        private void HideAreaCommitmentNewEditDeleteButtons() {
+            DisableAreaCommitmentNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Hidden;
             EditAreaCommitmentButton.Visibility = Visibility.Hidden;
             DeleteAreaCommitmentButton.Visibility = Visibility.Hidden;
@@ -383,8 +345,6 @@ namespace Elwig.Windows {
         }
 
         private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            if (AreaCommitmentList.SelectedItem != null)
-                AreaCommitmentList.ScrollIntoView(AreaCommitmentList.SelectedItem);
             RefreshInputs();
         }
 

Elwig/Windows/BaseDataWindow.xaml

@@ -122,12 +122,6 @@
                              VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,130,10,10" Width="64"
                              TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                    <Label Content="Bio-Kontrollstelle:"
-                           VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,110,10"/>
-                    <TextBox x:Name="ClientOrganicAuthorityInput"
-                             VerticalAlignment="Top" HorizontalAlignment="Right" Grid.Column="3" Margin="10,130,10,10" Width="90"
-                             TextChanged="OrganicAuthorityCodeInput_TextChanged" LostFocus="OrganicAuthorityCodeInput_LostFocus"/>
-
                     <Label Content="Telefon-Nr.:"
                            VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,160,0,10"/>
                     <TextBox x:Name="ClientPhoneNrInput" Margin="0,160,10,10" Grid.Column="3"
@@ -336,7 +330,7 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding SortId}" Width="30" Foreground="{Binding WineVar.Color}"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
                                     <TextBlock Text="{Binding WineAttr.Name}" Width="70"/>
                                     <TextBlock Text="{Binding Discriminator}"/>
                                 </StackPanel>

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.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 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.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Remove(s);

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -318,7 +318,8 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
             try {
                 await Save();
             } catch (Exception exc) {
@@ -326,8 +327,9 @@ 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;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -347,7 +349,6 @@ namespace Elwig.Windows {
             }
 
             App.HintContextChange();
-            Mouse.OverrideCursor = null;
         }
 
         private void FillInputs(ClientParameters p, Season? s) {
@@ -366,7 +367,6 @@ namespace Elwig.Windows {
             ClientBicInput.Text = p.Bic;
             ClientUstIdNrInput.Text = p.UstIdNr;
             ClientLfbisNrInput.Text = p.LfbisNr;
-            ClientOrganicAuthorityInput.Text = p.OrganicAuthority;
             ClientPhoneNrInput.Text = p.PhoneNr;
             ClientFaxNrInput.Text = p.FaxNr;
             ClientEmailAddressInput.Text = p.EmailAddress;
@@ -393,27 +393,26 @@ namespace Elwig.Windows {
 
         private async Task UpdateClientParameters(ClientParameters p) {
             p.Name = ClientNameInput.Text;
-            p.NameSuffix = string.IsNullOrEmpty(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
+            p.NameSuffix = ClientNameSuffixInput.Text.Length > 0 ? ClientNameSuffixInput.Text : null;
             p.NameType = ClientNameTypeInput.Text;
             p.NameToken = ClientNameTokenInput.Text;
             p.NameShort = ClientNameShortInput.Text;
             p.Address = ClientAddressInput.Text;
             p.Plz = int.Parse(ClientPlzInput.Text);
             p.Ort = ClientOrtInput.Text;
-            p.Iban = string.IsNullOrEmpty(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
-            p.Bic = string.IsNullOrEmpty(ClientBicInput.Text) ? null : ClientBicInput.Text;
-            p.UstIdNr = string.IsNullOrEmpty(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
-            p.LfbisNr = string.IsNullOrEmpty(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
-            p.OrganicAuthority = string.IsNullOrEmpty(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
-            p.PhoneNr = string.IsNullOrEmpty(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
-            p.FaxNr = string.IsNullOrEmpty(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
-            p.EmailAddress = string.IsNullOrEmpty(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
-            p.Website = string.IsNullOrEmpty(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
+            p.Iban = ClientIbanInput.Text.Length > 0 ? ClientIbanInput.Text : null;
+            p.Bic = ClientBicInput.Text.Length > 0 ? ClientBicInput.Text : null;
+            p.UstIdNr = ClientUstIdNrInput.Text.Length > 0 ? ClientUstIdNrInput.Text : null;
+            p.LfbisNr = ClientLfbisNrInput.Text.Length > 0 ? ClientLfbisNrInput.Text : null;
+            p.PhoneNr = ClientPhoneNrInput.Text.Length > 0 ? ClientPhoneNrInput.Text : null;
+            p.FaxNr = ClientFaxNrInput.Text.Length > 0 ? ClientFaxNrInput.Text : null;
+            p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
+            p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.Text : null;
 
-            p.TextDeliveryNote = string.IsNullOrEmpty(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
+            p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
             p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
-            p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
-            p.TextCreditNote = string.IsNullOrEmpty(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
+            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+            p.TextCreditNote = TextElementCreditNote.Text.Length > 0 ? TextElementCreditNote.Text : null;
 
             p.ExportEbicsVersion = ParameterExportEbicsVersion.SelectedIndex + 3;
             p.ExportEbicsAddress = ParameterExportEbicsAddress.SelectedIndex;

Elwig/Windows/ChartWindow.xaml

@@ -75,8 +75,8 @@
                 <ctrl:CheckComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding Variety.Name}" Foreground="{Binding Variety.Color}" Width="150"/>
-                            <TextBlock Text="{Binding Variety.Type}" Foreground="{Binding Variety.Color}" Width="30"/>
+                            <TextBlock Text="{Binding Variety.Name}" Width="150"/>
+                            <TextBlock Text="{Binding Variety.Type}" Width="30"/>
                             <TextBlock Text="{Binding Attribute.Name}" Width="80"/>
                             <TextBlock Text="{Binding Cultivation.Name}" Width="80"/>
                             <TextBlock Text="{Binding AssignedGraphId}" Width="30"/>
@@ -94,14 +94,14 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="{Binding Id}" Foreground="{Binding Color}" Width="30"/>
-                        <TextBlock Text="{Binding VaributeStringSimple}" Foreground="{Binding Color}"  ToolTip="{Binding VaributeString}"/>
+                        <TextBlock Text="{Binding Id}" Width="30"/>
+                        <TextBlock Text="{Binding VaributeStringSimple}" ToolTip="{Binding VaributeString}"/>
                     </StackPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="SaveButton" Content="Speichern &amp; Berechnen" IsEnabled="False"
+        <Button x:Name="SaveButton" Content="Speichern" 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

@@ -639,11 +639,10 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             try {
-                await Task.Run(async () => {
-                    using var ctx = new AppDbContext();
+                using (var ctx = new AppDbContext()) {
                     var origData = BillingData.FromJson(PaymentVar.Data);
                     var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
                         AllVaributesAssigned, AllVaributesAssignedAbgew);
@@ -651,33 +650,21 @@ namespace Elwig.Windows {
                     PaymentVar.Data = data.ToJsonString();
                     ctx.Update(PaymentVar);
                     await ctx.SaveChangesAsync();
-                });
+                }
+                LockContext = false;
+                App.HintContextChange();
             } catch (Exception exc) {
-                Mouse.OverrideCursor = null;
                 var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante speichern", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
-            try {
-                await Task.Run(async () => {
-                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
-                    await b.Calculate(false);
-                });
-            } catch (KeyNotFoundException exc) {
-                MessageBox.Show(exc.Message, "Noch nicht alle Preise festgelegt", MessageBoxButton.OK, MessageBoxImage.Information);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-
-            LockContext = false;
-            App.HintContextChange();
             LockContext = true;
             SetHasChanged(false);
-
-            Mouse.OverrideCursor = null;
         }
 
         private void EnableTextBox(TextBox u) {

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 Menge der gesamten Lieferung)<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht 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/>
@@ -265,20 +265,14 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredVaributeString}" Width="60">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredSortIdString}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding FilteredColor}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
-                        <DataGridTextColumn.ElementStyle>
-                            <Style TargetType="TextBlock">
-                                <Setter Property="TextTrimming" Value="CharacterEllipsis"/>
-                            </Style>
-                        </DataGridTextColumn.ElementStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
+                    <DataGridTextColumn Header="Gewicht" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -295,7 +289,6 @@
                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
                     <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                     <DataGridTextColumn Header="Zu-/Abschläge" Binding="{Binding FilteredModifiersString}" Width="150"/>
-                    <DataGridTextColumn Header="Kommentar" Binding="{Binding CommentsString}" Width="150"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -445,7 +438,7 @@
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{Binding DPNr}" Width="13" TextAlignment="Right" Margin="0,0,7,0"/>
-                                    <TextBlock Text="{Binding SortId}" Foreground="{Binding Variety.Color}" TextAlignment="Center" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
                                     <TextBlock Text="{Binding Kmw, StringFormat='{}{0:N1}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
                                     <TextBlock Text="{Binding QualId}" Width="30"/>
                                     <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
@@ -467,7 +460,7 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVar.Color}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
                              TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
                     <ComboBox x:Name="WineVarietyInput" SelectedItem="{Binding WineVar, Mode=TwoWay}" ItemsSource="{Binding WineVarSource, Mode=TwoWay}"
@@ -523,7 +516,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="70"/>
@@ -676,7 +669,7 @@
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Menge: <Run Text="{Binding StatusWeight}"/>
+                    Gewicht: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -8,7 +8,6 @@ using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -35,8 +34,6 @@ namespace Elwig.Windows {
 
         private readonly Button[] WeighingButtons;
 
-        private List<WineQualLevel> WineQualityLevels = [];
-
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
@@ -92,9 +89,6 @@ namespace Elwig.Windows {
                 foreach (var s in App.EventScales) {
                     s.WeighingEvent += Scale_Weighing;
                 }
-                if (App.Client.IsMatzen) {
-                    RequiredInputs = [.. RequiredInputs, ModifiersInput];
-                }
             } else {
                 WeighingManualButton.Visibility = Visibility.Hidden;
                 WeighingAButton.Visibility = Visibility.Hidden;
@@ -284,7 +278,6 @@ namespace Elwig.Windows {
                 DateInput.IsReadOnly = false;
                 TimeInput.IsReadOnly = false;
                 BranchInput.IsEnabled = true;
-                GerebeltGewogenInput.IsEnabled = true;
                 if (IsCreating) ViewModel.Time = "";
                 OnSecondPassed(null, null);
             }
@@ -294,7 +287,6 @@ namespace Elwig.Windows {
             DateInput.IsReadOnly = true;
             TimeInput.IsReadOnly = true;
             BranchInput.IsEnabled = false;
-            GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode != WeighingMode.Net;
             OnSecondPassed(null, null);
         }
 
@@ -309,7 +301,7 @@ namespace Elwig.Windows {
         }
 
         private void InitialDefaultInputs() {
-            if (App.Config.WeighingMode == WeighingMode.Net) {
+            if (App.Client.HasNetWeighing(ViewModel.Branch)) {
                 GerebeltGewogenInput.IsEnabled = false;
                 SetDefaultValue(GerebeltGewogenInput, true);
             } else {
@@ -318,7 +310,7 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
 
-            if (App.Config.WeighingMode == WeighingMode.Box) {
+            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
                 LesewagenInput.IsEnabled = false;
                 SetDefaultValue(LesewagenInput, false);
             } else {
@@ -326,7 +318,7 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(LesewagenInput);
             }
 
-            if (App.Config.WeighingMode != WeighingMode.Net) {
+            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
                 HandPickedInput.IsThreeState = false;
                 UnsetDefaultValue(HandPickedInput);
             } else {
@@ -352,13 +344,13 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
 
-            ViewModel.IsNetWeight = App.Config.WeighingMode == WeighingMode.Net;
+            ViewModel.IsNetWeight = App.Client.HasNetWeighing(ViewModel.Branch);
             ViewModel.IsLesewagen = false;
-            ViewModel.IsHandPicked = App.Config.WeighingMode != WeighingMode.Net ? true : null;
+            ViewModel.IsHandPicked = !App.Client.HasNetWeighing(ViewModel.Branch) ? true : null;
             ViewModel.IsGebunden = null;
             InitialDefaultInputs();
 
-            //WineQualityLevelInput.IsEnabled = false;  // disable wine quality level input in Übernahme
+            WineQualityLevelInput.IsEnabled = false;
             ValidateRequiredInputs();
         }
 
@@ -486,8 +478,7 @@ namespace Elwig.Windows {
             var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
-            WineQualityLevels = await ctx.WineQualityLevels.ToListAsync();
-            ControlUtils.RenewItemsSource(WineQualityLevelInput, WineQualityLevels);
+            ControlUtils.RenewItemsSource(WineQualityLevelInput, await ctx.WineQualityLevels.ToListAsync());
             ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
                 .Where(m => m.Year == y && (!IsCreating || m.IsActive))
                 .OrderBy(m => m.Ordering)
@@ -728,7 +719,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -741,7 +732,6 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
-                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;
@@ -767,7 +757,7 @@ namespace Elwig.Windows {
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -780,7 +770,6 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
-                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;
@@ -899,7 +888,7 @@ namespace Elwig.Windows {
             if (res == null)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 var id = res.Value.Item1;
                 var weights = res.Value.Item2;
@@ -916,7 +905,6 @@ namespace Elwig.Windows {
                     var n = await DeliveryService.SplitDeliveryToLsNr(d.Year, d.DId, weights, id);
                     ControlUtils.SelectItemWithPk(DeliveryList, n.Year, n.DId);
                 }
-                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;
@@ -971,10 +959,9 @@ 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.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     await DeliveryService.DeleteDelivery(d.LsNr);
-                    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;
@@ -992,7 +979,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
 
             DeliveryPart? p;
             try {
@@ -1004,14 +991,14 @@ namespace Elwig.Windows {
                     InputHasChanged(TimeInput),
                     !InputIsNotDefault(TimeInput)
                 );
-                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;
                 MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -1028,7 +1015,6 @@ namespace Elwig.Windows {
             await RefreshDeliveryParts();
             RefreshInputs();
 
-            Mouse.OverrideCursor = null;
             DepreciateButton.IsEnabled = true;
         }
 
@@ -1148,7 +1134,6 @@ namespace Elwig.Windows {
             DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
             TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
             BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
-            GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode == WeighingMode.Net || Menu_Settings_EnableFreeEditing.IsChecked;
         }
 
         private void DisableWeighingButtons() {
@@ -1211,7 +1196,6 @@ namespace Elwig.Windows {
                 AttributeInput.SelectedIndex = 0;
                 CultivationInput.SelectedIndex = 0;
             }
-            UpdateWineQualityLevels();
         }
 
         private void SortIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -1225,39 +1209,19 @@ namespace Elwig.Windows {
         private void WineVarietyInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (WineVarietyInput.SelectedItem is WineVar s)
                 ViewModel.SortId = s.SortId;
-            UpdateWineQualityLevels();
-            if (!ViewModel.WineVar?.IsQuw ?? false) {
-                App.MainDispatcher.BeginInvoke(() => {
-                    MessageBox.Show("Die eingegebene Sorte darf nicht als Qualitätswein\nübernommen werden!", "Kein Qualitätswein",
-                        MessageBoxButton.OK, MessageBoxImage.Warning);
-                });
-            }
-        }
-
-        private WineQualLevel GetWineQualityLevel(double kmw, string? maxQualId = null) {
-            return WineQualityLevels
-                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
-                .Where(q => maxQualId == null || q.QualId == "WEI" || q.QualId == maxQualId)
-                .OrderBy(q => q.MinKmw)
-                .Last();
         }
 
         private void UpdateWineQualityLevels() {
+            using var ctx = new AppDbContext();
             if (!GetInputValid(GradationKmwInput)) {
                 UnsetDefaultValue(WineQualityLevelInput);
                 ComboBox_SelectionChanged(WineQualityLevelInput, null);
-                WineQualityLevelInput.ItemsSource = WineQualityLevels;
-                WineQualityLevelInput.SelectedItem = null;
+                WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.QualId == "WEI").ToList();
                 return;
             }
             var kmw = (double)ViewModel.GradationKmw!;
-            var max = ViewModel.WineVar?.MaxQualId;
-            var quw = ViewModel.WineVar?.IsQuw ?? true;
-            WineQualityLevelInput.ItemsSource = WineQualityLevels
-                .Where(q => q.MinKmw == null || q.MinKmw <= kmw)
-                .Where(q => quw || q.QualId == "WEI" || q.QualId == max)
-                .ToList();
-            var qual = GetWineQualityLevel(kmw, !quw ? max : null);
+            WineQualityLevelInput.ItemsSource = ctx.WineQualityLevels.Where(q => q.MinKmw == null || q.MinKmw <= kmw).ToList();
+            var qual = ctx.GetWineQualityLevel(kmw).GetAwaiter().GetResult();
             SetDefaultValue(WineQualityLevelInput, qual);
             if (WineQualityLevelInput.SelectedItem == null || (WineQualityLevelInput.SelectedItem is WineQualLevel selected && !selected.IsPredicate)) {
                 ControlUtils.SelectItem(WineQualityLevelInput, qual);
@@ -1397,7 +1361,8 @@ namespace Elwig.Windows {
                 AbgewertetInput.IsChecked = false;
                 return;
             }
-            var defQual = GetWineQualityLevel(ViewModel.GradationKmw!.Value, !(ViewModel.WineVar?.IsQuw ?? true) ? ViewModel.WineVar?.MaxQualId : null);
+            using var ctx = new AppDbContext();
+            var defQual = ctx.GetWineQualityLevel(double.Parse(GradationKmwInput.Text)).GetAwaiter().GetResult();
             AbgewertetInput.IsChecked = !qual.IsPredicate && defQual != qual;
         }
 
@@ -1419,17 +1384,17 @@ namespace Elwig.Windows {
         }
 
         private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                 HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
             }
-            if (!ViewModel.IsReceipt || App.Config.WeighingMode == WeighingMode.Net) {
+            if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
                 GerebeltGewogenInput.IsChecked ??= false;
             }
             CheckBox_Changed(sender, evt);
         }
 
         private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
+            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>Menge</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Gewicht</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>
@@ -187,19 +187,18 @@
                     <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding Variety.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Menge" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedAt, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
+                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedTimestamp, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
@@ -317,7 +316,7 @@
                     </ComboBox>
 
                     <Label Content="Sorte:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVariety.Color}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Width="36" Grid.Row="1" Grid.Column="1" Margin="0,40,0,0" HorizontalAlignment="Left"
                              TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
                     <ComboBox x:Name="WineVarietyInput" SelectedItem="{Binding WineVariety, Mode=TwoWay}" ItemsSource="{Binding WineVarietySource, Mode=TwoWay}"
@@ -329,7 +328,7 @@
                         </ComboBox.ItemTemplateSelector>
                     </ComboBox>
 
-                    <Label Content="Menge:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Gewicht:" 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"/>
@@ -365,7 +364,7 @@
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Menge: <Run Text="{Binding StatusWeight}"/>
+                    Gewicht: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="3"/>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -83,19 +83,14 @@ namespace Elwig.Windows {
 
         private async Task RefreshDeliveryScheduleList() {
             using var ctx = new AppDbContext();
-            var list = await ctx.DeliverySchedules
+            var deliverySchedules = await ctx.DeliverySchedules
                 .Where(s => s.Year == ViewModel.FilterSeason)
                 .Include(s => s.Branch)
+                .Include(s => s.Announcements)
                 .OrderBy(s => s.DateString)
                 .ThenBy(s => s.Branch.Name)
                 .ThenBy(s => s.Description)
-                .Select(s => new {
-                    Schedule = s,
-                    AnnouncedWeight = s.Announcements.Sum(a => a.Weight)
-                })
                 .ToListAsync();
-            list.ForEach(v => v.Schedule.AnnouncedWeightOverride = v.AnnouncedWeight);
-            var deliverySchedules = list.Select(v => v.Schedule).ToList();
             ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
                 .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
                 .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
@@ -108,7 +103,6 @@ namespace Elwig.Windows {
             var deliveryAncmts = await deliveryAncmtQuery
                 .Include(a => a.Member.BillingAddress)
                 .Include(a => a.Schedule)
-                .Include(a => a.Variety)
                 .AsSplitQuery()
                 .ToListAsync();
 
@@ -323,13 +317,12 @@ namespace Elwig.Windows {
                 $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
                 "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
-                    await Task.Run(async () => {
-                        using var ctx = new AppDbContext();
+                    using (var ctx = new AppDbContext()) {
                         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;
@@ -347,7 +340,7 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             SaveButton.IsEnabled = false;
 
             int year = -1, dsnr = -1, mgnr = -1;
@@ -355,7 +348,6 @@ namespace Elwig.Windows {
             try {
                 var s = ViewModel.SelectedDeliveryAncmt;
                 (year, dsnr, mgnr, sortid) = await ViewModel.UpdateDeliveryAncmt(s?.Year, s?.DsNr, s?.MgNr, s?.SortId, s?.Type);
-                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;

Elwig/Windows/DeliveryScheduleAdminWindow.xaml

@@ -127,7 +127,7 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Beschreibung" Binding="{Binding Description}" Width="200"/>
-                    <DataGridTextColumn Header="Max. Mg." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                    <DataGridTextColumn Header="Max. Gew." 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. Menge:" Margin="10,70,0,10"/>
+                    <Label Content="Max. Gewicht:" 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/DeliveryScheduleAdminWindow.xaml.cs

@@ -177,13 +177,12 @@ namespace Elwig.Windows {
                 $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?",
                 "Leseplan löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
-                    await Task.Run(async () => {
-                        using var ctx = new AppDbContext();
+                    using (var ctx = new AppDbContext()) {
                         ctx.Remove(s);
                         await ctx.SaveChangesAsync();
-                    });
+                    }
                     App.HintContextChange();
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -201,12 +200,11 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             SaveButton.IsEnabled = false;
 
             try {
                 await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr);
-                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;

Elwig/Windows/LogWindow.xaml.cs

@@ -1,9 +1,7 @@
 using Elwig.Helpers;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Input;
 
 namespace Elwig.Windows {
     public partial class LogWindow : Window {
@@ -13,34 +11,28 @@ namespace Elwig.Windows {
             WindowState = WindowState.Maximized;
         }
 
-        private async void Window_Loaded(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                var list = Utils.GetLogEntries()
-                  .Select(e => new {
-                      Event = e,
-                      Lines = e.Message.Split('\n').ToArray(),
-                  })
-                  .Select(e => new {
-                      e.Event,
-                      Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
-                      Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
-                  })
-                  .Select(e => new {
-                      e.Event,
-                      e.Exception,
-                      ExceptionName = e.Exception?[0].Trim(),
-                      ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
-                      e.Location,
-                  })
-                  .OrderByDescending(e => e.Event.TimeGenerated)
-                  .ToList();
-                await App.MainDispatcher.BeginInvoke(() => {
-                    EventList.ItemsSource = list;
-                    EventList.SelectedIndex = 0;
-                });
-            });
-            Mouse.OverrideCursor = null;
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            var log = Utils.GetLogEntries();
+            EventList.ItemsSource = log
+                .Select(e => new {
+                    Event = e,
+                    Lines = e.Message.Split('\n').ToArray(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
+                    Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    e.Exception,
+                    ExceptionName = e.Exception?[0].Trim(),
+                    ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
+                    e.Location,
+                })
+                .OrderByDescending(e => e.Event.TimeGenerated)
+                .ToList();
+            EventList.SelectedIndex = 0;
         }
 
         private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {

Elwig/Windows/MailLogWindow.xaml

@@ -3,8 +3,7 @@
         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"
-        Loaded="Window_Loaded">
+        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="3*"/>

Elwig/Windows/MailLogWindow.xaml.cs

@@ -2,7 +2,6 @@ using Elwig.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -19,16 +18,8 @@ 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

@@ -602,7 +602,7 @@ namespace Elwig.Windows {
             PreviewButton.IsEnabled = false;
             PrintButton.IsEnabled = false;
             EmailButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             GenerateButton.IsEnabled = false;
 
             DisposeDocs();
@@ -671,7 +671,7 @@ namespace Elwig.Windows {
                     var avnr = details.Item2;
                     try {
                         cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, 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)
                         );
@@ -738,7 +738,7 @@ namespace Elwig.Windows {
                 PostalNoEmailInput.IsChecked == true ? 1 : 0;
             var emailMode = EmailAllInput.IsChecked == true ? 2 : EmailWishInput.IsChecked == true ? 1 : 0;
 
-            double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 1 ? PostalNoEmailCount : 0;
+            double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 2 ? PostalNoEmailCount : 0;
             double emailNum = emailMode == 2 ? EmailAllCount : emailMode == 1 ? EmailWishCount : 0;
             double totalNum = printNum + emailNum;
 
@@ -828,27 +828,25 @@ namespace Elwig.Windows {
             EmailButton.IsEnabled = EmailDocuments != null && App.Config.Smtp != null;
         }
 
-        private async void PreviewButton_Click(object sender, RoutedEventArgs evt) {
+        private void PreviewButton_Click(object sender, RoutedEventArgs evt) {
             var d = new OpenFolderDialog() {
                 Title = "Ordner auswählen - Elwig",
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(() => {
-                    PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
-                    if (EmailDocuments != null) {
-                        foreach (var (m, docs) in EmailDocuments) {
-                            var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
-                            Directory.CreateDirectory(folder);
-                            foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
-                                var doc = item.Doc;
-                                var name = Utils.NormalizeFileName(doc.Title);
-                                doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
-                            }
-
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
+                if (EmailDocuments != null) {
+                    foreach (var (m, docs) in EmailDocuments) {
+                        var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
+                        Directory.CreateDirectory(folder);
+                        foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
+                            var doc = item.Doc;
+                            var name = Utils.NormalizeFileName(doc.Title);
+                            doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
                         }
+
                     }
-                });
+                }
                 Mouse.OverrideCursor = null;
                 Process.Start("explorer.exe", d.FolderName);
             }
@@ -864,22 +862,20 @@ namespace Elwig.Windows {
             var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?",
                 "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
             if (res == MessageBoxResult.Yes) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                await Task.Run(async () => {
-                    if (App.Config.Debug) {
-                        PrintDocument.Show();
-                    } else {
-                        await PrintDocument.Print();
-                        await Utils.AddSentMails(
-                            PrintMemberDocuments.Select(d => (
-                                "postal", d.Key.MgNr, d.Key.AdministrativeName,
-                                new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
-                                d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
-                                d.Value.Select(d => d.Title).ToArray()
-                            ))
-                        );
-                    }
-                });
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                if (App.Config.Debug) {
+                    PrintDocument.Show();
+                } else {
+                    await PrintDocument.Print();
+                    await Utils.AddSentMails(
+                        PrintMemberDocuments.Select(d => (
+                            "postal", d.Key.MgNr, d.Key.AdministrativeName,
+                            new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
+                            d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
+                            d.Value.Select(d => d.Title).ToArray()
+                        ))
+                    );
+                }
                 Mouse.OverrideCursor = null;
             }
 
@@ -897,8 +893,8 @@ namespace Elwig.Windows {
 
             SmtpClient? client = null;
             try {
-                Mouse.OverrideCursor = Cursors.Wait;
-                client = await Task.Run(Utils.GetSmtpClient);
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await Utils.GetSmtpClient();
                 Mouse.OverrideCursor = null;
 
                 var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
@@ -907,33 +903,31 @@ namespace Elwig.Windows {
                     return;
                 }
 
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 var subject = EmailSubjectInput.Text;
                 var text = EmailBodyInput.Text;
-                await Task.Run(async () => {
-                    await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
-                    foreach (var (m, docs) in EmailDocuments) {
-                        using var msg = new MimeMessage();
-                        msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                        msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
-                        msg.Subject = subject;
-                        var body = new Multipart("mixed") {
-                            new TextPart("plain") { Text = text }
-                        };
-                        foreach (var doc in docs) {
-                            var name = Utils.NormalizeFileName(doc.Title);
-                            body.Add(doc.AsEmailAttachment($"{name}.pdf"));
-                        }
-                        msg.Body = body;
-                        await client!.SendAsync(msg);
-                        await Utils.AddSentMails([(
-                            "email", m.MgNr, m.AdministrativeName,
-                            m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
-                            subject,
-                            docs.Select(d => d.Title).ToArray()
-                        )]);
+                await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
+                foreach (var (m, docs) in EmailDocuments) {
+                    using var msg = new MimeMessage();
+                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                    msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
+                    msg.Subject = subject;
+                    var body = new Multipart("mixed") {
+                        new TextPart("plain") { Text = text }
+                    };
+                    foreach (var doc in docs) {
+                        var name = Utils.NormalizeFileName(doc.Title);
+                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
                     }
-                });
+                    msg.Body = body;
+                    await client!.SendAsync(msg);
+                    await Utils.AddSentMails([(
+                        "email", m.MgNr, m.AdministrativeName,
+                        m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
+                        subject,
+                        docs.Select(d => d.Title).ToArray()
+                    )]);
+                }
 
                 MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
@@ -954,7 +948,7 @@ namespace Elwig.Windows {
             AvaiableDocumentsList.SelectedIndex = 1;
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation))
                 return;
-            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, Year));
+            SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
             RecipientsDeliveryMembersInput.IsChecked = true;
         }

Elwig/Windows/MainWindow.xaml

@@ -31,17 +31,6 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator/>
-                <MenuItem Header="Datenbank sichern..." Click="Menu_Database_Backup_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA35;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Datenbank wiederherstellen..." Click="Menu_Database_Restore_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE777;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <Separator/>
                 <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE756;"/>
@@ -52,17 +41,6 @@
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xED25;"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <Separator/>
-                <MenuItem x:Name="Menu_Database_Upload" Header="Datenbank hochladen..." Click="Menu_Database_Upload_Click">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE898;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem x:Name="Menu_Database_Download" Header="Datenbank herunterladen..." Click="Menu_Database_Download_Click" IsEnabled="False">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE896;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
             </MenuItem>
             <MenuItem Header="Waage">
                 <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click">
@@ -72,7 +50,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem x:Name="HelpMenu" Header="Hilfe">
-                <MenuItem Header="Über" Click="Menu_Help_About_Click">
+                <MenuItem Header="Über">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE946;"/>
                     </MenuItem.Icon>
@@ -229,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 der Menge nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
+                        ToolTip="Aufschlüsselung des Gewichts 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"/>
@@ -274,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>Menge</Bold></TextBlock>
+                    <TextBlock Grid.Row="0" Grid.Column="2" TextAlignment="Right"><Bold>Gewicht</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

@@ -31,8 +31,6 @@ namespace Elwig.Windows {
             Menu_Help_Smtp.IsEnabled = App.Config.Smtp != null;
             DownloadButton.Visibility = App.Config.SyncUrl != null ? Visibility.Visible : Visibility.Hidden;
             UploadButton.Visibility = App.Config.SyncUrl != null ? Visibility.Visible : Visibility.Hidden;
-            Menu_Database_Upload.IsEnabled = App.Config.SyncUrl != null;
-            Menu_Database_Download.IsEnabled = App.Config.SyncUrl != null;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
@@ -59,17 +57,12 @@ namespace Elwig.Windows {
             }
         }
 
-        private void Menu_Help_About_Click(object sender, RoutedEventArgs evt) {
-            var w = new AboutWindow();
-            w.Show();
-        }
-
         private async void Menu_Help_Update_Click(object sender, RoutedEventArgs evt) {
             await App.CheckForUpdates(true);
         }
 
         private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 using var client = await Utils.GetSmtpClient();
                 await client!.DisconnectAsync(true);
@@ -140,54 +133,8 @@ namespace Elwig.Windows {
                     Multiselect = true,
                 };
                 if (d.ShowDialog() == true) {
-                    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);
-            }
-            Mouse.OverrideCursor = null;
-        }
-
-        private async void Menu_Database_Backup_Click(object sender, RoutedEventArgs evt) {
-            try {
-                var d = new SaveFileDialog() {
-                    Title = "Datenbank sichern - Elwig",
-                    FileName = $"database_{Utils.Today:yyyy-MM-dd}.sql.zip",
-                    DefaultExt = "sql.zip",
-                    Filter = "Komprimierte SQL-Datei (*.sql.zip)|*.sql.zip",
-                    AddExtension = false,
-                };
-                if (d.ShowDialog() == true) {
-                    if (!d.FileName.EndsWith(".sql.zip")) d.FileName += ".sql.zip";
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await Task.Run(async () => {
-                        await Database.ExportSql(d.FileName, true);
-                    });
-                }
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            Mouse.OverrideCursor = null;
-        }
-
-        private async void Menu_Database_Restore_Click(object sender, RoutedEventArgs evt) {
-            try {
-                var d = new OpenFileDialog() {
-                    Title = "Datenbank wiederherstellen - Elwig",
-                    DefaultExt = "sql.zip",
-                    Filter = "SQLite-Datenbank (*.sqlite3, *.sqlite3.zip, *.sql, *.sql.zip)|*.sqlite3;*.sqlite3.zip;*.sql;*.sql.zip",
-                };
-                if (d.ShowDialog() == true) {
-                    var res = MessageBox.Show("Soll die Datenbank wirklich unwiederruflich durch die wiederhergestellte Version ersetzt werden?", "Datenbank wiederherstellen",
-                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    if (res != MessageBoxResult.OK)
-                        return;
-
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await App.ReplaceDatabase(d.FileName);
+                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -198,173 +145,77 @@ namespace Elwig.Windows {
         private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            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
-                        .Select(f => new {
-                            Name = f!["name"]!.AsValue().GetValue<string>(),
-                            Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
-                            ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
-                            Device = f!["meta"]?["device"]?.AsValue().GetValue<string>(),
-                            Url = f!["url"]!.AsValue().GetValue<string>(),
-                            Size = f!["size"]!.AsValue().GetValue<long>(),
-                        })
-                        .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
-                        .ToList();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                var files = data
+                    .Select(f => new {
+                        Name = f!["name"]!.AsValue().GetValue<string>(),
+                        Timestamp = f!["timestamp"] != null && DateTime.TryParseExact(f!["timestamp"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
+                        ZwstId = f!["meta"]?["zwstid"]?.AsValue().GetValue<string>() ?? f!["zwstid"]?.AsValue().GetValue<string>(),
+                        Device = f!["meta"]?["device"]!.AsValue().GetValue<string>(),
+                        Url = f!["url"]!.AsValue().GetValue<string>(),
+                        Size = f!["size"]!.AsValue().GetValue<long>(),
+                    })
+                    .Where(f => f.Timestamp >= new DateTime(Utils.CurrentLastSeason, 7, 1))
+                    .ToList();
 
-                    var imported = await ElwigData.GetImportedFiles();
-                    var import = files
-                        .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
-                        .ToList();
-                    var paths = new List<string>();
-                    using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
-                        foreach (var f in import) {
-                            var filename = Path.Combine(App.TempPath, f.Name);
-                            using var stream = new FileStream(filename, FileMode.Create);
-                            await client.DownloadAsync(f.Url, stream);
-                            paths.Add(filename);
-                        }
+                var imported = await ElwigData.GetImportedFiles();
+                var import = files
+                    .Where(f => f.Device != Environment.MachineName && !imported.Contains(f.Name))
+                    .ToList();
+                var paths = new List<string>();
+                using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
+                    foreach (var f in import) {
+                        var filename = Path.Combine(App.TempPath, f.Name);
+                        using var stream = new FileStream(filename, FileMode.Create);
+                        await client.DownloadAsync(f.Url, stream);
+                        paths.Add(filename);
                     }
-                    await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            });
+                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
+            } catch (HttpRequestException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } catch (TaskCanceledException exc) {
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } 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.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();
-                    var deliveries = await ctx.Deliveries
-                        .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
-                        .Include(d => d.Parts)
-                        .ThenInclude(p => p.PartModifiers)
-                        .Include(d => d.Parts)
-                        .ThenInclude(p => p.Kg)
-                        .ThenInclude(k => k!.Gl)
-                        .OrderBy(d => d.DateString)
-                        .ThenBy(d => d.TimeString)
-                        .ThenBy(d => d.LsNr)
-                        .AsSplitQuery()
-                        .ToListAsync();
-                    var wbKgs = deliveries
-                        .SelectMany(d => d.Parts)
-                        .Where(p => p.Kg != null)
-                        .Select(p => p.Kg!)
-                        .DistinctBy(k => k.KgNr)
-                        .ToList();
-                    if (deliveries.Count == 0) {
-                        MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                    } else {
-                        await ElwigData.Export(path, deliveries, wbKgs, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
-                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
-                            MessageBoxButton.OK, MessageBoxImage.Information);
-                    }
-                } 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, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
-            Mouse.OverrideCursor = null;
-        }
-
-        private async void Menu_Database_Download_Click(object sender, RoutedEventArgs evt) {
-            if (App.Config.SyncUrl == null)
-                return;
-            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
-                        .Select(f => new {
-                            Name = f!["name"]!.AsValue().GetValue<string>(),
-                            Timestamp = f!["modified"] != null && DateTime.TryParseExact(f!["modified"]!.AsValue().GetValue<string>(), "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? dt : (DateTime?)null,
-                            Url = f!["url"]!.AsValue().GetValue<string>(),
-                            Size = f!["size"]!.AsValue().GetValue<long>(),
-                        })
-                        .Where(f => f.Name.StartsWith("database.") && f.Name.EndsWith(".zip"))
-                        .OrderBy(f => f.Size)
-                        .ToList();
-
-                    if (files.Count == 0) {
-                        MessageBox.Show("Die Datenbank wurde noch nicht vom Hauptgerät hochgeladen!", "Datenbank herunterladen",
-                            MessageBoxButton.OK, MessageBoxImage.Error);
-                        return;
-                    }
-                    var file = files[0];
-
-                    var res = MessageBox.Show($"Es wurde eine komprimierte Datenbank (ca. {file.Size / 1024 / 1024} MB) vom {file.Timestamp:dd.MM.yyyy, HH:mm} gefunden.\n\nWollen Sie wirklich die aktuelle Datenbank unwiederruflich\nlöschen und durch die gefundene ersetzen?\n\nDas kann zu Datenverlust führen!", "Datenbank herunterladen",
-                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    if (res != MessageBoxResult.OK)
-                        return;
-
-                    var filename = Path.Combine(App.TempPath, file.Name);
-                    using (var client = Utils.GetHttpClient(App.Config.SyncUsername, App.Config.SyncPassword)) {
-                        using var stream = new FileStream(filename, FileMode.Create);
-                        await client.DownloadAsync(file.Url, stream);
-                    }
-
-                    res = MessageBox.Show("Die Datenbank wurde erfolgreich heruntergeladen!\n\nSoll die Datenbank wirklich unwiederruflich ersetzt werden?\n\nWenn Sie unsicher sind sprechen Sie sich mit dem Benutzer des Hauptgerätes ab!", "Datenbank herunterladen",
-                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    if (res != MessageBoxResult.OK)
-                        return;
-
-                    await App.MainDispatcher.BeginInvoke(async () => {
-                        await App.ReplaceDatabase(filename);
-                    });
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
-            Mouse.OverrideCursor = null;
-        }
-
-        private async void Menu_Database_Upload_Click(object sender, RoutedEventArgs evt) {
-            if (App.Config.SyncUrl == null)
-                return;
-
-            var res = MessageBox.Show("Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!", "Datenbank hochladen",
-                MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-            if (res != MessageBoxResult.OK)
-                return;
-
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var path = Path.Combine(App.TempPath, "database.sql.zip");
-                    await Database.ExportSql(path, true);
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
+                using var ctx = new AppDbContext();
+                var deliveries = await ctx.Deliveries
+                    .Where(d => d.Year == Utils.CurrentLastSeason && d.ZwstId == App.ZwstId)
+                    .Include(d => d.Parts)
+                    .ThenInclude(p => p.PartModifiers)
+                    .OrderBy(d => d.DateString)
+                    .ThenBy(d => d.TimeString)
+                    .ThenBy(d => d.LsNr)
+                    .AsSplitQuery()
+                    .ToListAsync();
+                if (deliveries.Count == 0) {
+                    MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
+                    await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
                     await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    MessageBox.Show($"Hochladen der gesamten Datenbank erfolgreich!", "Datenbank hochladen",
+                    MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
-                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-            });
+            } 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);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -419,31 +270,24 @@ namespace Elwig.Windows {
             AreaCommitmentsButton.IsEnabled = valid;
             BreakdownMemberVarietyButton.IsEnabled = valid;
 
-            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²";
-                    });
-                });
-            };
+                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 = "-";
+            }
         }
 
         private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@@ -471,24 +315,22 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
-                    var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl1);
-                    await ods.AddTable(tbl2);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
+                var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
+                using var ods = new OdsFile(d.FileName);
+                await ods.AddTable(tbl1);
+                await ods.AddTable(tbl2);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -504,26 +346,24 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    using var ods = new OdsFile(d.FileName);
-                    var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
-                    await ods.AddTable(tblTotal);
-                    foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
-                        var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
-                        await ods.AddTable(tbl);
-                    }
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                using var ctx = new AppDbContext();
+                using var ods = new OdsFile(d.FileName);
+                var tblTotal = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year);
+                await ods.AddTable(tblTotal);
+                foreach (var branch in await ctx.Branches.OrderBy(b => b.Name).ToListAsync()) {
+                    var tbl = await WeightBreakdownData.ForSeason(ctx.WeightBreakDownRows, year, branch);
+                    await ods.AddTable(tbl);
                 }
-            });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
         }
 
@@ -539,22 +379,20 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
+                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;
         }
 
@@ -570,22 +408,20 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    var b = new Billing(year);
-                    await b.FinishSeason();
-                    await b.CalculateBuckets();
-                    App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                var b = new Billing(year);
+                await b.FinishSeason();
+                await b.CalculateBuckets();
+                App.HintContextChange();
 
-                    using var ctx = new AppDbContext();
-                    var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
-                    using var ods = new OdsFile(d.FileName);
-                    await ods.AddTable(tbl);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            });
+                using var ctx = new AppDbContext();
+                var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
+                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;
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -653,40 +653,13 @@
                              TextChanged="TextBox_TextChanged"
                              VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
-                    <Label Content="Kontaktart:" Margin="10,10,0,40" Grid.Column="0" VerticalAlignment="Bottom"/>
+                    <Label Content="Kontaktart:" Margin="10,10,0,10" 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,45" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="0,0,0,15" 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,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>
+                              HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" IsEnabled="{Binding IsMemberSelected}"
                             Click="DeliveryButton_Click"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -389,10 +389,9 @@ namespace Elwig.Windows {
             }
             var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.Wait;
+                Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
                     await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
-                    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;
@@ -409,20 +408,20 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             SaveButton.IsEnabled = false;
 
             int mgnr;
             try {
                 mgnr = await ViewModel.UpdateMember(ViewModel.SelectedMember?.MgNr);
-                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;
                 MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
                 return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;
@@ -437,7 +436,6 @@ namespace Elwig.Windows {
             await RefreshList();
             RefreshInputs();
             ViewModel.SearchQuery = "";
-            Mouse.OverrideCursor = null;
             if (mgnr is int m)
                 FocusMember(m);
         }
@@ -493,17 +491,15 @@ 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.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                await Task.Run(async () => {
-                    using var doc = new Letterhead(m);
-                    await doc.Generate();
-                    if (!App.Config.Debug) {
-                        await doc.Print();
-                    } else {
-                        doc.Show();
-                    }
-                });
+                using var doc = new Letterhead(m);
+                await doc.Generate();
+                if (!App.Config.Debug) {
+                    await doc.Print();
+                } else {
+                    doc.Show();
+                }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
@@ -784,11 +780,11 @@ namespace Elwig.Windows {
                     $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
                     $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
                     $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}";
-                var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
+                var d = new AreaComDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
-                ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
+                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();
@@ -847,7 +843,7 @@ namespace Elwig.Windows {
                     .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
                     .ToListAsync();
                 if (areaComs.Count > 0) {
-                    var d = new AreaComTransferDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
+                    var d = new AreaComDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
                     if (d.ShowDialog() == true) {
                         ViewModel.CancelAreaComs = d.CancelSeason;
                     }

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -156,7 +156,7 @@ namespace Elwig.Windows {
         }
 
         private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
                 int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
                 double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
@@ -169,12 +169,10 @@ namespace Elwig.Windows {
                 App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
                 App.Client.AutoAdjustBs.AllowancePercent = percent;
                 App.Client.AutoAdjustBs.MinBs = minBs;
+                await App.Client.UpdateValues();
 
-                await Task.Run(async () => {
-                    await App.Client.UpdateValues();
-                    var b = new Billing(Year);
-                    await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
-                });
+                var b = new Billing(Year);
+                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
                 App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -185,12 +183,10 @@ namespace Elwig.Windows {
         }
 
         private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                await Task.Run(async () => {
-                    var b = new Billing(Year);
-                    await b.UnAdjustBusinessShares();
-                });
+                var b = new Billing(Year);
+                await b.UnAdjustBusinessShares();
                 App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -285,37 +281,35 @@ namespace Elwig.Windows {
 
         private async void CustomButton_Click(object sender, RoutedEventArgs evt) {
             if (MemberInput.SelectedItem is not Member m) return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
-                var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
-                var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
-                var modText = CustomModCommentInput.Text.Trim();
-                var text = CustomCommentInput.Text.Trim();
-                await Task.Run(async () => {
-                    using var ctx = new AppDbContext();
-                    if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
-                        ctx.Remove(p);
-                    }
-                    if (sender == SaveCustomButton) {
-                        ctx.Add(new PaymentCustom {
-                            MgNr = m.MgNr,
-                            Year = Year,
-                            ModAbs = modAbs,
-                            ModRel = modRel,
-                            ModComment = modText == "" ? null : modText,
-                            Amount = amount,
-                            Comment = text == "" ? null : text,
-                        });
-                    }
-                    await ctx.SaveChangesAsync();
-                });
-                App.HintContextChange();
+                using var ctx = new AppDbContext();
+                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                    ctx.Remove(p);
+                }
+                if (sender == SaveCustomButton) {
+                    var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
+                    var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
+                    var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
+                    var modText = CustomModCommentInput.Text.Trim();
+                    var text = CustomCommentInput.Text.Trim();
+                    ctx.Add(new PaymentCustom {
+                        MgNr = m.MgNr,
+                        Year = Year,
+                        ModAbs = modAbs,
+                        ModRel = modRel,
+                        ModComment = modText == "" ? null : modText,
+                        Amount = amount,
+                        Comment = text == "" ? null : text,
+                    });
+                }
+                await ctx.SaveChangesAsync();
             } 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;
                 MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            App.HintContextChange();
             Mouse.OverrideCursor = null;
         }
     }

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -5,12 +5,8 @@
         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="850">
-    <Window.DataContext>
-        <vm:PaymentVariantsViewModel/>
-    </Window.DataContext>
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="830">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -59,25 +55,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="{Binding IsPaymentVariantSelected}"
+                <MenuItem x:Name="Menu_SummaryShow" Header="...anzeigen (PDF)" IsEnabled="False"
                           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="{Binding IsPaymentVariantSelected}"
+                <MenuItem x:Name="Menu_SummarySave" Header="...speichern... (PDF)" IsEnabled="False"
                           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="{Binding IsPaymentVariantSelected}"
+                <MenuItem x:Name="Menu_SummaryExport" Header="...speichern... (Excel)" IsEnabled="False"
                           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="{Binding IsPaymentVariantSelected}"
+                <MenuItem x:Name="Menu_SummaryPrint" Header="...drucken" IsEnabled="False"
                           Click="Menu_SummaryPrint_Click" InputGestureText="Strg+Shift+P">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE749;"/>
@@ -85,7 +81,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Buchungsliste">
-                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="{Binding ExportIsEnabled}"
+                <MenuItem x:Name="Menu_ExportSave" Header="...speichern... (Excel)" IsEnabled="False"
                           Click="Menu_ExportSave_Click" InputGestureText="Strg+L">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
@@ -93,7 +89,7 @@
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Überweisungsdaten">
-                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="{Binding ExportIsEnabled}"
+                <MenuItem x:Name="Menu_EbicsSave" Header="...exportieren... (EBICS)" IsEnabled="False"
                           Click="Menu_EbicsSave_Click" InputGestureText="Strg+Ü">
                     <MenuItem.Icon>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE792;"/>
@@ -103,9 +99,7 @@
         </Menu>
 
         <Grid Grid.Row="1">
-            <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 x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2" SelectionChanged="PaymentVariantList_SelectionChanged">
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -115,21 +109,17 @@
                     </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" IsEnabled="{Binding IsPaymentVariantSelected}"
-                    Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+            <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" 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" IsEnabled="{Binding DeleteIsEnabled}"
-                    Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+            <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"
                     VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"
                     Click="DeleteButton_Click"/>
 
-            <TextBox x:Name="DataInput" Text="{Binding Data, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding DataIsReadOnly}"
-                     Margin="10,200,35,10"
+            <TextBox x:Name="DataInput" Margin="10,200,35,10"
                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
                      AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
                      FontFamily="Cascadia Code Light" FontSize="13"
@@ -143,28 +133,23 @@
             </Grid.ColumnDefinitions>
 
             <Label Content="Name:" Margin="10,10,0,0" Grid.Column="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"
+            <TextBox x:Name="NameInput" 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" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
-                     Grid.Column="1" HorizontalAlignment="Stretch" Margin="0,40,10,0"
+            <TextBox x:Name="CommentInput" 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" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
-                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"
+            <TextBox x:Name="DateInput" 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" Text="{Binding TransferDateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
-                     Grid.Column="1" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
+            <TextBox x:Name="TransferDateInput" 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" Text="{Binding WeightModifierString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsReadOnly="{Binding IsReadOnly}"
-                              Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
+            <ctrl:UnitTextBox x:Name="WeightModifierInput" Grid.Column="1" Width="60" Margin="0,130,10,0" Unit="%"
                               HorizontalAlignment="Left" VerticalAlignment="Top"
                               TextChanged="WeightModifierInput_TextChanged" LostFocus="WeightModifierInput_LostFocus"/>
 
@@ -175,24 +160,19 @@
             </TextBlock>
 
             <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="1"/>
-            <CheckBox x:Name="ConsiderModifiersInput" IsChecked="{Binding ConsiderModifiers, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="Zu-/Abschläge bei Lieferungen (inkl. Rebelzuschl.)"
+            <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
                       Margin="110,95,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
-            <CheckBox x:Name="ConsiderPenaltiesInput" IsChecked="{Binding ConsiderPenalties, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="Pönalen bei Unterlieferungen (FB)"
+            <CheckBox x:Name="ConsiderPenaltiesInput" 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" IsChecked="{Binding ConsiderPenalty, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="Strafen bei Unterlieferungen (GA)"
+            <CheckBox x:Name="ConsiderPenaltyInput" 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" IsChecked="{Binding ConsiderAuto, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="Automatische Nachzeichnungen der GA"
+            <CheckBox x:Name="ConsiderAutoInput" 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" IsChecked="{Binding ConsiderCustom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
+            <CheckBox x:Name="ConsiderCustomInput" 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"/>
@@ -226,8 +206,7 @@
                     </Style>
                 </Grid.Resources>
 
-                <Button x:Name="EditButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                        Content="{Binding EditText}" Grid.Column="0" Grid.Row="2"
+                <Button x:Name="EditButton" Content="Bearbeiten" 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"
@@ -240,13 +219,12 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CalculateButton" IsEnabled="{Binding CalculateIsEnabled}"
-                        Content="Berechnen" Grid.Column="2" Grid.Row="2"
+                <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
-                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3"/>
+                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
                 <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
                         Click="PaymentAdjustmentButton_Click"/>
-                <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" RenderTransformOrigin="0.5,0.5" >
+                <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" x:Name="Arrow4" RenderTransformOrigin="0.5,0.5" >
                     <Label.RenderTransform>
                         <TransformGroup>
                             <RotateTransform Angle="-45"/>
@@ -254,19 +232,16 @@
                         </TransformGroup>
                     </Label.RenderTransform>
                 </Label>
-                <Button x:Name="CommitButton" IsEnabled="{Binding CommitIsEnabled}" Visibility="{Binding CommitVisibility}"
-                        Content="Festsetzen" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
                         Click="CommitButton_Click"/>
-                <Button x:Name="RevertButton" IsEnabled="{Binding RevertIsEnabled}" Visibility="{Binding RevertVisibility}"
-                        Content="Freigeben" Grid.Column="4" Grid.Row="2"
+                <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
                         Click="RevertButton_Click"/>
-                <Button x:Name="SaveButton" IsEnabled="{Binding SaveIsEnabled}"
-                        Content="Speichern" Grid.Column="4" Grid.Row="0"
+                <Button x:Name="SaveButton" Content="Speichern" Grid.Column="4" Grid.Row="0"
                         Click="SaveButton_Click"/>
             </Grid>
 
-            <Button x:Name="MailButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30"
+            <Button x:Name="MailButton"
+                    FontSize="14" Width="180" Margin="10,10,10,10" Height="30" IsEnabled="False"
                     Click="MailButton_Click"
                     VerticalAlignment="Bottom" HorizontalAlignment="Right" HorizontalContentAlignment="Stretch" Grid.Column="1">
                 <Grid>
@@ -298,35 +273,35 @@
             <StatusBarItem Grid.Column="0" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Zu-/Abschl.:"/>
-                    <TextBlock Text="{Binding StatusModifierSum}" TextAlignment="Right"/>
+                    <TextBlock x:Name="ModifierSum" Text="-" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Gesamt:"/>
-                    <TextBlock Text="{Binding StatusTotalSum}" TextAlignment="Right"/>
+                    <TextBlock x:Name="TotalSum" Text="-" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="MwSt.:"/>
-                    <TextBlock Text="{Binding StatusVatSum}" TextAlignment="Right"/>
+                    <TextBlock x:Name="VatSum" Text="-" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Abzüge:"/>
-                    <TextBlock Text="{Binding StatusDeductionSum}" TextAlignment="Right"/>
+                    <TextBlock x:Name="DeductionSum" Text="-" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
             <Separator Grid.Column="7"/>
             <StatusBarItem Grid.Column="8" HorizontalContentAlignment="Stretch">
                 <DockPanel>
                     <TextBlock Text="Auszahl.:"/>
-                    <TextBlock Text="{Binding StatusPaymentSum}" TextAlignment="Right"/>
+                    <TextBlock x:Name="PaymentSum" Text="-" TextAlignment="Right"/>
                 </DockPanel>
             </StatusBarItem>
         </StatusBar>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -1,27 +1,29 @@
 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 PaymentVariantsViewModel ViewModel => (PaymentVariantsViewModel)DataContext;
-
         public readonly int Year;
+        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 };
 
         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)]);
@@ -36,7 +38,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_SummaryPrint_Click));
             Year = year;
             using (var ctx = new AppDbContext()) {
-                ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
             }
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
@@ -55,95 +57,257 @@ namespace Elwig.Windows {
                 .OrderBy(v => v.AvNr)
                 .Include(v => v.Season.Currency)
                 .ToListAsync());
-            Update();
+            await Update();
         }
 
-        private void Update() {
+        private async Task Update() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
-                ViewModel.FillInputs(v);
+                var locked = !v.TestVariant;
+                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 = "";
+                    }
+                    DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
+                } 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 {
-                ViewModel.ClearInputs();
+                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;
             }
-            UpdateButtons();
+            await UpdateSums();
+            UpdateSaveButton();
         }
 
-        private void UpdateButtons() {
-            ViewModel.SaveIsEnabled = PaymentVariantList.SelectedItem != null &&
+        private void UpdateSaveButton() {
+            SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
                 ((DataChanged && DataValid) || NameChanged || CommentChanged ||
                 (DateChanged && DateValid) ||
                 (TransferDateChanged && TransferDateValid) ||
-                (ViewModel.ConsiderModifiers != ViewModel.BillingData?.ConsiderDelieryModifiers) ||
-                (ViewModel.ConsiderPenalties != ViewModel.BillingData?.ConsiderContractPenalties) ||
-                (ViewModel.ConsiderPenalty != ViewModel.BillingData?.ConsiderTotalPenalty) ||
-                (ViewModel.ConsiderAuto != ViewModel.BillingData?.ConsiderAutoBusinessShares) ||
-                (ViewModel.ConsiderCustom != ViewModel.BillingData?.ConsiderCustomModifiers) ||
-                ViewModel.WeightModifierChanged);
-            ViewModel.CalculateIsEnabled = !ViewModel.SaveIsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
-            ViewModel.CommitIsEnabled = ViewModel.CalculateIsEnabled;
+                (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
+                (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
+                (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
+                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                (ConsiderCustomInput.IsChecked != BillingData?.ConsiderCustomModifiers) ||
+                WeightModifierChanged);
+            CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
+            CommitButton.IsEnabled = CalculateButton.IsEnabled;
         }
 
-        private void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            Update();
+        private async Task UpdateSums() {
+            if (PaymentVariantList.SelectedItem is PaymentVar v) {
+                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) {
-            Mouse.OverrideCursor = Cursors.Wait;
             try {
-                var v = await PaymentVariantService.CreatePaymentVariant(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();
+
                 ControlUtils.SelectItem(PaymentVariantList, v);
             } 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;
                 MessageBox.Show(str, "Auszahlungsvariante erstellen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            Mouse.OverrideCursor = null;
         }
 
         private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar orig)
-                return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
             try {
-                PaymentVar n = await orig.Duplicate();
+                PaymentVar? n;
+                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;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            Mouse.OverrideCursor = null;
         }
 
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant)
-                return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
             try {
-                await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);
+                using (var ctx = new AppDbContext()) {
+                    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;
                 MessageBox.Show(str, "Auszahlungsvariante löschen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            Mouse.OverrideCursor = null;
         }
 
         private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            ViewModel.CalculateIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            CalculateButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                await PaymentVariantService.Calculate(v.Year, v.AvNr);
-                App.HintContextChange();
+                var b = new BillingVariant(v.Year, v.AvNr);
+                await b.Calculate();
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            App.HintContextChange();
             Mouse.OverrideCursor = null;
-            ViewModel.CalculateIsEnabled = true;
+            CalculateButton.IsEnabled = true;
         }
 
         private void EditButton_Click(object sender, RoutedEventArgs evt) {
@@ -172,40 +336,71 @@ namespace Elwig.Windows {
         private async void Menu_SummaryExport_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await PaymentVariantService.GenerateSummary(v, ExportMode.SaveList);
+            var d = new SaveFileDialog() {
+                FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Variantendaten {v.Name} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            try {
+                using var ctx = new AppDbContext();
+                var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                using var ods = new OdsFile(d.FileName);
+                await ods.AddTable(data);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Mouse.OverrideCursor = null;
         }
 
         private async void Menu_SummaryShow_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await PaymentVariantService.GenerateSummary(v, ExportMode.Show);
+            await GenerateSummary(v, ExportMode.Show);
         }
 
         private async void Menu_SummarySave_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await PaymentVariantService.GenerateSummary(v, ExportMode.SavePdf);
+            await GenerateSummary(v, ExportMode.SavePdf);
         }
 
         private async void Menu_SummaryPrint_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            await PaymentVariantService.GenerateSummary(v, ExportMode.Print);
+            await 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;
-            ViewModel.CommitIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
+            CommitButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                await PaymentVariantService.Commit(v.Year, v.AvNr);
-                App.HintContextChange();
+                var b = new BillingVariant(v.Year, v.AvNr);
+                await b.Commit();
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
-            ViewModel.RevertIsEnabled = true;
+            RevertButton.IsEnabled = true;
+            App.HintContextChange();
         }
 
         private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
@@ -217,16 +412,13 @@ namespace Elwig.Windows {
                 "Traubengutschriften löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (res != MessageBoxResult.Yes)
                 return;
-            ViewModel.RevertIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.Wait;
-            try {
-                await PaymentVariantService.Revert(v.Year, v.AvNr);
-                App.HintContextChange();
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            RevertButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new BillingVariant(v.Year, v.AvNr);
+            await b.Revert();
+            App.HintContextChange();
             Mouse.OverrideCursor = null;
-            ViewModel.CommitIsEnabled = true;
+            CommitButton.IsEnabled = true;
         }
 
         private async void Menu_EbicsSave_Click(object sender, RoutedEventArgs evt) {
@@ -236,39 +428,107 @@ 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 || ViewModel.BillingData == null)
-                return;
-            Mouse.OverrideCursor = Cursors.Wait;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || BillingData == null) return;
             try {
-                await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
+                v.Name = NameInput.Text;
+                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);
             }
-            Mouse.OverrideCursor = null;
-            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) {
@@ -287,7 +547,7 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(NameInput);
                 NameChanged = false;
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void CommentInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
@@ -302,10 +562,10 @@ namespace Elwig.Windows {
                 ControlUtils.ClearInputState(CommentInput);
                 CommentChanged = false;
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
-        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;
@@ -323,10 +583,10 @@ namespace Elwig.Windows {
                 DateValid = true;
                 DateChanged = false;
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
-        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;
@@ -344,7 +604,7 @@ namespace Elwig.Windows {
                 TransferDateValid = true;
                 TransferDateChanged = false;
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void DataInput_TextChanged(object sender, TextChangedEventArgs evt) {
@@ -370,89 +630,89 @@ namespace Elwig.Windows {
                 ControlUtils.SetInputInvalid(DataInput);
                 DataValid = false;
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void ConsiderModifiersInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
                 return;
             }
-            if (ViewModel.BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
+            if (BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderModifiersInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderModifiersInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void ConsiderPenaltiesInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
                 return;
             }
-            if (ViewModel.BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
+            if (BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltiesInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltiesInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void ConsiderPenaltyInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
                 return;
             }
-            if (ViewModel.BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
+            if (BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderPenaltyInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderPenaltyInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void ConsiderAutoInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
                 return;
             }
-            if (ViewModel.BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
+            if (BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderAutoInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderAutoInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void ConsiderCustomInput_Changed(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
                 return;
             }
-            if (ViewModel.BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
+            if (BillingData.ConsiderCustomModifiers != ConsiderCustomInput.IsChecked) {
                 ControlUtils.SetInputChanged(ConsiderCustomInput);
             } else {
                 ControlUtils.ClearInputState(ConsiderCustomInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             var res = Validator.CheckDecimal(WeightModifierInput, false, 3, 2, true);
-            if (ViewModel.BillingData == null) {
+            if (BillingData == null) {
                 ControlUtils.ClearInputState(WeightModifierInput);
                 return;
             }
             var val = WeightModifierInput.Text.Length > 0 && res.IsValid ? double.Parse(WeightModifierInput.Text) : 0;
-            ViewModel.WeightModifierChanged = (val != Math.Round(ViewModel.BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(ViewModel.BillingData.GrossWeightModifier * 100.0, 8)) ||
-                (val == 0 && (ViewModel.BillingData.NetWeightModifier != 0 || ViewModel.BillingData.GrossWeightModifier != 0));
-            if (ViewModel.WeightModifierChanged) {
+            WeightModifierChanged = (val != Math.Round(BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(BillingData.GrossWeightModifier * 100.0, 8)) ||
+                (val == 0 && (BillingData.NetWeightModifier != 0 || BillingData.GrossWeightModifier != 0));
+            if (WeightModifierChanged) {
                 ControlUtils.SetInputChanged(WeightModifierInput);
             } else {
                 ControlUtils.ClearInputState(WeightModifierInput);
             }
-            UpdateButtons();
+            UpdateSaveButton();
         }
 
         private void WeightModifierInput_LostFocus(object sender, RoutedEventArgs evt) {

Elwig/Windows/QueryWindow.xaml.cs

@@ -38,7 +38,7 @@ namespace Elwig.Windows {
             IList<DbColumn> header;
 
             using (var cnx = await AppDbContext.ConnectAsync()) {
-                using var cmd = cnx.CreateCommand();
+                var cmd = cnx.CreateCommand();
                 cmd.CommandText = sqlQuery;
                 using var reader = await cmd.ExecuteReaderAsync();
                 header = await reader.GetColumnSchemaAsync();

Elwig/fetch-resources.bat

@@ -0,0 +1,5 @@
+::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,26 +1,23 @@
-<?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 -->
+	<!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
-        <Directory Id="InstallFolderResources" Name="resources">
-          <Directory Id="InstallFolderDocuments" Name="Documents" />
-        </Directory>
-      </Directory>
+		<Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
     </StandardDirectory>
-
-    <!-- C:\ProgramData\Elwig -->
-    <StandardDirectory Id="CommonAppDataFolder">
-      <Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)" />
-    </StandardDirectory>
-
-    <!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
-    <StandardDirectory Id="ProgramMenuFolder">
-      <Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
-    </StandardDirectory>
-
-    <!-- C:\Users\{USERNAME}\Desktop -->
-    <StandardDirectory Id="DesktopFolder" />
+	
+	<!-- C:\ProgramData\Elwig -->
+	<StandardDirectory Id="CommonAppDataFolder">
+		<Directory Id="ConfigFolder" Name="!(bind.Property.ProductName)">
+			<Directory Id="ConfigFolderResources" Name="resources" />
+		</Directory>
+	</StandardDirectory>
+	  
+	<!-- C:\ProgramData\Microsoft\Windows\Start Menu\Programs -->
+	<StandardDirectory Id="ProgramMenuFolder">
+		<Directory Id="StartMenuProgramsFolder" Name="!(bind.Property.ProductName)" />
+	</StandardDirectory>
+	  
+	<!-- C:\Users{USERNAME}\Desktop -->
+	<StandardDirectory Id="DesktopFolder" />
   </Fragment>
 </Wix>

Installer/HeatComponents.wxs

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <ComponentGroup Id="HeatComponents">
-      <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
-        <Exclude Files="..\Elwig\bin\Publish\**.exe" />
-        <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
-      </Files>
-      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
-        <Exclude Files="..\Elwig\Documents\**.cs" />
-      </Files>
-    </ComponentGroup>
+	  <ComponentGroup Id="HeatComponents">
+		  <Files Directory="InstallFolder" Include="..\Elwig\bin\Publish\**">
+			  <Exclude Files="..\Elwig\bin\Publish\**.exe" />
+			  <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
+		  </Files>
+		  <Files Directory="ConfigFolderResources" Include="..\Elwig\Documents\**">
+			  <Exclude Files="..\Elwig\Documents\**.cs" />
+		  </Files>
+	  </ComponentGroup>
   </Fragment>
 </Wix>

README.md

@@ -5,43 +5,3 @@ Elwig
 **El**ektronische **Wi**nzer**g**enossenschaftsverwaltung (Electronic Management for Vintners' Cooperatives).
 
 Further information may be found on [the website](https://elwig.at).
-
-
-About
-=====
-
-**Product:** Elwig  
-**Description:** Electronic Management for Vintners' Cooperatives  
-**Type:** ERP system  
-**Version:** 1.0.1.5 ([Changelog](./CHANGELOG.md))  
-**License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
-**Website:** https://elwig.at/  
-**Source code:** https://git.necronda.net/winzer/elwig  
-**Developement period:** 2022–2025
-
-**Technology Stack:**  
-Language: C#  
-Framework: Windows Presentation Framework (WPF)  
-Database: [SQLite](https://sqlite.org/)  
-PDF creation: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
-Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
-
-
-Über
-====
-
-**Produkt:** Elwig  
-**Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
-**Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.1.5 ([Änderungsprotokoll](./CHANGELOG.md))  
-**Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
-**Website:** https://elwig.at/  
-**Quellcode:** https://git.necronda.net/winzer/elwig  
-**Entwicklungszeitraum:** 2022–2025
-
-**Verwendete Technologien:**  
-Programmiersprache: C#  
-Framework: Windows Presentation Framework (WPF)  
-Datenbank: [SQLite](https://sqlite.org/)  
-PDF-Erstellung: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
-Paketierung: [WiX Toolset](https://www.firegiant.com/wixtoolset/)