Bump version to 1.0.0.0

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

.gitea/workflows/deploy.yaml

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

CHANGELOG.md

@@ -3,18 +3,208 @@ Changelog
 =========
 
 
+[v1.0.0.0][v1.0.0.0] (2025-07-30) {#v1.0.0.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.0.0-features}
+
+* Es wird nun gespeichert, wann Mitglieder/Flächenbindungen/Lieferungen importiert bzw. exporiert wurden. (4234c7f994)
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird der Auszahlungsbetrag für nicht-festgesetzte Varianten nun überschlagsmäßig angezeigt. (913129f155)
+* Wenn eine Variante im Auszahlungsvariante-Fenster (`ChartWindow`) gespeichert wird, wird sie nun automatisch auch berechnet. (c6c8fd9b68)
+* Überall wo Weinsorten vorkommen werden diese jetzt rot oder grün eingefärbt angezeigt. ([#61][i61])
+* Das Flächenbindungs-Fenster (`AreaComAdminWindow`) wurde überarbeitet. (53d82604a1, 267aa3d47c, [#64][i64])
+* Auf allen Dokumenten wird der Bio-Kontrollstellen-Code in der Fußzeile angeführt (sofern dieser in den Stammdaten gesetzt wurde). (fad1e28c06)
+
+### Behobene Fehler {#v1.0.0.0-bugfixes}
+
+* Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
+* In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
+* Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
+* Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])
+
+### Sonstiges {#v1.0.0.0-misc}
+
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) wird angeführt, dass "Zu- und Abschläge bei Lieferungen" auch den Rebelzuschlag umfassen. (0dff3986b7)
+* Im gesamten Program wird an passenden Stellen statt "Gewicht" nun "Menge" verwendet. (0f3ce39f35)
+* Verbesserungen der Code-Qualität und der Leistung. ([#59][i59], b580e1bf79, 623f55f5b0, 3493ff6df1, 267797b55d, 41811925be, [#57][i57], 38d0ff969d, e6746f76b1, 7e9a27c75d)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Flächenbindungen jetzt für die momentane Saison angezeigt statt für das aktuelle Jahr. (953532cae4)
+* Abhängigkeiten aktualisiert. (4b27ebf81b, 7153bfab6f, 9b48242f0e)
+* GPLv3 Lizenz hinzugefügt. (93e920f61a)
+
+[v1.0.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.0.0
+[i57]: https://git.necronda.net/winzer/elwig/issues/57
+[i58]: https://git.necronda.net/winzer/elwig/issues/58
+[i59]: https://git.necronda.net/winzer/elwig/issues/59
+[i61]: https://git.necronda.net/winzer/elwig/issues/61
+[i62]: https://git.necronda.net/winzer/elwig/issues/62
+[i64]: https://git.necronda.net/winzer/elwig/issues/64
+[i65]: https://git.necronda.net/winzer/elwig/issues/65
+
+
+
+
+[v0.13.9][v0.13.9] (2025-05-05) {#v0.13.9}
+------------------------------------------
+
+### Sonstiges {#v0.13.9-misc}
+
+* Abhängigkeiten aktualisiert. (bf0db37872, 4af2fa256e, d1c07ee92a, 41c5288fc5)
+* Automatisches Aktualisieren der Synchroisations-URL (`https://elwig.at/clients/` -> `https://sync.elwig.at/`). (e50e7337e6)
+
+[v0.13.9]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.9
+
+
+
+
+[v0.13.8][v0.13.8] (2025-02-21) {#v0.13.8}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.8-bugfixes}
+
+* Details im Lieferungen-Fenster (`DeliveryAdminWindow`) für die WG Weinland richtiggestellt (Lesweagen, Verhalten bei _Gerebelt gewogen_). (138dae715e, aa98909c0a)
+
+### Sonstiges {#v0.13.8-misc}
+
+* Abhängigkeiten aktualisiert. (fe0a7dab2a, 775bb08e95)
+
+[v0.13.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.8
+
+
+
+
+[v0.13.7][v0.13.7] (2025-01-21) {#v0.13.7}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.7-bugfixes}
+
+* In seltenen Fällen konnten im Auszahlungsvariante-Fenster (`ChartWindow`) manche (Sorten-/Attribut-/Bewirtschaftungsart-)Zuordnungen zu Kurven nicht richtig gespeichert werden. (0b8a1b321f)
+* Beim Öffnen des Ausgangs-Protokoll-Fensters (`MailLogWindow`) kam es zu einem Absturz. (5d017cc8ea)
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) war es nicht möglich die Überweisungsdaten zu exportieren, sofern mindestens eine Traubengutschrift einen negativen Betrag aufwies.
+  Jetzt wird der Benutzer nur gewarnt und es ist möglich alle anderen Gutschriften zu exportieren. (6d88c5645c, c7a2f2241d)
+
+### Sonstiges {#v0.13.7-misc}
+
+* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) ist es nun möglich das Datum einer Auszahlungsvariante zu ändern. (bd4ebb8c35)
+
+[v0.13.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.7
+
+
+
+
+[v0.13.6][v0.13.6] (2025-01-14) {#v0.13.6}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.6-bugfixes}
+
+* In seltenen Fällen konnten im Auszahlungsvariante-Fenster (`ChartWindow`) manche (Sorten-/Attribut-/Bewirtschaftungsart-)Zuordnungen zu Kurven nicht richtig gespeichert werden.
+  Berechnungen basierend auf diesen (evtl. falschen) Zuordnungen wurden immer richtig ausgeführt, eine nachträgliche Überprüfung ist daher möglich. (20e3e2a76b)
+
+### Sonstiges {#v0.13.6-misc}
+
+* Abhängigkeiten aktualisiert. (95ccb2627c, 80fec4473a)
+
+[v0.13.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.6
+
+
+
+
+[v0.13.5][v0.13.5] (2025-01-02) {#v0.13.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) Filter `aktiv` und `!aktiv` hinzugefügt. (5e53d864b1)
+* Im Lieferungen Fenster (`DeliveryAdminWindow`) Menüpunkt _Statistik_ mitsamt _Qualitätsstatistik_ und _Lieferstatistik pro Ort_ hinzugefügt. (c24b1ca2b9)
+
+### Sonstiges {#v0.13.5-misc}
+
+* Abhängigkeiten aktualisiert. (c9e483ba9d, 633b560a67)
+
+[v0.13.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.5
+
+
+
+
+[v0.13.4][v0.13.4] (2024-11-25) {#v0.13.4}
+------------------------------------------
+
+### Behobene Fehler {#v0.13.4-bugfixes}
+
+* Bei _Unter-/Überlieferungen lt. gez. GA_ waren seit [v0.10.6](#v0.10.6) (2023-08-30) Nicht-Lieferanten nicht aufgeführt. (6ba2aa7143)
+* Bei _Unterlieferungen laut Flächenbindungen_ wurden nur Mitglieder berücksichtigt, die zum Zeitpunkt des Exports aktiv waren. (3b97c2243a, 338f9fe092)
+
+### Sonstiges {#v0.13.4-misc}
+
+* Abhängigkeiten aktualisiert. (c3a2f983d5, 70e01849be, a99a23fd08, 4a10e94d71, 6c7f10cb26)
+
+[v0.13.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.4
+
+
+
+
+[v0.13.3][v0.13.3] (2024-11-13) {#v0.13.3}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.3-features}
+
+* Im Haupt-Fenster (`MainWindow`) unter _Leseabschluss_ eine Statistik-Tabelle (Gebunden/Ungeb., Mitglieder/Gewicht/Fläche) hinzugefügt. (54deccf021)
+* Im Haupt-Fenster (`MainWindow`) unter _Leseabschluss_ zwei Exportmöglichkeiten (_Flächenbindungen_, _Liefermenge/Ertrag_) hinzugefügt. (c5453c2fe6)
+* Ausgangs-Protokoll-Fenster (`MailLogWindow`) zum Ansehen aller ausgehenden E-Mails oder ausgedruckten Rundschreiben hinzugefügt (_Rundschreiben_ -> _Hilfe_). (2ee0d56dcc)
+
+### Behobene Fehler {#v0.13.3-bugfixes}
+
+* Im Rundschreiben-Fenster (`MailWindow`) kleinere Fehler behoben und alle Einstellungen werden nun gespeichert. (0a9731af09)
+
+### Sonstiges {#v0.13.3-misc}
+
+* In allen Fenstern an passenden Stellen Symbole/Icons hinzugefügt. (f4fa549130)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) Filter `Flächenbindung` (Mitglieder mit irgendeiner aktiven Flächenbindung) hinzugefügt. (a1d84dd988)
+* Im Flächenbindungen-Fenster (`AreaComAdminWindow`) Filter für explizite Saisons hinzugefügt. (6718ad4c8d)
+
+[v0.13.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.3
+
+
+
+
+[v0.13.2][v0.13.2] (2024-10-13) {#v0.13.2}
+------------------------------------------
+
+### Neue Funktionen {#v0.13.2-features}
+
+* Im Lieferungen-Fenster den Menüpunkt _Abwertungsliste_ (`DeliveryDepreciationList`) hinzugefügt. (3cbffdbf27)
+
+### Behobene Fehler {#v0.13.2-bugfixes}
+
+* Fehler im Waagenprotokoll `Avery-Async` (L320) behoben. (8680e51052)
+* Hausnummern in der BKI Traubentransportscheinliste werden in Excel richtig angezeigt. (86f7f693a0)
+* Beim Ändern der Identifikatoren von Attributen/Bewirtschaftungsarten wurden diese in Auszahlungsvarianten nicht aktualisiert. (d1f67dc57d)
+
+### Sonstiges {#v0.13.2-misc}
+
+* Weitere automatisierte Tests hinzugefügt. ([#11][i11])
+* Namenszusätze bei Gemeinden (z.B. an, bei, im, am) genauer angegeben. (65498dd18f)
+* Bei einigen Eingabefeldern waren die Ränder unscharf. (e247925472)
+* Wo leicht möglich wird `ExecuteSql`/`FromSql` statt `ExecuteSqlRaw`/`FromSqlRaw` verwendet. (0675c45617)
+
+[v0.13.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.2
+[i11]: https://git.necronda.net/winzer/elwig/issues/11
+
+
+
+
 [v0.13.1][v0.13.1] (2024-09-29) {#v0.13.1}
 ------------------------------------------
 
-### Neue Funktionen {#0.13.1-features}
+### Neue Funktionen {#v0.13.1-features}
 
 * Das Extrahieren/Abwerten/Aufteilen von (Teil-)Lieferungen wurde grundlegend überarbeitet und funktioniert ab jetzt in einem einzigen, übersichtlicheren Dialog. (c62947dacd, c185437b9a)
 
-### Behobene Fehler {#0.13.1-bugfixes}
+### Behobene Fehler {#v0.13.1-bugfixes}
 
 * Im Mitglieder-Fenster (`MemberAdminWinodw`) wurden bei `Anlieferungsbestätigung -> speichern (PDF)` und `Traubengutschrift -> speichern (PDF)` E-Mails verschickt, anstatt ein PDF gespeichert. (6ba1973087, a2315e84bd)
 
-### Sonstiges {#0.13.1-misc}
+### Sonstiges {#v0.13.1-misc}
 
 * Abhängigkeiten aktualisiert. (b6ae1f5675)
 
@@ -29,7 +219,7 @@ Changelog
 > [!NOTE]
 > Ab dieser Version verhält sich die Berechnung der Unterlieferungen bei Flächenbindungen anders.
 
-### Behobene Fehler {#0.13.0-bugfixes}
+### Behobene Fehler {#v0.13.0-bugfixes}
 
 * Im Lieferungen-Fenster (`DeliveryAdminWindow`) war das Extrahieren in eine neue Lieferung seit ca. 6 Monaten (98688168b8) nicht mehr möglich. (8a61747538)
 
@@ -106,7 +296,7 @@ Changelog
 ### Neue Funktionen {#v0.11.2-features}
 
 * In der Anmeldeliste (`DeliveryAncmtList`) wird die Stamm-KG des Mitgliedes angegeben. (165770fa37)
-* Im Hauptmenü wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
+* Im Haupt-Fenster (`MainWindow`) wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
 
 ### Behobene Fehler {#v0.11.2-bugfixes}
 
@@ -213,7 +403,7 @@ Changelog
 
 ### Behobene Fehler {#v0.10.6-bugfixes}
 
-* Der Titel des Flächenbindungs-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c)
+* Der Titel des Flächenbindungen-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c)
 * Im Auszahlungsvariante-Fenster (`ChartWindow`) einen Skalierungs-Fehler behoben. ([#33][i33])
 * Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8c8c0a8c2b)
 
@@ -530,7 +720,7 @@ Changelog
 
 ### Behobene Fehler {#v0.8.4-bugfixes}
 
-* Falls beim Schließen des Hauptmenüs ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
+* Falls beim Schließen des Haupt-Fensters (`MainWindow`) ein anderes Fenster im Bearbeiten-/Erstellen-Modus war führte das zu einem Absturz. (70f8276808)
 
 ### Sonstiges {#v0.8.4-misc}
 

Elwig/App.xaml

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

Elwig/App.xaml.cs

@@ -7,9 +7,6 @@ using Elwig.Helpers;
 using Elwig.Helpers.Weighing;
 using System.Collections.Generic;
 using System.Windows.Threading;
-using System.Globalization;
-using System.Threading;
-using System.Windows.Markup;
 using System.Reflection;
 using Elwig.Helpers.Printing;
 using Elwig.Windows;
@@ -28,9 +25,13 @@ namespace Elwig {
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
-        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
+        public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
+        public static readonly string MailsPath = Path.Combine(DataPath, "mails");
         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
-        public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(InstallPath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
 
         public static Config Config { get; private set; } = new(ConfigPath);
@@ -59,10 +60,11 @@ namespace Elwig {
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
+            Directory.CreateDirectory(MailsPath);
             MainDispatcher = Dispatcher;
             Scales = [];
             CurrentApp = this;
-            OverrideCulture();
+            Utils.OverrideCulture();
 
             var args = Environment.GetCommandLineArgs();
             if (args.Length >= 2) {
@@ -82,25 +84,8 @@ namespace Elwig {
             MainDispatcher.BeginInvoke(HintContextChange);
         }
 
-        private static void OverrideCulture() {
-            var locale = new CultureInfo("de-AT", false);
-            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
-            CultureInfo.CurrentCulture = locale;
-            CultureInfo.CurrentUICulture = locale;
-            Thread.CurrentThread.CurrentCulture = locale;
-            Thread.CurrentThread.CurrentUICulture = locale;
-            CultureInfo.DefaultThreadCurrentCulture = locale;
-            CultureInfo.DefaultThreadCurrentUICulture = locale;
-            FrameworkElement.LanguageProperty.OverrideMetadata(
-                typeof(FrameworkElement),
-                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
-            );
-        }
-
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0");
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0");
 
             try {
                 await AppDbUpdater.CheckDb();
@@ -183,6 +168,9 @@ namespace Elwig {
         }
 
         private async void Application_Exit(object sender, ExitEventArgs evt) {
+            foreach (var s in EventScales) {
+                s.Dispose();
+            }
             await Pdf.Cleanup();
         }
 
@@ -194,7 +182,13 @@ namespace Elwig {
             ZwstId = entry.Item1;
             BranchName = entry.Item2;
             BranchPlz = entry.Item3;
-            BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+            BranchLocation = entry.Item4?
+                .Split(" in ")[0]
+                .Split(" im ")[0]
+                .Split(" an ")[0]
+                .Split(" am ")[0]
+                .Split(" bei ")[0]
+                .Split(" beim ")[0];
             BranchAddress = entry.Item5;
             BranchPhoneNr = entry.Item6;
             BranchFaxNr = entry.Item7;
@@ -202,13 +196,16 @@ namespace Elwig {
         }
 
         public static void HintContextChange() {
+            if (CurrentApp == null) return;
             var ch = CurrentLastWrite;
             if (ch > CurrentApp.LastChanged)
                 CurrentApp.LastChanged = ch;
-            foreach (Window w in CurrentApp.Windows) {
-                if (w is not ContextWindow c) continue;
-                MainDispatcher.BeginInvoke(c.HintContextChange);
-            }
+            MainDispatcher.Invoke(() => {
+                foreach (Window w in CurrentApp.Windows) {
+                    if (w is not ContextWindow c) continue;
+                    MainDispatcher.BeginInvoke(c.HintContextChange);
+                }
+            });
         }
 
         private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {

Elwig/Controls/IntegerUpDown.xaml

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

Elwig/Controls/UnitTextBox.xaml

@@ -7,8 +7,7 @@
                 <ControlTemplate TargetType="ctrl:UnitTextBox">
                     <Border x:Name="Border"
                             BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-                            SnapsToDevicePixels="True">
+                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                         <Grid Background="{Binding Path=Background, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Bottom">
                                 <ScrollViewer.Margin>
@@ -32,6 +31,8 @@
             </Setter.Value>
         </Setter>
         <Setter Property="TextAlignment" Value="Right"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground" Value="Gray"/>

Elwig/Dialogs/AreaComModifyDialog.xaml

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

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

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

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Elwig.Dialogs.AreaComDialog"
+<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -51,7 +51,7 @@
         <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
                   HorizontalAlignment="Center" VerticalAlignment="Top"
                   Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
-                  IsChecked="{Binding MaintainYearTo}"/>
+                  IsChecked="{Binding MaintainYearFrom}"/>
 
         <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

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

Elwig/Documents/BusinessDocument.cshtml

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

Elwig/Documents/CreditNote.cshtml

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

Elwig/Documents/DeliveryAncmtList.cshtml

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

Elwig/Documents/DeliveryConfirmation.cshtml

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

Elwig/Documents/DeliveryDepreciationList.cs

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

Elwig/Documents/DeliveryDepreciationList.cshtml

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

Elwig/Documents/DeliveryDepreciationList.css

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

Elwig/Documents/DeliveryJournal.cs

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

Elwig/Documents/DeliveryJournal.cshtml

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

Elwig/Documents/DeliveryNote.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery large">
@@ -24,7 +24,7 @@
             <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <th>Menge</th>
         </tr>
         <tr>
             <th class="unit">[°Oe]</th>

Elwig/Documents/Document.cs

@@ -23,7 +23,7 @@ namespace Elwig.Documents {
         public bool ShowFoldMarks = App.Config.Debug;
         public bool DoublePaged = false;
 
-        public string DataPath;
+        public string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
@@ -34,7 +34,7 @@ namespace Elwig.Documents {
 
         public Document(string title) {
             var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
@@ -44,8 +44,8 @@ namespace Elwig.Documents {
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
                 .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
                     .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
-                    .Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
+                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
             Date = DateOnly.FromDateTime(Utils.Today);
         }
@@ -78,6 +78,8 @@ namespace Elwig.Documents {
                 name = "CreditNote";
             } else if (this is DeliveryJournal) {
                 name = "DeliveryJournal";
+            } else if (this is DeliveryDepreciationList) {
+                name = "DeliveryDepreciationList";
             } else if (this is Letterhead) {
                 name = "Letterhead";
             } else if (this is DeliveryConfirmation) {

Elwig/Documents/Document.cshtml

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

Elwig/Documents/MemberDataSheet.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="member border">

Elwig/Documents/MemberList.cshtml

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

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -3,7 +3,7 @@
 @inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
 @model Elwig.Documents.PaymentVariantSummary
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
 <main>
     <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
     <h2>@Model.Variant.Name</h2>
@@ -111,8 +111,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
                 @{
                     var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.Price);
-                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
                 }
                 <th class="lborder tborder">Preis (abgewertet):</th>
                 <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
@@ -123,8 +123,8 @@
                 <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
                 @{
                     var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
                 }
                 <th class="lborder">Preis (ungeb., nicht abgew.):</th>
                 <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
@@ -135,8 +135,8 @@
                 <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
                 @{
                     var gebRows = Model.Data.Rows
-                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
-                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
                     var minGeb = gebRows.Min();
                     var maxGeb = gebRows.Max();
                 }
@@ -219,19 +219,22 @@
     </table>
     <table class="payment-variant-data">
         <colgroup>
-            <col style="width: 30mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 20mm;"/>
             <col style="width: 25mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 22mm;"/>
         </colgroup>
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th>Gradation</th>
                 <th colspan="2">ungebunden</th>
+                <th colspan="2">attributlos gebunden</th>
                 <th colspan="2">gebunden</th>
                 <th>Gesamt</th>
             </tr>
@@ -241,6 +244,8 @@
                 <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[kg]</th>
                 <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
                 <th>[@(Model.CurrencySymbol)]</th>
             </tr>
         </thead>
@@ -258,6 +263,8 @@
                         <th colspan="2">@hdr</th>
                         <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
                         <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.LowGeb.Weight):N0}")</td>
+                        <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
                         <td></td>
                         <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
@@ -267,9 +274,11 @@
                     <td>@(row.QualityLevel)</td>
                     <td class="center">@($"{row.Oe:N0}")</td>
                     <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
                     <td class="number">@($"{row.Amount:N2}")</td>
                 </tr>
                 lastHdr = hdr;

Elwig/Documents/WineQualityStatistics.cshtml

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

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.13.1</Version>
+    <Version>1.0.0.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -20,26 +20,22 @@
     <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="LinqKit" Version="1.3.0" />
-    <PackageReference Include="MailKit" Version="4.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
-    <PackageReference Include="NJsonSchema" Version="11.0.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.7" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3351.48" />
+    <PackageReference Include="NJsonSchema" Version="11.3.2" />
     <PackageReference Include="PdfiumViewer" Version="2.13.0" />
     <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
-    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.55" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.7" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.7" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -63,10 +63,12 @@ namespace Elwig.Helpers {
         public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
         public DbSet<PaymentCustom> CustomPayments { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
+        public DbSet<DeliveryPartBucket> DeliveryPartBuckets { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
         public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; }

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 31;
+        public static readonly int RequiredSchemaVersion = 32;
 
         private static int VersionOffset = 0;
 
@@ -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 & 0xFFFF));
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)((userVers >> 8) & 0xFF), (int)(userVers & 0xFF));
 
             if (App.Version > v) {
-                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | App.Version.Build;
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | (App.Version.Build << 8) | App.Version.Revision;
                 await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
             }
 

Elwig/Helpers/Billing/BillingData.cs

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

Elwig/Helpers/Billing/BillingVariant.cs

@@ -46,14 +46,14 @@ namespace Elwig.Helpers.Billing {
                            m.mgnr,
                            v.avnr,
                            ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
-                           ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
+                           IIF(lc.amount >= 0, ROUND(lp.amount / POW(10, s.precision - 2)), 0) AS prev_net_amount,
                            IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
                            ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
                            ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
                            ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) +
                            IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0)
                            AS modifiers,
-                           lc.modifiers AS prev_modifiers
+                           IIF(lc.amount >= 0, lc.modifiers, 0) AS prev_modifiers
                     FROM season s
                         JOIN payment_variant v ON v.year = s.year
                         LEFT JOIN payment_variant l ON l.year = s.year

Elwig/Helpers/Billing/GraphEntry.cs

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

Elwig/Helpers/ClientParameters.cs

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

Elwig/Helpers/ControlUtils.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Threading;
 using Brush = System.Windows.Media.Brush;
 using Brushes = System.Windows.Media.Brushes;
 
@@ -234,5 +235,21 @@ namespace Elwig.Helpers {
                 return null;
             }
         }
+
+        public static void InitializeDelayTimer(TextBox tb, Action<object, TextChangedEventArgs> handler) {
+            var timer = new DispatcherTimer {
+                Interval = TimeSpan.FromMilliseconds(250)
+            };
+            timer.Tick += (object? sender, EventArgs evt) => {
+                timer.Stop();
+                var (oSender, oEvent) = ((object, TextChangedEventArgs))timer.Tag;
+                handler(oSender, oEvent);
+            };
+            tb.TextChanged += (object sender, TextChangedEventArgs evt) => {
+                timer.Stop();
+                timer.Tag = (sender, evt);
+                timer.Start();
+            };
+        }
     }
 }

Elwig/Helpers/Export/Bki.cs

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

Elwig/Helpers/Export/ElwigData.cs

@@ -1,14 +1,15 @@
-using System.IO.Compression;
-using System.IO;
-using System.Threading.Tasks;
 using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System;
-using System.Text.Json.Nodes;
-using System.Linq;
-using System.Windows;
 using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
 using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
@@ -63,7 +64,8 @@ namespace Elwig.Helpers.Export {
                     List<WbRd> Riede,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
-                    List<DeliveryPartModifier> Modifiers)>();
+                    List<DeliveryPartModifier> Modifiers,
+                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
 
                 var metaData = new List<(string FileName, string ZwstId, string Device,
                     int? MemberNum, string? MemberFilters,
@@ -94,7 +96,11 @@ namespace Elwig.Helpers.Export {
                         areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
                         deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
 
-                    data.Add(new([], [], [], [], [], [], [], new([], [])));
+                    data.Add(new([], [], [], [], [], [], [], new([], [], new() {
+                        ["member"] = [],
+                        ["area_commitment"] = [],
+                        ["delivery"] = [],
+                    })));
                     var r = data[^1];
 
                     var membersJson = zip.GetEntry("members.json");
@@ -103,11 +109,13 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
+                            var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
                             r.Members.Add(m);
                             if (b != null) r.BillingAddresses.Add(b);
                             r.TelephoneNumbers.AddRange(telNrs);
                             r.EmailAddresses.AddRange(emailAddrs);
+                            if (timestamps.HasValue)
+                                r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                         }
                     }
 
@@ -117,12 +125,14 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
+                            var (areaCom, wbrd, timestamps) = obj.ToAreaCom(kgs, currentWbRde);
                             r.AreaCommitments.Add(areaCom);
                             if (wbrd != null) {
                                 currentWbRde[wbrd.KgNr].Add(wbrd);
                                 r.Riede.Add(wbrd);
                             }
+                            if (timestamps.HasValue)
+                                r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                         }
                     }
 
@@ -132,10 +142,12 @@ namespace Elwig.Helpers.Export {
                         string? line;
                         while ((line = await reader.ReadLineAsync()) != null) {
                             var obj = JsonNode.Parse(line)!.AsObject();
-                            var (d, parts, mods) = obj.ToDelivery(currentLsNrs, currentDids);
+                            var (d, parts, mods, timestamps) = obj.ToDelivery(currentLsNrs, currentDids);
                             r.Deliveries.Add(d);
                             r.DeliveryParts.AddRange(parts);
                             r.Modifiers.AddRange(mods);
+                            if (timestamps.HasValue)
+                                r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                         }
                     }
                 }
@@ -144,7 +156,7 @@ namespace Elwig.Helpers.Export {
                 var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
                 var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
 
-                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
@@ -272,6 +284,26 @@ namespace Elwig.Helpers.Export {
                     }
 
                     await ctx.SaveChangesAsync();
+
+                    var primaryKeys = new Dictionary<string, string>() {
+                        ["member"] = "mgnr, 0",
+                        ["area_commitment"] = "fbnr, 0",
+                        ["delivery"] = "year, did",
+                    };
+                    var updateStmts = timestamps
+                        .SelectMany(e => e.Value.Select(m => $"UPDATE {e.Key} " +
+                                                             $"SET ctime = {((DateTimeOffset)m.CreatedAt.ToUniversalTime()).ToUnixTimeSeconds()}, " +
+                                                                 $"mtime = {((DateTimeOffset)m.ModifiedAt.ToUniversalTime()).ToUnixTimeSeconds()} " +
+                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2});"));
+                    using var cnx = AppDbContext.Connect();
+                    await AppDbContext.ExecuteBatch(cnx, $"""
+                        BEGIN;
+                        UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        {string.Join("\n", updateStmts)}
+                        UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        COMMIT;
+                        """);
+
                     await AddImportedFiles(Path.GetFileName(meta.FileName));
                 }
                 App.HintContextChange();
@@ -460,15 +492,19 @@ namespace Elwig.Helpers.Export {
                     return obj;
                 }).ToArray()),
                 ["comment"] = m.Comment,
+                ["created_at"] = $"{m.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{m.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
             var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
             var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
             if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
                 throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
             }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new Member {
                 MgNr = mgnr,
                 PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
@@ -502,6 +538,7 @@ namespace Elwig.Helpers.Export {
                 ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
                 ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
             }, json["billing_address"] is JsonObject a ? new BillingAddr {
                 MgNr = mgnr,
                 FullName = a["name"]!.AsValue().GetValue<string>(),
@@ -519,7 +556,10 @@ namespace Elwig.Helpers.Export {
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            }).ToList());
+            }).ToList(),
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
         public static JsonObject ToJson(this AreaCom c) {
@@ -535,10 +575,12 @@ namespace Elwig.Helpers.Export {
                 ["year_from"] = c.YearFrom,
                 ["year_to"] = c.YearTo,
                 ["comment"] = c.Comment,
+                ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             WbRd? rd = null;
@@ -556,6 +598,8 @@ namespace Elwig.Helpers.Export {
                     rde.Add(rd);
                 }
             }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new AreaCom {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
@@ -568,7 +612,11 @@ namespace Elwig.Helpers.Export {
                 YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
-            }, newRd ? rd : null);
+                ImportedAt = DateTime.Now,
+            }, newRd ? rd : null,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
         public static JsonObject ToJson(this Delivery d) {
@@ -596,6 +644,8 @@ namespace Elwig.Helpers.Export {
                         ["manual_weighing"] = p.IsManualWeighing,
                         ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
                         ["comment"] = p.Comment,
+                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
                     };
                     if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
                     if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
@@ -609,10 +659,12 @@ namespace Elwig.Helpers.Export {
                     return obj;
                 }).ToArray()),
                 ["comment"] = d.Comment,
+                ["created_at"] = $"{d.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{d.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -621,6 +673,8 @@ namespace Elwig.Helpers.Export {
                 did = ++currentDids[year];
             }
             currentLsNrs[lsnr] = did;
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
             return (new Delivery {
                 Year = year,
                 DId = did,
@@ -631,6 +685,7 @@ namespace Elwig.Helpers.Export {
                 LsNr = lsnr,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
                 Year = year,
                 DId = did,
@@ -661,7 +716,10 @@ namespace Elwig.Helpers.Export {
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            })).ToList());
+            })).ToList(),
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
     }
 }

Elwig/Helpers/Export/Ods.cs

@@ -301,6 +301,7 @@ namespace Elwig.Helpers.Export {
                 if (units != null && units.Length > 0) {
                     int n = -1;
                     switch (units[0]) {
+                        case "#": n = 0; data = $"{v:N0}"; break;
                         case "%": n = 1; data = $"{v:N1}"; break;
                         case "€": n = 2; data = $"{v:N2}"; break;
                         case "€/kg": n = 4; data = $"{v:N4}"; break;
@@ -316,7 +317,7 @@ namespace Elwig.Helpers.Export {
                 c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
             }
 
-            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
         }
     }
 }

Elwig/Helpers/Extensions.cs

@@ -23,7 +23,7 @@ namespace Elwig.Helpers {
         }
 
         public static string? ReadUntil(this StreamReader reader, char delimiter) {
-            return ReadUntil(reader, new char[] { delimiter });
+            return ReadUntil(reader, [ delimiter ]);
         }
 
         public static string? ReadUntil(this StreamReader reader, char[] delimiter) {
@@ -45,7 +45,7 @@ namespace Elwig.Helpers {
         }
 
         public static Task<string?> ReadUntilAsync(this StreamReader reader, char delimiter) {
-            return ReadUntilAsync(reader, new char[] { delimiter });
+            return ReadUntilAsync(reader, [ delimiter ]);
         }
 
         public static async Task<string?> ReadUntilAsync(this StreamReader reader, char[] delimiter) {

Elwig/Helpers/Printing/Html.cs

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

Elwig/Helpers/Printing/Pdf.cs

@@ -14,7 +14,7 @@ using System.Drawing.Printing;
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string WinziPrint = new string[] { App.ExePath }
+        private static readonly string WinziPrint = new string[] { App.InstallPath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
             .Where(File.Exists)

Elwig/Helpers/Utils.cs

@@ -28,6 +28,9 @@ using LinqKit;
 using System.Linq.Expressions;
 using Elwig.Models;
 using Microsoft.Win32;
+using System.Globalization;
+using System.Threading;
+using System.Windows.Markup;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -118,6 +121,23 @@ namespace Elwig.Helpers {
             0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,
         ];
 
+        public static void OverrideCulture() {
+            var locale = new CultureInfo("de-AT", false);
+            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
+            CultureInfo.CurrentCulture = locale;
+            CultureInfo.CurrentUICulture = locale;
+            Thread.CurrentThread.CurrentCulture = locale;
+            Thread.CurrentThread.CurrentUICulture = locale;
+            CultureInfo.DefaultThreadCurrentCulture = locale;
+            CultureInfo.DefaultThreadCurrentUICulture = locale;
+            FrameworkElement.LanguageProperty.OverrideMetadata(
+                typeof(FrameworkElement),
+                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
+            );
+        }
+
         public static SerialPort OpenSerialConnection(string connection) {
             var m = SerialRegex.Match(connection);
             if (!m.Success)
@@ -414,8 +434,7 @@ namespace Elwig.Helpers {
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
             if (username != null || password != null)
-                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
-                    Utils.UTF8.GetBytes($"{username}:{password}")));
+                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Utils.UTF8.GetBytes($"{username}:{password}")));
             return client;
         }
 
@@ -434,6 +453,8 @@ namespace Elwig.Helpers {
         }
 
         public static async Task UploadExportData(string zip, string url, string username, string password) {
+            if (url.StartsWith("https://elwig.at/clients/"))
+                url = "https://sync.elwig.at/" + url[25..];
             if (!url.EndsWith('/')) url += "/";
             using var client = GetHttpClient(username, password, accept: "application/json");
             var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
@@ -443,6 +464,8 @@ namespace Elwig.Helpers {
         }
 
         public static async Task<JsonArray> GetExportMetaData(string url, string username, string password) {
+            if (url.StartsWith("https://elwig.at/clients/"))
+                url = "https://sync.elwig.at/" + url[25..];
             using var client = GetHttpClient(username, password, accept: "application/json");
             using var res = await client.GetAsync(url);
             res.EnsureSuccessStatusCode();
@@ -476,34 +499,39 @@ namespace Elwig.Helpers {
             if (App.Config.Smtp == null)
                 return false;
 
-            SmtpClient? client = null;
-            try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                client = await GetSmtpClient();
+            Mouse.OverrideCursor = Cursors.Wait;
 
-                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"));
+            var success = 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();
                 }
-                msg.Body = body;
-                await client!.SendAsync(msg);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                return false;
-            } finally {
-                if (client != null)
-                    await client.DisconnectAsync(true);
-                client?.Dispose();
-                Mouse.OverrideCursor = null;
-            }
-            return true;
+                return true;
+            });
+
+            Mouse.OverrideCursor = null;
+            return success;
         }
 
         public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
@@ -574,5 +602,76 @@ namespace Elwig.Helpers {
         public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
         public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int year) =>
             query.Where(c => ActiveAreaCommitments(year).Invoke(c));
+
+        public static async Task<(DateTime DateTime, string Type, int MgNr, string Name, string[] Addresses, string Subject, string[] Attachments)[]> GetSentMails(DateOnly? fromDate = null, DateOnly? toDate = null) {
+            var f = $"{fromDate:yyyy-MM-dd}";
+            var t = $"{toDate:yyyy-MM-dd}";
+            try {
+                var rows = new List<(DateTime, string, int, string, string[], string, string[])>();
+                var filenames = Directory.GetFiles(App.MailsPath, "????.csv")
+                    .Where(n => fromDate == null || Path.GetFileName(n).CompareTo($"{fromDate.Value.Year}.csv") >= 0)
+                    .Where(n => toDate   == null || Path.GetFileName(n).CompareTo($"{toDate.Value.Year}.csv")   <= 0)
+                    .Order();
+                foreach (var filename in filenames) {
+                    using var reader = new StreamReader(filename, Utils.UTF8);
+                    string? line;
+                    while ((line = await reader.ReadLineAsync()) != null) {
+                        try {
+                            if (line.Length < 20 || line[10] != ';' || line[19] != ';')
+                                continue;
+                            var date = line[..10];
+                            if (fromDate != null && date.CompareTo(f) < 0) {
+                                continue;
+                            } else if (toDate != null && date.CompareTo(t) > 0) {
+                                break;
+                            }
+                            var p = line.Split(';');
+                            rows.Add((
+                                DateOnly.ParseExact(p[0], "yyyy-MM-dd").ToDateTime(TimeOnly.ParseExact(p[1], "HH:mm:ss")),
+                                p[2],
+                                int.Parse(p[3]),
+                                p[4],
+                                p[5].Split(',').Select(a => a.Replace(" | ", "\n")).ToArray(),
+                                p[6],
+                                p[7].Split(',')
+                            ));
+                        } catch {
+                            continue;
+                        }
+                    }
+                }
+                return [.. rows];
+            } catch {
+                return [];
+            }
+        }
+
+        public static async Task AddSentMails(IEnumerable<(string Type, int MgNr, string Name, string[] Addresses, string Subject, string[] Attachments)> data) {
+            var now = DateTime.Now;
+            var filename = Path.Combine(App.MailsPath, $"{now.Year}.csv");
+            await File.AppendAllLinesAsync(filename, data.Select(d =>
+                $"{now:yyyy-MM-dd;HH:mm:ss};{d.Type};" +
+                $"{d.MgNr};{d.Name.Replace(';', ' ')};" +
+                $"{string.Join(',', d.Addresses.Select(a => a.Replace(';', ' ').Replace(',', ' ').Replace("\n", " | ")))};" +
+                $"{d.Subject.Replace(';', ' ')};" +
+                $"{string.Join(',', d.Attachments.Select(a => a.Replace(';', ' ').Replace(',', ' ')))}"
+            ), Utils.UTF8);
+        }
+
+        public static async Task<string?> FindSentMailBody(DateTime target) {
+            var dt = $"{target:yyyy-MM-dd_HH-mm-ss}_";
+            var filename = Directory.GetFiles(App.MailsPath, "????-??-??_??-??-??_*.txt")
+                .Where(n => Path.GetFileName(n).CompareTo(dt) <= 0)
+                .Order()
+                .LastOrDefault();
+            if (filename == null)
+                return null;
+            return await File.ReadAllTextAsync(filename, Utils.UTF8);
+        }
+
+        public static async Task AddSentMailBody(string subject, string body, int recipients) {
+            var filename = Path.Combine(App.MailsPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{NormalizeFileName(subject)}.txt");
+            await File.WriteAllTextAsync(filename, $"# {subject}\r\n# Vorgesehene Empfänger: {recipients}\r\n\r\n" + body, Utils.UTF8);
+        }
     }
 }

Elwig/Helpers/Validator.cs

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

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -58,11 +58,19 @@ namespace Elwig.Helpers.Weighing {
         }
 
         protected async Task<WeighingResult?> Receive() {
-            var line = await Reader.ReadUntilAsync("\r\n");
+            var line = "";
+            while (line.Length < 33) {
+                var ch = Reader.Read();
+                if (ch == -1) {
+                    return null;
+                } else if (line.Length > 0 || ch == ' ') {
+                    line += char.ToString((char)ch);
+                }
+            }
             if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
             if (line == null || line == "") {
                 return null;
-            } else if (line.Length != 35 || line[0] != ' ' || line[9] != ' ' || line[15] != ' ' || line[20] != ' ' || line[32] != ' ') {
+            } else if (line.Length != 33 || line[0] != ' ' || line[9] != ' ' || line[15] != ' ' || line[20] != ' ' || line[32] != ' ') {
                 throw new IOException($"Invalid event from scale: '{line}'");
             }
 

Elwig/Models/Dtos/AreaComUnderDeliveryData.cs

@@ -34,7 +34,7 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
-            return await table.FromSqlRaw($"""
+            return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
@@ -45,7 +45,7 @@ namespace Elwig.Models.Dtos {
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz
                         JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
-                    WHERE c.year = {year} AND m.active = 1
+                    WHERE c.year = {year}
                     ORDER BY m.mgnr, c.bucket
                     """).ToListAsync();
         }

Elwig/Models/Dtos/CreditNoteData.cs

@@ -49,7 +49,7 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
-            return await table.FromSqlRaw($"""
+            return await table.FromSql($"""
                 SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

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

Elwig/Models/Dtos/DeliveryAncmtListData.cs

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

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

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

Elwig/Models/Dtos/DeliveryJournalData.cs

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

Elwig/Models/Dtos/MemberAreaComsData.cs

@@ -0,0 +1,105 @@
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    class MemberAreaComsData : DataTable<MemberAreaComsRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = [
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("SortIds", "Sorte", null, 12),
+            ("AttrIds", "Attribut", null, 16),
+            ("Areas", "Fläche", "m²", 22),
+            ("DeliveryObligations", "Lieferpflicht", "kg", 22),
+            ("DeliveryRights", "Lieferrecht", "kg", 22),
+        ];
+
+        public MemberAreaComsData(IEnumerable<MemberAreaComsRow> rows, int year) :
+            base($"Flächenbindungen", $"Flächenbindungen pro Mitglied {year}", rows, FieldNames) {
+        }
+
+        public static async Task<MemberAreaComsData> ForSeason(DbSet<MemberAreaComsRowSingle> table, int year) {
+            return new MemberAreaComsData(
+               (await FromDbSet(table, year)).GroupBy(
+                   r => r.MgNr,
+                   (k, g) => new MemberAreaComsRow(g)
+             ), year);
+        }
+
+        private static async Task<IEnumerable<MemberAreaComsRowSingle>> FromDbSet(DbSet<MemberAreaComsRowSingle> table, int year) {
+            return await table.FromSql($"""
+                    SELECT m.mgnr, m.name AS name_1,
+                           COALESCE(m.prefix || ' ', '') || m.given_name ||
+                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                           p.plz, o.name AS ort, m.address,
+                           c.bucket, c.area, c.min_kg, c.max_kg
+                    FROM v_area_commitment_bucket_strict c
+                        LEFT JOIN member m ON m.mgnr = c.mgnr
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                    WHERE c.year = {year}
+                    ORDER BY m.mgnr, c.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class MemberAreaComsRow {
+        public int MgNr;
+        public string Name1;
+        public string? Name2;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] SortIds;
+        public string[] AttrIds;
+        public int[] Areas;
+        public int[] DeliveryObligations;
+        public int[] DeliveryRights;
+
+        public MemberAreaComsRow(IEnumerable<MemberAreaComsRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name1 = f.Name1;
+            Name2 = f.Name2;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
+            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            DeliveryObligations = rows.Select(r => r.MinKg).ToArray();
+            DeliveryRights = rows.Select(r => r.MaxKg).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class MemberAreaComsRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public string? Name2 { get; set; }
+        [Column("address")]
+        public required string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public required string Locality { get; set; }
+        [Column("bucket")]
+        public required string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("min_kg")]
+        public int MinKg { get; set; }
+        [Column("max_kg")]
+        public int MaxKg { get; set; }
+    }
+}

Elwig/Models/Dtos/MemberDeliveryPerVarietyData.cs

@@ -1,12 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    public class MemberDeliveryPerVariantData : DataTable<MemberDeliveryPerVariantRow> {
+    public class MemberDeliveryPerVarietyData : DataTable<MemberDeliveryPerVariantRow> {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
@@ -22,13 +21,12 @@ namespace Elwig.Models.Dtos {
             ("Yields", "Ertrag", "kg/ha", 22),
         ];
 
-
-        public MemberDeliveryPerVariantData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
+        public MemberDeliveryPerVarietyData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
             base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
         }
 
-        public static async Task<MemberDeliveryPerVariantData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
-            return new MemberDeliveryPerVariantData(
+        public static async Task<MemberDeliveryPerVarietyData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+            return new MemberDeliveryPerVarietyData(
                (await FromDbSet(table, year)).GroupBy(
                    r => r.MgNr,
                    (k, g) => new MemberDeliveryPerVariantRow(g)
@@ -36,7 +34,7 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
-            return await table.FromSqlRaw($"""
+            return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -25,7 +25,7 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<OverUnderDeliveryData> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
-            var rows = await table.FromSqlRaw($"""
+            var rows = await table.FromSql($"""
                 SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
@@ -33,14 +33,13 @@ namespace Elwig.Models.Dtos {
                        m.business_shares * s.min_kg_per_bs AS min_kg,
                        m.business_shares * s.max_kg_per_bs AS max_kg,
                        COALESCE(SUM(d.weight), 0) AS sum
-                FROM v_delivery d
-                    LEFT JOIN member m ON m.mgnr = d.mgnr
+                FROM season s, member m
                     LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                     LEFT JOIN AT_ort o ON o.okz = p.okz
-                    LEFT JOIN season s ON s.year = d.year
+                    LEFT JOIN v_delivery d ON (d.year, d.mgnr) = (s.year, m.mgnr)
                 WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
-                GROUP BY d.year, m.mgnr
-                ORDER BY 100.0 * sum / max_kg, m.mgnr;
+                GROUP BY s.year, m.mgnr
+                ORDER BY 100.0 * sum / max_kg, m.mgnr
                 """).ToListAsync();
             return new OverUnderDeliveryData(rows, year);
         }

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

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

Elwig/Models/Dtos/Transaction.cs

@@ -15,7 +15,7 @@ namespace Elwig.Models.Dtos {
 
         public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
             return variant.Credits
-                .Where(c => c.Member.Iban != null)
+                .Where(c => c.Member.Iban != null && c.Amount > 0)
                 .OrderBy(c => c.TgNr)
                 .Select(c => new Transaction(c))
                 .ToList();

Elwig/Models/Dtos/WeightBreakdownData.cs

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

Elwig/Models/Dtos/WineLocalityStatisticsData.cs

@@ -0,0 +1,60 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using static Elwig.Models.Dtos.WineLocalityStatisticsData;
+
+namespace Elwig.Models.Dtos {
+    class WineLocalityStatisticsData : DataTable<StatisticsRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("Branch", "Zwst.", null, 30),
+            ("KgNr", "KgNr.", null, 15),
+            ("Name", "Katastralgemeinde", null, 50),
+            ("Members", "Mitgl.", "#", 15),
+            ("Deliveries", "Lfrg.", "#", 15),
+            ("Parts", "Teill.", "#", 15),
+            ("Weight", "Menge", "kg", 20),
+            ("Gradation", "Gradation", "°Oe|°KMW", 30),
+        ];
+
+        public record struct StatisticsRow(
+            string Branch,
+            int? KgNr,
+            string? Name,
+            int Members,
+            int Deliveries,
+            int Parts,
+            int Weight,
+            (double Oe, double Kmw) Gradation
+        );
+
+        public WineLocalityStatisticsData(IEnumerable<StatisticsRow> rows, List<string> filterNames) :
+            base("Lieferstatistik pro Ort", "Lieferstatistik pro Ort", string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<WineLocalityStatisticsData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
+            return new((await query
+                .GroupBy(p => new {
+                    Branch = p.Delivery.Branch.Name,
+                    p.Kg!.KgNr,
+                    Kg = p.Kg!.AtKg.Name,
+                }, (k, g) => new {
+                    k.Branch,
+                    KgNr = (int?)k.KgNr,
+                    Kg = (string?)k.Kg,
+                    Members = g.Select(p => p.Delivery.Member).Distinct().Count(),
+                    Deliveries = g.Select(p => p.Delivery).Distinct().Count(),
+                    Parts = g.Count(),
+                    Weight = g.Sum(p => p.Weight),
+                    Kmw = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
+                })
+                .OrderByDescending(g => g.Weight)
+                .ThenBy(g => g.KgNr)
+                .ToListAsync()).Select(g => new StatisticsRow(g.Branch, g.KgNr, g.Kg, g.Members, g.Deliveries, g.Parts, g.Weight, (Utils.KmwToOe(g.Kmw), Math.Round(g.Kmw, 1)))), filterNames);
+        }
+    }
+}

Elwig/Models/Entities/AreaCom.cs

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

Elwig/Models/Entities/Credit.cs

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

Elwig/Models/Entities/Delivery.cs

@@ -4,6 +4,7 @@ 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 {
@@ -62,14 +63,36 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; private set; }
+        public long CTime { get; set; }
         [NotMapped]
-        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+        public DateTime CreatedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; private set; }
+        public long MTime { get; set; }
         [NotMapped]
-        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+        public DateTime ModifiedAt {
+            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
+            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("xtime")]
+        public long? XTime { get; set; }
+        [NotMapped]
+        public DateTime? ExportedAt {
+            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
+            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
+
+        [Column("itime")]
+        public long? ITime { get; set; }
+        [NotMapped]
+        public DateTime? ImportedAt {
+            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
+            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
+        }
 
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
@@ -96,6 +119,9 @@ namespace Elwig.Models.Entities {
         public string SortIdString => string.Join(", ", SortIds);
         public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
+        public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
+        public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
+
         public IEnumerable<string> Modifiers => Parts
             .SelectMany(p => p.Modifiers)
             .Select(m => m.Name)

Elwig/Models/Entities/DeliveryAncmt.cs

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

Elwig/Models/Entities/DeliveryPart.cs

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

Elwig/Models/Entities/Member.cs

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

Elwig/Models/Entities/PaymentVar.cs

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

Elwig/Models/Entities/WineVar.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Windows.Media;
 
 namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
@@ -20,6 +21,7 @@ namespace Elwig.Models.Entities {
 
         public bool IsRed => Type == "R";
         public bool IsWhite => Type == "W";
+        public Brush? Color => IsWhite ? Brushes.DarkGreen : IsRed ? Brushes.DarkRed : null;
 
         public WineVar() { }
 

Elwig/Resources/Sql/31-32.sql

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

Elwig/Services/AreaComService.cs

@@ -48,6 +48,7 @@ namespace Elwig.Services {
             var filterNotVar = new List<string>();
             var filterAttr = new List<string>();
             var filterNotAttr = new List<string>();
+            var filterSeasons = new List<int>();
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
@@ -87,6 +88,10 @@ namespace Elwig.Services {
                         filter.RemoveAt(i--);
                         filterNames.Add($"ohne {var[e[1..3].ToUpper()].Name}");
                         filterNames.Add($"ohne Attribut {attrId[e[3..].ToUpper()].Name}");
+                    } else if (e.Length == 4 && int.TryParse(e, out var year)) {
+                        filterSeasons.Add(year);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"laufend {e}");
                     }
                 }
 
@@ -94,18 +99,20 @@ namespace Elwig.Services {
                 if (filterNotVar.Count > 0) areaComQuery = areaComQuery.Where(a => !filterNotVar.Contains(a.AreaComType.WineVar.SortId));
                 if (filterAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId != null && filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
                 if (filterNotAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr!.AttrId == null || !filterNotAttr.Contains(a.AreaComType.WineAttr.AttrId));
+                foreach (var year in filterSeasons) areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, year);
             }
 
             return (filterNames, areaComQuery, filter);
         }
 
         public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            int newFbNr = (int)vm.FbNr!;
+            int newFbNr = vm.FbNr!.Value;
 
-            using (var ctx = new AppDbContext()) {
+            return await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
-                    MgNr = (int)vm.MgNr!,
+                    MgNr = vm.MgNr!.Value,
                     YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
                     VtrgId = vm.AreaComType!.VtrgId,
@@ -113,8 +120,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 = (int)vm.Area!,
+                    GstNr = vm.GstNr?.Trim() ?? "-",
+                    Area = vm.Area!.Value,
                 };
 
                 if (vm.Rd?.RdNr == 0) {
@@ -134,11 +141,9 @@ namespace Elwig.Services {
                 if (newFbNr != a.FbNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
-            }
 
-            App.HintContextChange();
-
-            return newFbNr;
+                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) {
@@ -247,5 +252,14 @@ 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.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
-            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
+            vm.StatusAncmtCreated = $"{a.CreatedAt:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtModified = a.ModifiedAt != a.CreatedAt ? $"{a.ModifiedAt:dd.MM.yyyy, HH:mm}" : "-";
         }
 
         public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
@@ -211,7 +211,8 @@ namespace Elwig.Services {
             int newMgNr = vm.MgNr!.Value;
             string newSortId = vm.SortId!;
 
-            using (var ctx = new AppDbContext()) {
+            return await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var a = new DeliveryAncmt {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? dsnr,
@@ -230,13 +231,11 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
 
                 if (oldDsNr != null && (oldYear != year || oldDsNr != dsnr || oldMgNr != newMgNr || oldSortId != newSortId)) {
-                    await ctx.Database.ExecuteSqlRawAsync($"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}')");
+                    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})");
                 }
-            }
 
-            App.HintContextChange();
-
-            return (year, dsnr, newMgNr, newSortId);
+                return (year, dsnr, newMgNr, newSortId);
+            });
         }
 
         public static async Task GenerateDeliveryAncmtList(this DeliveryAncmtAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -269,25 +268,29 @@ namespace Elwig.Services {
                     Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    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 = 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.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 = Cursors.Wait;
+                await Task.Run(async () => {
+                    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;
             }
         }
@@ -326,7 +329,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryAncmts.SumAsync(p => p.Weight);
             text = $"{weight:N0} kg";
-            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);
 
             if (await deliveryAncmts.AnyAsync()) {
                 var attrGroups = await deliveryAncmts

Elwig/Services/DeliveryScheduleService.cs

@@ -152,7 +152,8 @@ namespace Elwig.Services {
         public static async Task UpdateDeliverySchedule(this DeliveryScheduleAdminViewModel vm, int? oldYear, int? oldDsNr) {
             int year = vm.Date!.Value.Year;
 
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var s = new DeliverySchedule {
                     Year = oldYear ?? year,
                     DsNr = oldDsNr ?? await ctx.NextDsNr(year),
@@ -181,9 +182,7 @@ 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

@@ -24,7 +24,7 @@ namespace Elwig.Services {
     public static class DeliveryService {
 
         public enum ExportSubject {
-            FromFilters, FromToday, FromSeasonAndBranch, Selected,
+            FromFilters, FromToday, FromSeason, FromSeasonAndBranch, Selected,
         };
 
         public static async Task<Member?> GetMemberAsync(int mgnr) {
@@ -430,9 +430,10 @@ namespace Elwig.Services {
         }
 
         public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
-            DeliveryPart p;
+            return await Task.Run(async () => {
+                DeliveryPart p;
 
-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                 int year = oldYear ?? Utils.CurrentYear;
                 int did = oldDid ?? await ctx.NextDId(year);
                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -462,7 +463,7 @@ namespace Elwig.Services {
                     LNr = newLnr ?? oldDelivery!.LNr,
                     ZwstId = vm.Branch!.ZwstId,
                     LsNr = newLsNr ?? vm.LsNr!,
-                    MgNr = (int)vm.MgNr!,
+                    MgNr = vm.MgNr!.Value,
                     Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                 };
 
@@ -474,7 +475,7 @@ namespace Elwig.Services {
                     SortId = vm.WineVar!.SortId,
                     AttrId = vm.WineAttr?.AttrId,
                     CultId = vm.WineCult?.CultId,
-                    Kmw = (double)vm.GradationKmw!,
+                    Kmw = vm.GradationKmw!.Value,
                     QualId = vm.WineQualityLevel!.QualId,
                     HkId = vm.WineOrigin!.HkId,
                     KgNr = vm.WineKg?.KgNr,
@@ -488,7 +489,7 @@ namespace Elwig.Services {
                     Acid = vm.Acid,
                     Comment = string.IsNullOrEmpty(vm.PartComment) ? null : vm.PartComment,
 
-                    Weight = (int)vm.Weight!,
+                    Weight = vm.Weight!.Value,
                     IsManualWeighing = vm.IsManualWeighing,
                     ScaleId = vm.ScaleId,
                     WeighingData = vm.WeighingData,
@@ -524,17 +525,16 @@ namespace Elwig.Services {
                 }
 
                 await ctx.SaveChangesAsync();
-            }
 
-            App.HintContextChange();
-
-            return p;
+                return p;
+            });
         }
 
         public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
-            Delivery n;
+            return await Task.Run(async () => {
+                Delivery n;
 
-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                 bool anyLeft = false;
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
@@ -577,17 +577,15 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
                 if (!anyLeft)
                     await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-            }
 
-            App.HintContextChange();
-
-            return n;
+                return n;
+            });
         }
 
         public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
-            Delivery n;
-
-            using (var ctx = new AppDbContext()) {
+            return await Task.Run(async () => {
+                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))!;
@@ -616,15 +614,14 @@ 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})");
-            }
 
-            App.HintContextChange();
-
-            return n;
+                return n;
+            });
         }
 
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                 var d = (await ctx.Deliveries.FindAsync(year, did))!;
                 var dpnr = await ctx.NextDPNr(year, did);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
@@ -648,21 +645,21 @@ namespace Elwig.Services {
                     }
                 }
                 await ctx.SaveChangesAsync();
-            }
-
-            App.HintContextChange();
+            });
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            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 = 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 = null;
         }
 
@@ -707,14 +704,16 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    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 = 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 = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -725,58 +724,64 @@ namespace Elwig.Services {
                     Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            await ElwigData.Export(d.FileName, await query
+                                .Select(p => p.Delivery)
+                                .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 {
-                        await ElwigData.Export(d.FileName, await query
+                        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(), filterNames);
+                            .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 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 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.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 = 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 = null;
             }
         }
@@ -798,17 +803,122 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            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 = 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 = null;
         }
 
+        public static async Task GenerateLocalityStatistics(this DeliveryAdminViewModel vm, ExportSubject subject) {
+            using var ctx = new AppDbContext();
+            IQueryable<DeliveryPart> query;
+            List<string> filterNames = [];
+            if (subject == ExportSubject.FromFilters) {
+                var (f, _, q, _, _) = await vm.GetFilters(ctx);
+                query = q;
+                filterNames.AddRange(f);
+
+            } else {
+                throw new ArgumentException("Invalid value for ExportSubject");
+            }
+
+            var d = new SaveFileDialog() {
+                FileName = $"Lieferstatistik-{vm.FilterSeason ?? Utils.CurrentLastSeason}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                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 = null;
+            }
+        }
+
+        public static async Task GenerateDeliveryDepreciationList(this DeliveryAdminViewModel vm, ExportSubject subject, ExportMode mode) {
+            using var ctx = new AppDbContext();
+            IQueryable<DeliveryPart> query;
+            List<string> filterNames = [];
+            if (subject == ExportSubject.FromFilters) {
+                var (f, _, q, _, _) = await vm.GetFilters(ctx);
+                query = q;
+                filterNames.AddRange(f);
+            } else if (subject == ExportSubject.FromSeason) {
+                var year = vm.FilterSeason ?? Utils.CurrentLastSeason;
+                query = ctx.DeliveryParts
+                    .Where(p => p.Year == year);
+                filterNames.Add($"{year}");
+            } else {
+                throw new ArgumentException("Invalid value for ExportSubject");
+            }
+
+            query = query
+                .Where(p => p.QualId == "WEI")
+                .OrderBy(p => p.Delivery.MgNr)
+                .ThenBy(p => p.Delivery.DateString)
+                .ThenBy(p => p.Delivery.TimeString)
+                .ThenBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr);
+            filterNames.Remove("abgewertet");
+
+            if (mode == ExportMode.SaveList) {
+                var d = new SaveFileDialog() {
+                    FileName = $"{DeliveryDepreciationList.Name}-{vm.FilterSeason ?? Utils.CurrentLastSeason}.ods",
+                    DefaultExt = "ods",
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                    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 () => {
+                    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;
+            }
+        }
+
         private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
             var tb = new TextBlock() {
                 Text = text,
@@ -849,7 +959,7 @@ namespace Elwig.Services {
 
             var weight = await deliveryParts.SumAsync(p => p.Weight);
             wText = $"{weight:N0} kg";
-            wGrid.Add(("Gewicht", null, weight, null, weight));
+            wGrid.Add(("Menge", null, weight, null, weight));
 
             if (await deliveryParts.AnyAsync()) {
                 var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
@@ -950,7 +1060,7 @@ namespace Elwig.Services {
             wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             int rowNum = 0;
             foreach (var row in weightData) {
-                if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++;
+                if (rowNum != 0 && row.Item2 == null) rowNum++;
                 AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
@@ -965,11 +1075,19 @@ namespace Elwig.Services {
             AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
             rowNum = 1;
             foreach (var row in gradationData) {
-                if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
+                if (rowNum != 1 && row.Item2 == null) rowNum++;
                 AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
             }
 
             return (wGrid, gGrid);
         }
+
+        public static async Task DeleteDelivery(string lsnr) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
+                await ctx.SaveChangesAsync();
+            });
+        }
     }
 }

Elwig/Services/MemberService.cs

@@ -1,20 +1,20 @@
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System;
-using Microsoft.EntityFrameworkCore;
 using Elwig.Documents;
-using System.Windows.Input;
-using System.Windows;
+using Elwig.Helpers;
 using Elwig.Helpers.Billing;
-using Elwig.Models.Dtos;
 using Elwig.Helpers.Export;
-using Microsoft.Win32;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 using Elwig.ViewModels;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -25,7 +25,7 @@ namespace Elwig.Services {
 
         public static async Task InitInputs(this MemberAdminViewModel vm) {
             using var ctx = new AppDbContext();
-            vm.MgNrString = $"{await ctx.NextMgNr()}";
+            vm.MgNr = await ctx.NextMgNr();
             vm.EntryDate = DateTime.Now.ToString("dd.MM.yyyy");
             if (vm.BranchSource.Count() == 1)
                 vm.Branch = vm.BranchSource.First();
@@ -49,12 +49,17 @@ 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) {
             vm.IsMemberSelected = true;
-            vm.MgNrString = $"{m.MgNr}";
-            vm.PredecessorMgNrString = $"{m.PredecessorMgNr}";
+            vm.MgNr = m.MgNr;
+            vm.PredecessorMgNr = m.PredecessorMgNr;
             vm.IsJuridicalPerson = m.IsJuridicalPerson;
             vm.EnableMemberReferenceButton = m.PredecessorMgNr != null;
             vm.Prefix = m.Prefix;
@@ -73,10 +78,10 @@ namespace Elwig.Services {
             vm.IsDeceased = m.IsDeceased;
             vm.Address = m.Address;
             if (m.PostalDest.AtPlz is AT_PlzDest p) {
-                vm.PlzString = $"{p.Plz}";
+                vm.Plz = p.Plz;
                 vm.Ort = ControlUtils.GetItemFromSource(vm.OrtSource, p);
             } else {
-                vm.PlzString = null;
+                vm.Plz = null;
                 vm.Ort = null;
             }
 
@@ -114,19 +119,19 @@ namespace Elwig.Services {
                 vm.BillingName = billingAddr.FullName;
                 vm.BillingAddress = billingAddr.Address;
                 if (billingAddr.PostalDest.AtPlz is AT_PlzDest b) {
-                    vm.BillingPlzString = $"{b.Plz}";
+                    vm.BillingPlz = b.Plz;
                     vm.BillingOrt = ControlUtils.GetItemFromSource(vm.BillingOrtSource, b);
                 }
             } else {
                 vm.BillingName = null;
                 vm.BillingAddress = null;
-                vm.BillingPlzString = null;
+                vm.BillingPlz = null;
                 vm.BillingOrt = null;
             }
 
             vm.EntryDate = (m.EntryDateString != null) ? string.Join(".", m.EntryDateString.Split("-").Reverse()) : null;
             vm.ExitDate = (m.ExitDateString != null) ? string.Join(".", m.ExitDateString.Split("-").Reverse()) : null;
-            vm.BusinessSharesString = $"{m.BusinessShares}";
+            vm.BusinessShares = m.BusinessShares;
             vm.AccountingNr = m.AccountingNr;
             vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, m.ZwstId);
             vm.DefaultKg = (AT_Kg?)ControlUtils.GetItemFromSourceWithPk(vm.DefaultKgSource, m.DefaultKgNr);
@@ -137,6 +142,12 @@ namespace Elwig.Services {
             vm.ContactViaPost = m.ContactViaPost;
             vm.ContactViaEmail = m.ContactViaEmail;
 
+            vm.CreatedAt = $"{m.CreatedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAt = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ModifiedAtShort = $"{m.ModifiedAt:dd.MM.yyyy, HH:mm}";
+            vm.ExportedAt = m.ExportedAt == null ? "-" : $"{m.ExportedAt:dd.MM.yyyy, HH:mm:ss}";
+            vm.ImportedAt = m.ImportedAt == null ? "-" : $"{m.ImportedAt:dd.MM.yyyy, HH:mm:ss}";
+
             vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
             vm.StatusDeliveriesLastSeason = "...";
             vm.StatusDeliveriesLastSeasonToolTip = null;
@@ -148,6 +159,8 @@ namespace Elwig.Services {
             vm.StatusAreaCommitmentToolTip = null;
 
             Utils.RunBackground("Mitgliederdaten laden", async () => {
+                if (App.MainDispatcher == null)
+                    return;
                 using var ctx = new AppDbContext();
 
                 var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
@@ -210,6 +223,7 @@ namespace Elwig.Services {
             var filterLfbisNr = new List<string>();
             var filterUstIdNr = new List<string>();
             var filterAreaCom = new List<string>();
+            var filterNotAreaCom = new List<string>();
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
@@ -221,7 +235,15 @@ namespace Elwig.Services {
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
 
-                    if (e.Length >= 5 && e.Length <= 10 && "funktionär".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                    if (e.Equals("aktiv", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsActive);
+                        filter.RemoveAt(i--);
+                        filterNames.Add("aktive Mitglieder");
+                    } else if (e.Equals("!aktiv", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsActive);
+                        filter.RemoveAt(i--);
+                        filterNames.Add("inaktive Mitglieder");
+                    } else if (e.Length >= 5 && e.Length <= 10 && "funktionär".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
                         memberQuery = memberQuery.Where(m => m.IsFunktionär);
                         filter.RemoveAt(i--);
                         filterNames.Add("Funktionäre");
@@ -312,10 +334,22 @@ namespace Elwig.Services {
                         memberQuery = memberQuery.Where(m => m.TelephoneNumbers.Any(t => t.Number.Replace(" ", "").StartsWith(e)));
                         filter.RemoveAt(i--);
                         filterNames.Add($"Tel.-Nr. {e}");
+                    } else if (e.Length >= 5 && e.Length <= 14 && "flächenbindung".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        filterAreaCom.AddRange(areaComs.Keys);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Flächenbindung");
+                    } else if (e.Length >= 6 && e.Length <= 15 && "!flächenbindung".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        filterNotAreaCom.AddRange(areaComs.Keys);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"keine Flächenbindung");
                     } else if (areaComs.ContainsKey(e.ToUpper())) {
                         filterAreaCom.Add(e.ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add($"Flächenbindung {e.ToUpper()}");
+                    } else if (e.Length >= 3 && e[0] == '!' && areaComs.ContainsKey(e[1..].ToUpper())) {
+                        filterNotAreaCom.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Flächenbindung {e[1..].ToUpper()}");
                     } else if (Validator.CheckLfbisNr(e)) {
                         filterLfbisNr.Add(e);
                         filter.RemoveAt(i--);
@@ -334,7 +368,8 @@ namespace Elwig.Services {
                 if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
                 if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
                 if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
-                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments()).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterNotAreaCom.Count > 0) memberQuery = memberQuery.Where(m => !m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Utils.CurrentLastSeason)).All(c => filterNotAreaCom.Contains(c.VtrgId)));
                 if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
                 if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
             }
@@ -343,51 +378,57 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            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 = 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 = null;
         }
 
         public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                var b = new Billing(year);
-                await b.FinishSeason();
-                await b.CalculateBuckets();
-                App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                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.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);
+            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);
 
-                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;
         }
 
@@ -440,14 +481,16 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    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 = 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 = null;
                 }
             } else if (mode == ExportMode.Export) {
@@ -458,8 +501,33 @@ namespace Elwig.Services {
                     Title = $"{MemberList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var members = await query
+                                .OrderBy(m => m.MgNr)
+                                .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();
+                            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.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 members = await query
                             .OrderBy(m => m.MgNr)
                             .Include(m => m.BillingAddress)
@@ -471,99 +539,80 @@ namespace Elwig.Services {
                             .SelectMany(m => m.AreaCommitments)
                             .Include(c => c.Rd)
                             .ToListAsync();
-                        await ElwigData.Export(d.FileName, members, areaComs, filterNames);
+                        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 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.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 = 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 = 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!,
 
-            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!,
+                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
 
-                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                IsBuchführend = vm.IsBuchführend,
+                IsOrganic = vm.IsOrganic,
 
-                    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,
-                };
+                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 {
@@ -620,7 +669,7 @@ namespace Elwig.Services {
                         KgNr = c.KgNr,
                         GstNr = c.GstNr,
                         RdNr = c.RdNr,
-                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
                         YearTo = c.YearTo,
                     }));
 
@@ -646,11 +695,27 @@ namespace Elwig.Services {
                 if (newMgNr != m.MgNr) {
                     await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                 }
-            }
 
-            App.HintContextChange();
+                return newMgNr;
+            });
+        }
 
-            return newMgNr;
+        public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var l = (await ctx.Members.FindAsync(mgnr))!;
+                if (deletePaymentData) {
+                    ctx.RemoveRange(l.Credits);
+                }
+                if (deleteDeliveries) {
+                    ctx.RemoveRange(l.Deliveries);
+                }
+                if (deleteAreaComs) {
+                    ctx.RemoveRange(l.AreaCommitments);
+                }
+                ctx.Remove(l);
+                await ctx.SaveChangesAsync();
+            });
         }
     }
 }

Elwig/Services/PaymentVariantService.cs

@@ -0,0 +1,387 @@
+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;
@@ -96,10 +96,16 @@ namespace Elwig.ViewModels {
         private IEnumerable<object> _wineCultSource = [];
         [ObservableProperty]
         private string? _gradationOeString;
-        public double? GradationOe => double.TryParse(GradationOeString, out var oe) ? oe : null;
+        public double? GradationOe {
+            get => double.TryParse(GradationOeString, out var oe) ? oe : null;
+            set => GradationOeString = $"{value:0}";
+        }
         [ObservableProperty]
         private string? _gradationKmwString;
-        public double? GradationKmw => double.TryParse(GradationKmwString, out var kmw) ? kmw : null;
+        public double? GradationKmw {
+            get => double.TryParse(GradationKmwString, out var kmw) ? kmw : null;
+            set => GradationKmwString = $"{value:0.0}";
+        }
         [ObservableProperty]
         private WineQualLevel? _wineQualityLevel;
         [ObservableProperty]
@@ -152,10 +158,16 @@ namespace Elwig.ViewModels {
         private string? _partComment;
         [ObservableProperty]
         private string? _temperatureString;
-        public double? Temperature => double.TryParse(TemperatureString, out var t) ? t : null;
+        public double? Temperature {
+            get => double.TryParse(TemperatureString, out var t) ? t : null;
+            set => TemperatureString = $"{value:0.0}";
+        }
         [ObservableProperty]
         private string? _acidString;
-        public double? Acid => double.TryParse(AcidString, out var a) ? a : null;
+        public double? Acid {
+            get => double.TryParse(AcidString, out var a) ? a : null;
+            set => AcidString = $"{value:0.0}";
+        }
         [ObservableProperty]
         private bool _isLesewagen;
         [ObservableProperty]

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

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

Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs

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

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -11,14 +11,14 @@ namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
-        public bool MaintainAreaComYearTo = false;
+        public bool MaintainAreaComYearFrom = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
 
         [ObservableProperty]
         private string? _searchQuery = "";
-        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0)];
+        public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
         private bool _showOnlyActiveMembers;
@@ -39,7 +39,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _enableSearchInputs = true;
         [ObservableProperty]
-        private IEnumerable<bool> _memberHasDeliveries = [ .. Enumerable.Range(0, 9999).Select(i => false) ];
+        private IEnumerable<bool> _memberHasDeliveries = [.. Enumerable.Range(0, 9999).Select(i => false)];
 
         [ObservableProperty]
         private bool _memberListOrderByMgNr;
@@ -50,10 +50,16 @@ namespace Elwig.ViewModels {
 
         [ObservableProperty]
         private string? _mgNrString;
-        public int? MgNr => int.TryParse(MgNrString, out var mgnr) ? mgnr : null;
+        public int? MgNr {
+            get => int.TryParse(MgNrString, out var mgnr) ? mgnr : null;
+            set => MgNrString = $"{value}";
+        }
         [ObservableProperty]
         private string? _predecessorMgNrString;
-        public int? PredecessorMgNr => int.TryParse(PredecessorMgNrString, out var mgnr) ? mgnr : null;
+        public int? PredecessorMgNr {
+            get => int.TryParse(PredecessorMgNrString, out var mgnr) ? mgnr : null;
+            set => PredecessorMgNrString = $"{value}";
+        }
         [ObservableProperty]
         private bool _isJuridicalPerson;
         [ObservableProperty]
@@ -76,7 +82,10 @@ namespace Elwig.ViewModels {
         private string? _address;
         [ObservableProperty]
         private string? _plzString;
-        public int? Plz => int.TryParse(PlzString, out var plz) ? plz : null;
+        public int? Plz {
+            get => int.TryParse(PlzString, out var plz) ? plz : null;
+            set => PlzString = $"{value}";
+        }
         [ObservableProperty]
         private AT_PlzDest? _ort;
         [ObservableProperty]
@@ -88,7 +97,10 @@ namespace Elwig.ViewModels {
         private string? _billingAddress;
         [ObservableProperty]
         private string? _billingPlzString;
-        public int? BillingPlz => int.TryParse(BillingPlzString, out var plz) ? plz : null;
+        public int? BillingPlz {
+            get => int.TryParse(BillingPlzString, out var plz) ? plz : null;
+            set => BillingPlzString = $"{value}";
+        }
         [ObservableProperty]
         private AT_PlzDest? _billingOrt;
         [ObservableProperty]
@@ -114,7 +126,10 @@ namespace Elwig.ViewModels {
         private string? _exitDate;
         [ObservableProperty]
         private string? _businessSharesString;
-        public int? BusinessShares => int.TryParse(BusinessSharesString, out var bs) ? bs : null;
+        public int? BusinessShares {
+            get => int.TryParse(BusinessSharesString, out var bs) ? bs : null;
+            set => BusinessSharesString = $"{value}";
+        }
         [ObservableProperty]
         private string? _accountingNr;
         [ObservableProperty]
@@ -138,6 +153,17 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private bool _contactViaEmail;
 
+        [ObservableProperty]
+        private string _createdAt = "-";
+        [ObservableProperty]
+        private string _modifiedAt = "-";
+        [ObservableProperty]
+        private string _modifiedAtShort = "-";
+        [ObservableProperty]
+        private string _exportedAt = "-";
+        [ObservableProperty]
+        private string _importedAt = "-";
+
         public ObservableCollection<string?> EmailAddresses { get; private set; } = [null, null, null, null, null, null, null, null, null];
 
         public partial class PhoneNr(int? type = null, string? number = null, string? comment = null) : ObservableObject {
@@ -147,6 +173,14 @@ namespace Elwig.ViewModels {
             public string? _number = number;
             [ObservableProperty]
             public string? _comment = comment;
+
+            public override bool Equals(object? obj) {
+                return obj is PhoneNr nr && Type == nr.Type && Number == nr.Number && Comment == nr.Comment;
+            }
+
+            public override int GetHashCode() {
+                return Type ^ (Number?.GetHashCode() ?? 0) ^ (Comment?.GetHashCode() ?? 0);
+            }
         }
         public ObservableCollection<PhoneNr> PhoneNrs { get; private set; } = [new(), new(), new(), new(), new(), new(), new(), new(), new()];
 

Elwig/ViewModels/PaymentVariantsViewModel.cs

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

Elwig/Windows/AdministrationWindow.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Threading;
 using System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -358,22 +357,6 @@ namespace Elwig.Windows {
             UpdateComboBox(ortInput);
         }
 
-        protected static void InitializeDelayTimer(TextBox tb, Action<object, TextChangedEventArgs> handler) {
-            var timer = new DispatcherTimer {
-                Interval = TimeSpan.FromMilliseconds(250)
-            };
-            timer.Tick += (object? sender, EventArgs evt) => {
-                timer.Stop();
-                var (oSender, oEvent) = ((object, TextChangedEventArgs))timer.Tag;
-                handler(oSender, oEvent);
-            };
-            tb.TextChanged += (object sender, TextChangedEventArgs evt) => {
-                timer.Stop();
-                timer.Tag = (sender, evt);
-                timer.Start();
-            };
-        }
-
         protected bool InputTextChanged(TextBox input) {
             return InputTextChanged(input, new ValidationResult(true, null));
         }
@@ -587,6 +570,14 @@ 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="550" MinHeight="450" Width="920" MinWidth="860"
+        Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
@@ -57,7 +57,7 @@
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" MinWidth="555"/>
+            <ColumnDefinition Width="3*" MinWidth="500"/>
             <ColumnDefinition Width="5"/>
             <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
@@ -88,8 +88,9 @@
                         <LineBreak/>
                         Filtern nach:<LineBreak/>
                         <Bold>Sorte</Bold>: z.B. GV, zw, RR, ...<LineBreak/>
-                        <Bold>Attribut</Bold>: z.B. Kabinett, dac, ... <LineBreak/>
-                        <Bold>Flächenbindung</Bold>: z.B. GVK, GVD, ...
+                        <Bold>Attribut</Bold>: z.B. Kabinett, dac, ...<LineBreak/>
+                        <Bold>Flächenbindung</Bold>: z.B. GVK, GVD, ...<LineBreak/>
+                        <Bold>Saison</Bold>: z.B. 2020, 2019... (in dieser Saison aktiv)
                     </TextBlock>
                 </TextBox.ToolTip>
             </TextBox>
@@ -101,25 +102,35 @@
                       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}"          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 Header="FbNr." Binding="{Binding FbNr, StringFormat='{}{0} '}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70">
+                    <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" 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="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"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -142,19 +153,19 @@
                 </Button.ToolTip>
             </Button>
 
-            <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="SaveButton" Content="Speichern" Click="SaveButton_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="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
+            <Button x:Name="ResetButton" Content="Zurücksetzen" Click="ResetButton_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="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
+            <Button x:Name="CancelButton" Content="Abbrechen" Click="CancelButton_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>
@@ -174,33 +185,32 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="48"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <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"/>
                     <TextBox x:Name="FbNrInput" Text="{Binding FbNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
+                             Margin="0,10,10,0" Width="56" HorizontalAlignment="Left" Grid.Column="3" TextAlignment="Right"
                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                    <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"/>
+                    <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
+                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
-
-                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <Label Content="–" Grid.Column="1" Grid.ColumnSpan="3" Margin="45,40,0,0"/>
                     <TextBox x:Name="YearToInput" Text="{Binding YearToString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
+                             Margin="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="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}"
-                              DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
+                              ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" 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,13 +1,14 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
+using Elwig.Dialogs;
 using Elwig.Helpers;
 using Elwig.Models.Entities;
-using System;
-using System.Threading.Tasks;
-using Elwig.ViewModels;
 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 System.Windows.Input;
 
 namespace Elwig.Windows {
@@ -25,15 +26,15 @@ namespace Elwig.Windows {
             ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ExemptInputs = [
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
-                EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
-                AreaCommitmentResetButton, AreaCommitmentCancelButton, SearchInput, ActiveAreaCommitmentInput
+                EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
+                ResetButton, CancelButton, SearchInput, ActiveAreaCommitmentInput
             ];
             RequiredInputs = [
                 FbNrInput, YearFromInput, KgInput, RdInput,
                 GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
             ];
 
-            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ActiveAreaCommitmentInput.Content = ((string)ActiveAreaCommitmentInput.Content).Replace("2020", $"{Utils.CurrentLastSeason}");
         }
@@ -163,8 +164,8 @@ namespace Elwig.Windows {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
-            HideAreaCommitmentNewEditDeleteButtons();
-            ShowAreaCommitmentSaveResetCancelButtons();
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
             UnlockInputs();
             await InitInputs();
             LockSearchInputs();
@@ -184,8 +185,8 @@ namespace Elwig.Windows {
             IsEditing = true;
             AreaCommitmentList.IsEnabled = false;
 
-            HideAreaCommitmentNewEditDeleteButtons();
-            ShowAreaCommitmentSaveResetCancelButtons();
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
             UnlockInputs();
             LockSearchInputs();
         }
@@ -199,70 +200,107 @@ namespace Elwig.Windows {
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             if (AreaCommitmentList.SelectedItem is not AreaCom a)
                 return;
-            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);
+
+            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);
                 }
-                Mouse.OverrideCursor = 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 löschen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            Mouse.OverrideCursor = null;
         }
 
         protected override void ShortcutSave() {
-            if (!AreaCommitmentSaveButton.IsEnabled || AreaCommitmentSaveButton.Visibility != Visibility.Visible)
+            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
                 return;
-            AreaCommitmentSaveButton_Click(null, null);
+            SaveButton_Click(null, null);
         }
 
-        private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            AreaCommitmentSaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+        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;
+            }
 
             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);
-                AreaCommitmentSaveButton.IsEnabled = true;
-                return;
-            } finally {
+                SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideAreaCommitmentSaveResetCancelButtons();
-            ShowAreaCommitmentNewEditDeleteButtons();
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
             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 (!AreaCommitmentResetButton.IsEnabled || AreaCommitmentResetButton.Visibility != Visibility.Visible)
+            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
                 return;
-            AreaCommitmentResetButton_Click(null, null);
+            ResetButton_Click(null, null);
         }
 
-        private async void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
                 RefreshInputs();
             } else if (IsCreating) {
@@ -271,12 +309,12 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private void AreaCommitmentCancelButton_Click(object sender, RoutedEventArgs evt) {
+        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            HideAreaCommitmentSaveResetCancelButtons();
-            ShowAreaCommitmentNewEditDeleteButtons();
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
             RefreshInputs();
             ClearInputStates();
             LockInputs();
@@ -286,49 +324,49 @@ namespace Elwig.Windows {
         override protected void UpdateButtons() {
             if (!IsEditing && !IsCreating) return;
             bool ch = HasChanged, v = IsValid;
-            AreaCommitmentResetButton.IsEnabled = (ch);
-            AreaCommitmentSaveButton.IsEnabled = (ch && v);
+            ResetButton.IsEnabled = (ch);
+            SaveButton.IsEnabled = (ch && v);
         }
 
-        private void DisableAreaCommitmentNewEditDeleteButtons() {
+        private void DisableNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = false;
             EditAreaCommitmentButton.IsEnabled = false;
             DeleteAreaCommitmentButton.IsEnabled = false;
         }
 
-        private void EnableAreaCommitmentNewEditDeleteButtons() {
+        private void EnableNewEditDeleteButtons() {
             NewAreaCommitmentButton.IsEnabled = true;
             EditAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
             DeleteAreaCommitmentButton.IsEnabled = AreaCommitmentList.SelectedItem != null;
         }
 
-        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 ShowSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = true;
+            SaveButton.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Visible;
+            CancelButton.Visibility = Visibility.Visible;
         }
 
-        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 HideSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = false;
+            SaveButton.Visibility = Visibility.Hidden;
+            ResetButton.Visibility = Visibility.Hidden;
+            CancelButton.Visibility = Visibility.Hidden;
         }
 
-        private void ShowAreaCommitmentNewEditDeleteButtons() {
-            EnableAreaCommitmentNewEditDeleteButtons();
+        private void ShowNewEditDeleteButtons() {
+            EnableNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Visible;
             EditAreaCommitmentButton.Visibility = Visibility.Visible;
             DeleteAreaCommitmentButton.Visibility = Visibility.Visible;
         }
 
-        private void HideAreaCommitmentNewEditDeleteButtons() {
-            DisableAreaCommitmentNewEditDeleteButtons();
+        private void HideNewEditDeleteButtons() {
+            DisableNewEditDeleteButtons();
             NewAreaCommitmentButton.Visibility = Visibility.Hidden;
             EditAreaCommitmentButton.Visibility = Visibility.Hidden;
             DeleteAreaCommitmentButton.Visibility = Visibility.Hidden;
@@ -345,6 +383,8 @@ 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,6 +122,12 @@
                              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"
@@ -330,7 +336,7 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30" Foreground="{Binding WineVar.Color}"/>
                                     <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.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Add(new Season {
@@ -209,7 +209,7 @@ namespace Elwig.Windows {
                 $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
                 "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Remove(s);

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -58,6 +58,8 @@ namespace Elwig.Windows {
 
             foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE wine_attribute SET attrid = {attrid} WHERE attrid = {old}");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = (sortid || COALESCE(attrid, '') || COALESCE(disc, '')) WHERE attrid = {attrid}");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(REPLACE(data, '/{old}\"', '/{attrid}\"'), '/{old}-', '/{attrid}-')");
             }
             await ctx.SaveChangesAsync();
 

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -58,6 +58,7 @@ namespace Elwig.Windows {
 
             foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE wine_cultivation SET cultid = {cultid} WHERE cultid = {old}");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(data, '-{old}\"', '-{cultid}\"')");
             }
             await ctx.SaveChangesAsync();
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -318,8 +318,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 await Save();
             } catch (Exception exc) {
@@ -327,9 +326,8 @@ namespace Elwig.Windows {
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -349,6 +347,7 @@ namespace Elwig.Windows {
             }
 
             App.HintContextChange();
+            Mouse.OverrideCursor = null;
         }
 
         private void FillInputs(ClientParameters p, Season? s) {
@@ -367,6 +366,7 @@ 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,26 +393,27 @@ namespace Elwig.Windows {
 
         private async Task UpdateClientParameters(ClientParameters p) {
             p.Name = ClientNameInput.Text;
-            p.NameSuffix = ClientNameSuffixInput.Text.Length > 0 ? ClientNameSuffixInput.Text : null;
+            p.NameSuffix = string.IsNullOrEmpty(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
             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 = 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.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.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
+            p.TextDeliveryNote = string.IsNullOrEmpty(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
             p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
-            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
-            p.TextCreditNote = TextElementCreditNote.Text.Length > 0 ? TextElementCreditNote.Text : null;
+            p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
+            p.TextCreditNote = string.IsNullOrEmpty(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
 
             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}" Width="150"/>
-                            <TextBlock Text="{Binding Variety.Type}" Width="30"/>
+                            <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 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}" Width="30"/>
-                        <TextBlock Text="{Binding VaributeStringSimple}" ToolTip="{Binding VaributeString}"/>
+                        <TextBlock Text="{Binding Id}" Foreground="{Binding Color}" Width="30"/>
+                        <TextBlock Text="{Binding VaributeStringSimple}" Foreground="{Binding Color}"  ToolTip="{Binding VaributeString}"/>
                     </StackPanel>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+        <Button x:Name="SaveButton" Content="Speichern &amp; Berechnen" IsEnabled="False"
             HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,10" Grid.Column="0" Grid.Row="2"
             Click="SaveButton_Click"/>
 

Elwig/Windows/ChartWindow.xaml.cs

@@ -10,7 +10,6 @@ using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
 using ScottPlot.Plottables;
 using ScottPlot;
-using ScottPlot.Control;
 
 namespace Elwig.Windows {
     public partial class ChartWindow : ContextWindow {
@@ -226,30 +225,8 @@ namespace Elwig.Windows {
             DataPlot.Color = ColorUngebunden;
             DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
 
-            OechslePricePlot.Interaction.Enable(new PlotActions() {
-                ZoomIn = StandardActions.ZoomIn,
-                ZoomOut = StandardActions.ZoomOut,
-                PanUp = StandardActions.PanUp,
-                PanDown = StandardActions.PanDown,
-                PanLeft = StandardActions.PanLeft,
-                PanRight = StandardActions.PanRight,
-                DragPan = StandardActions.DragPan,
-                DragZoom = StandardActions.DragZoom,
-                DragZoomRectangle = StandardActions.DragZoomRectangle,
-                ZoomRectangleClear = StandardActions.ZoomRectangleClear,
-                ZoomRectangleApply = StandardActions.ZoomRectangleApply,
-                AutoScale = StandardActions.AutoScale,
-            });
-
-            //OechslePricePlot.Plot.XAxis.ManualTickSpacing(1);
-            //OechslePricePlot.Plot.YAxis.ManualTickSpacing(0.1);
             OechslePricePlot.Plot.Axes.SetLimits(Math.Min(GraphEntry.MinX, GraphEntry.MinXGeb) - 1, GraphEntry.MaxX + 1, -0.1, 1.5);
 
-            //OechslePricePlot.Plot.Layout(padding: 0);
-            //OechslePricePlot.Plot.XAxis2.Layout(padding: 0);
-            //OechslePricePlot.Plot.YAxis.Layout(padding: 0);
-            //OechslePricePlot.Plot.YAxis2.Layout(padding: 0);
-
             HighlightedPointPlot = OechslePricePlot.Plot.Add.Marker(0, 0, MarkerShape.OpenCircle, 10, Colors.Red);
             HighlightedPointPlot.IsVisible = false;
 
@@ -662,10 +639,11 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
 
             try {
-                using (var ctx = new AppDbContext()) {
+                await Task.Run(async () => {
+                    using var ctx = new AppDbContext();
                     var origData = BillingData.FromJson(PaymentVar.Data);
                     var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
                         AllVaributesAssigned, AllVaributesAssignedAbgew);
@@ -673,21 +651,31 @@ 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();
+                });
+            } 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

@@ -67,13 +67,29 @@
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Lieferschein">
                 <MenuItem x:Name="Menu_DeliveryNote_Show" Header="...anzeigen (PDF)" IsEnabled="False"
-                          Click="Menu_DeliveryNote_Show_Click" InputGestureText="Strg+P"/>
+                          Click="Menu_DeliveryNote_Show_Click" InputGestureText="Strg+P">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8FF;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryNote_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
-                          Click="Menu_DeliveryNote_SavePdf_Click"/>
+                          Click="Menu_DeliveryNote_SavePdf_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA90;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryNote_Print" Header="...drucken" IsEnabled="False"
-                          Click="Menu_DeliveryNote_Print_Click" InputGestureText="Strg+Shift+P"/>
+                          Click="Menu_DeliveryNote_Print_Click" InputGestureText="Strg+Shift+P">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE749;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryNote_Email" Header="...per E-Mail schicken" IsEnabled="False"
-                          Click="Menu_DeliveryNote_Email_Click"/>
+                          Click="Menu_DeliveryNote_Email_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE89C;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Lieferjournal">
                 <MenuItem x:Name="Menu_DeliveryJournal_SaveFilters" Header="...aus Filtern speichern... (Excel)"
@@ -94,31 +110,56 @@
                 <MenuItem x:Name="Menu_DeliveryJournal_PrintToday" Header="...von heute drucken"
                           Click="Menu_DeliveryJournal_PrintToday_Click" InputGestureText="Strg+J"/>
             </MenuItem>
-            <MenuItem Header="Qualitätsstatistik" x:Name="Menu_WineQualityStatistics">
-                <MenuItem x:Name="Menu_WineQualityStatistics_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
-                          Click="Menu_WineQualityStatistics_ShowFilters_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
-                          Click="Menu_WineQualityStatistics_SavePdfFilters_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_PrintFilters" Header="...aus Filtern drucken"
-                          Click="Menu_WineQualityStatistics_PrintFilters_Click"/>
+            <MenuItem Header="Abwertungsliste" x:Name="Menu_DeliveryDepreciationList">
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_SaveFilters" Header="...aus Filtern speichern... (Excel)"
+                          Click="Menu_DeliveryDepreciationList_SaveFilters_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
+                          Click="Menu_DeliveryDepreciationList_ShowFilters_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
+                          Click="Menu_DeliveryDepreciationList_SavePdfFilters_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_PrintFilters" Header="...aus Filtern drucken"
+                          Click="Menu_DeliveryDepreciationList_PrintFilters_Click"/>
                 <Separator/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ShowToday" Header="...von heute anzeigen (PDF)"
-                          Click="Menu_WineQualityStatistics_ShowToday_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_SavePdfToday" Header="...von heute speichern... (PDF)"
-                          Click="Menu_WineQualityStatistics_SavePdfToday_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_PrintToday" Header="...von heute drucken"
-                          Click="Menu_WineQualityStatistics_PrintToday_Click" InputGestureText="Strg+Q"/>
-                <Separator/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ModeOe" Header="...nach °Oe aufschlüsseln" IsCheckable="True" IsChecked="True"
-                          Click="Menu_WineQualityStatistics_Mode_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ModeKmw10" Header="...nach °KMW aufschlüsseln (&#x2152;)" IsCheckable="True"
-                          Click="Menu_WineQualityStatistics_Mode_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ModeKmw5" Header="...nach °KMW aufschlüsseln (&#x2155;)" IsCheckable="True"
-                          Click="Menu_WineQualityStatistics_Mode_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ModeKmw2" Header="...nach °KMW aufschlüsseln (&#x00BD;)" IsCheckable="True"
-                          Click="Menu_WineQualityStatistics_Mode_Click"/>
-                <MenuItem x:Name="Menu_WineQualityStatistics_ModeKmw1" Header="...nach °KMW aufschlüsseln (ganze)" IsCheckable="True"
-                          Click="Menu_WineQualityStatistics_Mode_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_SaveSeason" Header="...von Saison speichern... (Excel)"
+                          Click="Menu_DeliveryDepreciationList_SaveSeason_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_ShowSeason" Header="...von Saison anzeigen (PDF)"
+                          Click="Menu_DeliveryDepreciationList_ShowSeason_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_SavePdfSeason" Header="...von Saison speichern... (PDF)"
+                          Click="Menu_DeliveryDepreciationList_SavePdfSeason_Click"/>
+                <MenuItem x:Name="Menu_DeliveryDepreciationList_PrintSeason" Header="...von Saison drucken"
+                          Click="Menu_DeliveryDepreciationList_PrintSeason_Click"/>
+            </MenuItem>
+            <MenuItem Header="Statistik" x:Name="Menu_Statistics">
+                <MenuItem Header="Qualitätsstatistik..." x:Name="Menu_Statistics_WineQuality">
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
+                              Click="Menu_Statistics_WineQuality_ShowFilters_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
+                              Click="Menu_Statistics_WineQuality_SavePdfFilters_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_PrintFilters" Header="...aus Filtern drucken"
+                              Click="Menu_Statistics_WineQuality_PrintFilters_Click"/>
+                    <Separator/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ShowToday" Header="...von heute anzeigen (PDF)"
+                              Click="Menu_Statistics_WineQuality_ShowToday_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_SavePdfToday" Header="...von heute speichern... (PDF)"
+                              Click="Menu_Statistics_WineQuality_SavePdfToday_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_PrintToday" Header="...von heute drucken"
+                              Click="Menu_Statistics_WineQuality_PrintToday_Click" InputGestureText="Strg+Q"/>
+                    <Separator/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ModeOe" Header="...nach °Oe aufschlüsseln" IsCheckable="True" IsChecked="True"
+                              Click="Menu_Statistics_WineQuality_Mode_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ModeKmw10" Header="...nach °KMW aufschlüsseln (&#x2152;)" IsCheckable="True"
+                              Click="Menu_Statistics_WineQuality_Mode_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ModeKmw5" Header="...nach °KMW aufschlüsseln (&#x2155;)" IsCheckable="True"
+                              Click="Menu_Statistics_WineQuality_Mode_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ModeKmw2" Header="...nach °KMW aufschlüsseln (&#x00BD;)" IsCheckable="True"
+                              Click="Menu_Statistics_WineQuality_Mode_Click"/>
+                    <MenuItem x:Name="Menu_Statistics_WineQuality_ModeKmw1" Header="...nach °KMW aufschlüsseln (ganze)" IsCheckable="True"
+                              Click="Menu_Statistics_WineQuality_Mode_Click"/>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Statistics_Locality" Header="Lieferstatistik pro Ort...">
+                    <MenuItem x:Name="Menu_Statistic_Locality_SaveFilters" Header="...aus Filtern speichern... (Excel)"
+                              Click="Menu_Statistic_Locality_SaveFilters_Click"/>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="BKI">
                 <MenuItem x:Name="Menu_Bki_SaveList" Header="Traubentransportscheinliste speichern..."/>
@@ -176,7 +217,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Menge der gesamten Lieferung)<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                         <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                         <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@@ -227,11 +268,12 @@
                     <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>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -397,7 +439,7 @@
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{Binding DPNr}" Width="13" TextAlignment="Right" Margin="0,0,7,0"/>
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding SortId}" Foreground="{Binding Variety.Color}" TextAlignment="Center" 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"/>
@@ -419,7 +461,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}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVar.Color}"
                              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}"
@@ -475,7 +517,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+            <GroupBox Header="Menge" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="70"/>
@@ -628,7 +670,7 @@
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -41,7 +41,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlP, Menu_DeliveryNote_Show_Click));
             CommandBindings.Add(new CommandBinding(CtrlO, Menu_DeliveryJournal_ShowFilters_Click));
             CommandBindings.Add(new CommandBinding(CtrlJ, Menu_DeliveryJournal_PrintToday_Click));
-            CommandBindings.Add(new CommandBinding(CtrlQ, Menu_WineQualityStatistics_PrintToday_Click));
+            CommandBindings.Add(new CommandBinding(CtrlQ, Menu_Statistics_WineQuality_PrintToday_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_DeliveryNote_Print_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftO, Menu_DeliveryJournal_PrintFilters_Click));
             RequiredInputs = [
@@ -66,7 +66,7 @@ namespace Elwig.Windows {
             SecondsTimer.Tick += new EventHandler(OnSecondPassed);
             SecondsTimer.Interval = new TimeSpan(0, 0, 1);
 
-            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
 
@@ -97,17 +97,17 @@ namespace Elwig.Windows {
                 WeighingDButton.Visibility = Visibility.Hidden;
             }
 
-            Menu_WineQualityStatistics_ModeOe.IsChecked = false;
-            Menu_WineQualityStatistics_ModeKmw1.IsChecked = false;
-            Menu_WineQualityStatistics_ModeKmw2.IsChecked = false;
-            Menu_WineQualityStatistics_ModeKmw5.IsChecked = false;
-            Menu_WineQualityStatistics_ModeKmw10.IsChecked = false;
+            Menu_Statistics_WineQuality_ModeOe.IsChecked = false;
+            Menu_Statistics_WineQuality_ModeKmw1.IsChecked = false;
+            Menu_Statistics_WineQuality_ModeKmw2.IsChecked = false;
+            Menu_Statistics_WineQuality_ModeKmw5.IsChecked = false;
+            Menu_Statistics_WineQuality_ModeKmw10.IsChecked = false;
             switch (App.Client.OrderingMemberList) {
-                case 0: Menu_WineQualityStatistics_ModeOe.IsChecked = true; break;
-                case 1: Menu_WineQualityStatistics_ModeKmw1.IsChecked = true; break;
-                case 2: Menu_WineQualityStatistics_ModeKmw2.IsChecked = true; break;
-                case 3: Menu_WineQualityStatistics_ModeKmw5.IsChecked = true; break;
-                case 4: Menu_WineQualityStatistics_ModeKmw10.IsChecked = true; break;
+                case 0: Menu_Statistics_WineQuality_ModeOe.IsChecked = true; break;
+                case 1: Menu_Statistics_WineQuality_ModeKmw1.IsChecked = true; break;
+                case 2: Menu_Statistics_WineQuality_ModeKmw2.IsChecked = true; break;
+                case 3: Menu_Statistics_WineQuality_ModeKmw5.IsChecked = true; break;
+                case 4: Menu_Statistics_WineQuality_ModeKmw10.IsChecked = true; break;
             }
 
             Menu_Export_UploadFilters.IsEnabled = App.Config.SyncUrl != null;
@@ -172,9 +172,11 @@ namespace Elwig.Windows {
                 Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
             };
             if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                using var file = new Bki(d.FileName);
-                await file.ExportAsync(year);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    using var file = new Bki(d.FileName);
+                    await file.ExportAsync(year);
+                });
                 Mouse.OverrideCursor = null;
             }
         }
@@ -216,40 +218,61 @@ namespace Elwig.Windows {
             await ViewModel.GenerateDeliveryJournal(DeliveryService.ExportSubject.FromSeasonAndBranch, ExportMode.Upload);
         }
 
-        private async void Menu_WineQualityStatistics_ShowToday_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_ShowToday_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromToday, ExportMode.Show);
-        private async void Menu_WineQualityStatistics_SavePdfToday_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_SavePdfToday_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromToday, ExportMode.SavePdf);
-        private async void Menu_WineQualityStatistics_PrintToday_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_PrintToday_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromToday, ExportMode.Print);
-        private async void Menu_WineQualityStatistics_ShowFilters_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_ShowFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromFilters, ExportMode.Show);
-        private async void Menu_WineQualityStatistics_SavePdfFilters_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_SavePdfFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromFilters, ExportMode.SavePdf);
-        private async void Menu_WineQualityStatistics_PrintFilters_Click(object sender, RoutedEventArgs evt) =>
+        private async void Menu_Statistics_WineQuality_PrintFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateWineQualityStatistics(DeliveryService.ExportSubject.FromFilters, ExportMode.Print);
 
-        private async void Menu_WineQualityStatistics_Mode_Click(object sender, RoutedEventArgs evt) {
-            Menu_WineQualityStatistics.IsSubmenuOpen = true;
-            if (sender == Menu_WineQualityStatistics_ModeOe) {
+        private async void Menu_Statistics_WineQuality_Mode_Click(object sender, RoutedEventArgs evt) {
+            Menu_Statistics.IsSubmenuOpen = true;
+            Menu_Statistics_WineQuality.IsSubmenuOpen = true;
+            if (sender == Menu_Statistics_WineQuality_ModeOe) {
                 App.Client.OrderingMemberList = 0;
-            } else if (sender == Menu_WineQualityStatistics_ModeKmw1) {
+            } else if (sender == Menu_Statistics_WineQuality_ModeKmw1) {
                 App.Client.OrderingMemberList = 1;
-            } else if (sender == Menu_WineQualityStatistics_ModeKmw2) {
+            } else if (sender == Menu_Statistics_WineQuality_ModeKmw2) {
                 App.Client.OrderingMemberList = 2;
-            } else if (sender == Menu_WineQualityStatistics_ModeKmw5) {
+            } else if (sender == Menu_Statistics_WineQuality_ModeKmw5) {
                 App.Client.OrderingMemberList = 3;
-            } else if (sender == Menu_WineQualityStatistics_ModeKmw10) {
+            } else if (sender == Menu_Statistics_WineQuality_ModeKmw10) {
                 App.Client.OrderingMemberList = 4;
             }
-            Menu_WineQualityStatistics_ModeOe.IsChecked = App.Client.OrderingMemberList == 0;
-            Menu_WineQualityStatistics_ModeKmw1.IsChecked = App.Client.OrderingMemberList == 1;
-            Menu_WineQualityStatistics_ModeKmw2.IsChecked = App.Client.OrderingMemberList == 2;
-            Menu_WineQualityStatistics_ModeKmw5.IsChecked = App.Client.OrderingMemberList == 3;
-            Menu_WineQualityStatistics_ModeKmw10.IsChecked = App.Client.OrderingMemberList == 4;
+            Menu_Statistics_WineQuality_ModeOe.IsChecked = App.Client.OrderingMemberList == 0;
+            Menu_Statistics_WineQuality_ModeKmw1.IsChecked = App.Client.OrderingMemberList == 1;
+            Menu_Statistics_WineQuality_ModeKmw2.IsChecked = App.Client.OrderingMemberList == 2;
+            Menu_Statistics_WineQuality_ModeKmw5.IsChecked = App.Client.OrderingMemberList == 3;
+            Menu_Statistics_WineQuality_ModeKmw10.IsChecked = App.Client.OrderingMemberList == 4;
             await App.Client.UpdateValues();
         }
 
+        private async void Menu_Statistic_Locality_SaveFilters_Click(object sender, RoutedEventArgs evt)=>
+            await ViewModel.GenerateLocalityStatistics(DeliveryService.ExportSubject.FromFilters);
+
+        private async void Menu_DeliveryDepreciationList_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList);
+        private async void Menu_DeliveryDepreciationList_ShowFilters_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromFilters, ExportMode.Show);
+        private async void Menu_DeliveryDepreciationList_SavePdfFilters_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromFilters, ExportMode.SavePdf);
+        private async void Menu_DeliveryDepreciationList_PrintFilters_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromFilters, ExportMode.Print);
+        private async void Menu_DeliveryDepreciationList_SaveSeason_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromSeason, ExportMode.SaveList);
+        private async void Menu_DeliveryDepreciationList_ShowSeason_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromSeason, ExportMode.Show);
+        private async void Menu_DeliveryDepreciationList_SavePdfSeason_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromSeason, ExportMode.SavePdf);
+        private async void Menu_DeliveryDepreciationList_PrintSeason_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromSeason, ExportMode.Print);
+
         private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
             if (IsEditing || IsCreating) {
                 DateInput.IsReadOnly = false;
@@ -287,19 +310,23 @@ namespace Elwig.Windows {
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
 
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
                 LesewagenInput.IsEnabled = false;
                 SetDefaultValue(LesewagenInput, false);
-                HandPickedInput.IsThreeState = false;
-                UnsetDefaultValue(HandPickedInput);
             } else {
                 LesewagenInput.IsEnabled = true;
                 UnsetDefaultValue(LesewagenInput);
+            }
+
+            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+                HandPickedInput.IsThreeState = false;
+                UnsetDefaultValue(HandPickedInput);
+            } else {
                 HandPickedInput.IsThreeState = true;
                 SetDefaultValue(HandPickedInput, null);
             }
 
-            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller || App.Client.IsBaden || App.Client.IsWeinland) {
                 GebundenInput.IsEnabled = false;
                 SetDefaultValue(GebundenInput, null);
             } else {
@@ -692,7 +719,7 @@ namespace Elwig.Windows {
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -705,6 +732,7 @@ 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;
@@ -730,7 +758,7 @@ namespace Elwig.Windows {
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
             FinishButton.IsEnabled = false;
             NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
 
             DeliveryPart? p;
@@ -743,6 +771,7 @@ 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;
@@ -861,7 +890,7 @@ namespace Elwig.Windows {
             if (res == null)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 var id = res.Value.Item1;
                 var weights = res.Value.Item2;
@@ -878,6 +907,7 @@ 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;
@@ -932,13 +962,15 @@ namespace Elwig.Windows {
                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                using (var ctx = new AppDbContext()) {
-                    ctx.Remove(d);
-                    await ctx.SaveChangesAsync();
+                Mouse.OverrideCursor = Cursors.Wait;
+                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;
+                    MessageBox.Show(str, "Lieferung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-                await RefreshList();
-                await RefreshDeliveryParts();
                 Mouse.OverrideCursor = null;
             }
         }
@@ -951,7 +983,7 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
 
             DeliveryPart? p;
             try {
@@ -963,14 +995,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;
-                return;
-            } finally {
                 Mouse.OverrideCursor = null;
+                return;
             }
 
             IsEditing = false;
@@ -987,6 +1019,7 @@ namespace Elwig.Windows {
             await RefreshDeliveryParts();
             RefreshInputs();
 
+            Mouse.OverrideCursor = null;
             DepreciateButton.IsEnabled = true;
         }
 
@@ -1356,7 +1389,7 @@ namespace Elwig.Windows {
         }
 
         private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                 HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
             }
             if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
@@ -1366,7 +1399,7 @@ namespace Elwig.Windows {
         }
 
         private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
+            if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
                 GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
             }
             CheckBox_Changed(sender, evt);

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -69,13 +69,29 @@
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Anmeldeliste">
                 <MenuItem x:Name="Menu_DeliveryAncmtList_SaveSelected" Header="...von ausgewähltem Leseplan speichern... (Excel)"
-                          Click="Menu_DeliveryAncmtList_SaveSelected_Click"/>
+                          Click="Menu_DeliveryAncmtList_SaveSelected_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryAncmtList_ShowSelected" Header="...von ausgewähltem Leseplan anzeigen (PDF)"
-                          Click="Menu_DeliveryAncmtList_ShowSelected_Click" InputGestureText="Strg+P"/>
+                          Click="Menu_DeliveryAncmtList_ShowSelected_Click" InputGestureText="Strg+P">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8FF;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryAncmtList_SavePdfSelected" Header="...von ausgewähltem Leseplan speichern... (PDF)"
-                          Click="Menu_DeliveryAncmtList_SavePdfSelected_Click"/>
+                          Click="Menu_DeliveryAncmtList_SavePdfSelected_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEA90;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem x:Name="Menu_DeliveryAncmtList_PrintSelected" Header="...von ausgewähltem Leseplan drucken"
-                          Click="Menu_DeliveryAncmtList_PrintSelected_Click" InputGestureText="Strg+Shift+P"/>
+                          Click="Menu_DeliveryAncmtList_PrintSelected_Click" InputGestureText="Strg+Shift+P">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE749;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
         </Menu>
 
@@ -109,7 +125,7 @@
                         <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                         <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
-                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Menge</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                     </TextBlock>
                 </TextBox.ToolTip>
@@ -171,18 +187,19 @@
                     <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="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
+                    <DataGridTextColumn Header="Menge" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="75">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedTimestamp, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
+                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedAt, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
@@ -300,7 +317,7 @@
                     </ComboBox>
 
                     <Label Content="Sorte:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <TextBox x:Name="SortIdInput" Text="{Binding SortId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Foreground="{Binding WineVariety.Color}"
                              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}"
@@ -312,7 +329,7 @@
                         </ComboBox.ItemTemplateSelector>
                     </ComboBox>
 
-                    <Label Content="Gewicht:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Menge:" Margin="10,70,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" Text="{Binding WeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Grid.Column="1" Margin="0,70,10,10" Width="61" HorizontalAlignment="Left"
                                       TextChanged="WeightInput_TextChanged" KeyUp="Input_KeyUp"/>
@@ -348,7 +365,7 @@
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
                 <TextBlock ToolTip="{Binding StatusWeightToolTip}">
-                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                    Menge: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="3"/>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -33,7 +33,7 @@ namespace Elwig.Windows {
 
             DoShowWarningWindows = false;
 
-            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
         }
@@ -103,6 +103,7 @@ namespace Elwig.Windows {
             var deliveryAncmts = await deliveryAncmtQuery
                 .Include(a => a.Member.BillingAddress)
                 .Include(a => a.Schedule)
+                .Include(a => a.Variety)
                 .AsSplitQuery()
                 .ToListAsync();
 
@@ -317,12 +318,13 @@ 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.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    using (var ctx = new AppDbContext()) {
+                    await Task.Run(async () => {
+                        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;
@@ -340,7 +342,7 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             SaveButton.IsEnabled = false;
 
             int year = -1, dsnr = -1, mgnr = -1;
@@ -348,6 +350,7 @@ 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. Gew." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
+                    <DataGridTextColumn Header="Max. Mg." Binding="{Binding MaxWeight, StringFormat='{}{0:N0} kg'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -211,7 +211,7 @@
                              Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="TextBox_TextChanged"/>
 
-                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
+                    <Label Content="Max. Menge:" Margin="10,70,0,10"/>
                     <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
                                       TextChanged="MaxWeightInput_TextChanged"/>

Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs

@@ -27,7 +27,7 @@ namespace Elwig.Windows {
                 DateInput, BranchInput, DescriptionInput, MainWineVarietiesInput,
             ];
 
-            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
+            ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
         }
@@ -177,12 +177,13 @@ 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.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 try {
-                    using (var ctx = new AppDbContext()) {
+                    await Task.Run(async () => {
+                        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;
@@ -200,11 +201,12 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             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

@@ -36,9 +36,10 @@ namespace Elwig.Windows {
         }
 
         private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            var t = EventList.SelectedItem.GetType();
+            var item = EventList.SelectedItem;
+            var t = item.GetType();
             var p = t.GetProperty("Event")!;
-            EventData.Text = ((EventLogEntry)p.GetValue(EventList.SelectedItem)!).Message;
+            EventData.Text = ((EventLogEntry)p.GetValue(item)!).Message;
         }
     }
 }

Elwig/Windows/MailLogWindow.xaml

@@ -0,0 +1,55 @@
+<Window x:Class="Elwig.Windows.MailLogWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        Title="Ausgangs-Protokoll - Rundschreiben - Elwig" Height="600" Width="1000"
+        Loaded="Window_Loaded">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2*"/>
+        </Grid.ColumnDefinitions>
+
+        <TextBox x:Name="FilterInput" Margin="10,10,300,10" Height="25" FontSize="14" Padding="2" TextWrapping="NoWrap"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Top"
+                 TextChanged="FilterInput_TextChanged"/>
+
+        <ComboBox x:Name="TypeInput" Margin="10,10,165,10" Width="130" Height="25" FontSize="14"
+                  HorizontalAlignment="Right" VerticalAlignment="Top"
+                  SelectionChanged="TypeInput_SelectionChanged">
+            <ComboBoxItem Content="Post &amp; E-Mail" IsSelected="True"/>
+            <ComboBoxItem Content="Nur Post"/>
+            <ComboBoxItem Content="Nur E-Mail"/>
+        </ComboBox>
+
+        <ComboBox x:Name="TimeSpanInput" Margin="10,10,10,10" Width="150" Height="25" FontSize="14"
+                  HorizontalAlignment="Right" VerticalAlignment="Top"
+                  SelectionChanged="TimeSpanInput_SelectionChanged">
+            <ComboBoxItem Content="letzten 7 Tage" IsSelected="True"/>
+            <ComboBoxItem Content="letzten 6 Monate"/>
+            <ComboBoxItem Content="Immer"/>
+        </ComboBox>
+
+        <DataGrid x:Name="MailList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                  SelectionChanged="MailList_SelectionChanged"
+                  Margin="10,40,5,10">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Zeitpunkt" Binding="{Binding DateTime, StringFormat='{}{0:dd.MM.yyyy HH:mm:ss}'}" Width="120"/>
+                <DataGridTextColumn Header="Typ" Binding="{Binding Type}" Width="50"/>
+                <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr}" Width="50"/>
+                <DataGridTextColumn Header="Name" Binding="{Binding Name}" Width="200"/>
+                <DataGridTextColumn Header="Adressen" Binding="{Binding Addresses}" Width="200"/>
+                <DataGridTextColumn Header="Betreff" Binding="{Binding Subject}" Width="250"/>
+                <DataGridTextColumn Header="Anhänge" Binding="{Binding Attachments}" Width="200"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <TextBox x:Name="MailData" Grid.Column="2" Margin="5,10,10,10" IsReadOnly="True"
+                 HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"/>
+    </Grid>
+</Window>

Elwig/Windows/MailLogWindow.xaml.cs

@@ -0,0 +1,94 @@
+using Elwig.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class MailLogWindow : Window {
+
+        record struct Row (DateTime DateTime, string Type, int MgNr, string Name, string Addresses, string Subject, string Attachments);
+
+        private List<Row> Data = [];
+
+        public MailLogWindow() {
+            InitializeComponent();
+            WindowState = WindowState.Maximized;
+            ControlUtils.InitializeDelayTimer(FilterInput, FilterInput_TextChanged);
+            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);
+            } else if (TimeSpanInput.SelectedIndex == 1) {
+                fromDate = fromDate.Value.AddMonths(-6);
+            } else {
+                fromDate = null;
+            }
+            var mails = await Utils.GetSentMails(fromDate: fromDate == null ? null : DateOnly.FromDateTime(fromDate.Value));
+            Data = mails.Reverse().Select(m => new Row(
+                m.DateTime,
+                m.Type == "email" ? "E-Mail" : m.Type == "postal" ? "Post" : "?",
+                m.MgNr,
+                m.Name,
+                string.Join("\n", m.Addresses),
+                m.Subject,
+                string.Join("\n", m.Attachments)
+            )).ToList();
+            MailList.ItemsSource = Data;
+            ApplyFilters();
+        }
+
+        private void FilterInput_TextChanged(object sender, RoutedEventArgs evt) {
+            ApplyFilters();
+        }
+
+        private void TypeInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+            ApplyFilters();
+        }
+
+        private void ApplyFilters() {
+            if (!IsLoaded) return;
+            var filters = FilterInput.Text.Split(' ');
+            IEnumerable<Row> data = Data;
+            switch (TypeInput.SelectedIndex) {
+                case 1: data = data.Where(d => d.Type == "Post"); break;
+                case 2: data = data.Where(d => d.Type == "E-Mail"); break;
+            }
+            foreach (var filter in filters) {
+                if (int.TryParse(filter, out var mgnr)) {
+                    data = data.Where(d => d.MgNr == mgnr);
+                } else {
+                    var f = filter.ToLower();
+                    data = data.Where(d => d.Name.Contains(f, StringComparison.CurrentCultureIgnoreCase) ||
+                                           d.Addresses.Contains(f, StringComparison.CurrentCultureIgnoreCase) ||
+                                           d.Subject.Contains(f, StringComparison.CurrentCultureIgnoreCase) ||
+                                           d.Attachments.Contains(f, StringComparison.CurrentCultureIgnoreCase));
+                }
+            }
+            if (IsLoaded)
+                MailList.ItemsSource = data.ToList();
+        }
+
+        private async void MailList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            if (MailList.SelectedItem is not Row item) return;
+            if (item.Type == "E-Mail") {
+                MailData.Text = await Utils.FindSentMailBody(item.DateTime);
+            } else {
+                MailData.Text = "";
+            }
+        }
+    }
+}

Elwig/Windows/MailWindow.xaml

@@ -27,281 +27,334 @@
             <Setter Property="TextWrapping" Value="NoWrap"/>
         </Style>
     </Window.Resources>
-    <TabControl x:Name="TabControl" BorderThickness="0" PreviewDragOver="Document_PreviwDragOver" AllowDrop="True" Drop="Document_Drop">
-        <TabItem Header="Dokumente" Visibility="Collapsed">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="320"/>
-                </Grid.ColumnDefinitions>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
 
-                <Grid Height="200" VerticalAlignment="Top" HorizontalAlignment="Stretch">
+        <Menu BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+            <MenuItem Header="Hilfe">
+                <MenuItem x:Name="Menu_Help_Log" Header="Ausgangs-Protokoll anzeigen"
+                          Click="Menu_Help_Log_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF168;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
+        </Menu>
+
+        <TabControl x:Name="TabControl" BorderThickness="0" Grid.Row="1"
+                    PreviewDragOver="Document_PreviwDragOver" AllowDrop="True" Drop="Document_Drop">
+            <TabItem Header="Dokumente" Visibility="Collapsed">
+                <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="25"/>
-                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="320"/>
                     </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="30"/>
-                    </Grid.RowDefinitions>
 
-                    <Label Content="Verfügbare Dokumente"
-                           Grid.Column="0" Margin="10,8,10,10"/>
-                    <ListBox x:Name="AvaiableDocumentsList"
-                             Grid.Column="0" Margin="10,30,10,10"
-                             SelectionChanged="AvaiableDocumentsList_SelectionChanged"/>
-
-                    <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
-                            Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
-                            Click="DocumentAddButton_Click"/>
-                    <Button x:Name="DocumentRemoveButton" Content="&#xE74D;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="1.5,0,0,0"
-                            Grid.Column="1" Margin="0,30,0,0" VerticalAlignment="Center" Height="25" IsEnabled="False"
-                            Click="DocumentRemoveButton_Click"/>
-
-                    <Label Content="Ausgewählte Dokumente"
-                           Grid.Column="2" Margin="10,8,10,10"/>
-                    <ListBox x:Name="SelectedDocumentsList" DisplayMemberPath="Name"
-                             Grid.Column="2" Margin="10,30,10,37"
-                             SelectionChanged="SelectedDocumentsList_SelectionChanged">
-                        <ListBox.InputBindings>
-                            <KeyBinding Key="Delete" Command="{Binding Path=DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>
-                        </ListBox.InputBindings>
-                    </ListBox>
-                    <Button x:Name="SelectDocumentButton" Content="Durchsuchen..."
-                            Grid.Column="2" VerticalAlignment="Bottom" Margin="10,10,10,10" Height="22"
-                            Click="SelectDocumentButton_Click"/>
-                </Grid>
-
-                <GroupBox x:Name="DocumentBox" Header="Dokument" Margin="10,170,10,47" HorizontalAlignment="Stretch">
-                    <Grid>
+                    <Grid Height="200" VerticalAlignment="Top" HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="70"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="25"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="30"/>
+                        </Grid.RowDefinitions>
 
-                        <CheckBox x:Name="DocumentNonDeliverersInput" Content="Auch Nicht-Lieferanten miteinbeziehen"
-                                  Margin="10,10,10,10" Grid.Column="1"/>
+                        <Label Content="Verfügbare Dokumente"
+                               Grid.Column="0" Margin="10,8,10,10"/>
+                        <ListBox x:Name="AvaiableDocumentsList"
+                                 Grid.Column="0" Margin="10,30,10,10"
+                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged"/>
 
-                        <Label x:Name="DocumentFooterLabel" Content="Fußtext:" Margin="10,40,0,10"/>
-                        <TextBox x:Name="DeliveryConfirmationFooterInput" Grid.Column="1"
-                                 Margin="0,40,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
-                                 TextChanged="DocumentInput_TextChanged"/>
-                        <TextBox x:Name="CreditNoteFooterInput" Grid.Column="1"
-                                 Margin="0,10,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
-                                 TextChanged="DocumentInput_TextChanged"/>
+                        <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
+                                Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
+                                Click="DocumentAddButton_Click"/>
+                        <Button x:Name="DocumentRemoveButton" Content="&#xE74D;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="1.5,0,0,0"
+                                Grid.Column="1" Margin="0,30,0,0" VerticalAlignment="Center" Height="25" IsEnabled="False"
+                                Click="DocumentRemoveButton_Click"/>
+
+                        <Label Content="Ausgewählte Dokumente"
+                               Grid.Column="2" Margin="10,8,10,10"/>
+                        <ListBox x:Name="SelectedDocumentsList" DisplayMemberPath="Name"
+                                 Grid.Column="2" Margin="10,30,10,37"
+                                 SelectionChanged="SelectedDocumentsList_SelectionChanged">
+                            <ListBox.InputBindings>
+                                <KeyBinding Key="Delete" Command="{Binding Path=DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>
+                            </ListBox.InputBindings>
+                        </ListBox>
+                        <Button x:Name="SelectDocumentButton" Content="Durchsuchen..."
+                                Grid.Column="2" VerticalAlignment="Bottom" Margin="10,10,10,10" Height="22"
+                                Click="SelectDocumentButton_Click"/>
                     </Grid>
-                </GroupBox>
 
-                <TextBox x:Name="PostalLocation" Grid.Column="1" TextChanged="PostalLocation_TextChanged"
-                         Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
-                <Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/>
-                <TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020"
-                         Margin="162,30,10,10" Width="78" HorizontalAlignment="Left"
-                         TextChanged="Date_TextChanged" LostFocus="Date_LostFocus"/>
+                    <GroupBox x:Name="DocumentBox" Header="Dokument" Margin="10,170,10,47" HorizontalAlignment="Stretch">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="70"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
 
-                <GroupBox Header="Adressaten" Margin="10,70,10,47" Grid.Column="1">
-                    <Grid>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsActiveMembersInput" Content="aktive Mitglieder"
-                                     Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsAreaComMembersInput" Content="Mitglieder mit Flächenbindung"
-                                     Margin="10,30,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryAncmtMembersInput" Content="Mitglieder mit Anmeldung"
-                                     Margin="10,50,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
-                                     Margin="10,70,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
-                                     Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
-                                     Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <CheckBox x:Name="DocumentNonDeliverersInput" Content="Auch Nicht-Lieferanten miteinbeziehen"
+                                      Margin="10,10,10,10" Grid.Column="1"/>
 
-                        <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
-                        <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
-                                            Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            SelectionChanged="MemberInput_SelectionChanged"/>
+                            <Label x:Name="DocumentFooterLabel" Content="Fußtext:" Margin="10,40,0,10"/>
+                            <TextBox x:Name="DeliveryConfirmationFooterInput" Grid.Column="1"
+                                     Margin="0,40,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                     AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
+                                     TextChanged="DocumentInput_TextChanged"/>
+                            <TextBox x:Name="CreditNoteFooterInput" Grid.Column="1"
+                                     Margin="0,10,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
+                                     AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
+                                     TextChanged="DocumentInput_TextChanged"/>
+                        </Grid>
+                    </GroupBox>
 
-                        <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
-                        <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
-                                            IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
-                                            Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            SelectionChanged="MemberInput_SelectionChanged"/>
+                    <TextBox x:Name="PostalLocation" Grid.Column="1" TextChanged="PostalLocation_TextChanged"
+                             Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
+                    <Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/>
+                    <TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020"
+                             Margin="162,30,10,10" Width="78" HorizontalAlignment="Left"
+                             TextChanged="Date_TextChanged" LostFocus="Date_LostFocus"/>
 
-                        <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
-                        <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
-                                     Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
-                        <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
-                                     Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
-                        <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
-                                     Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
+                    <GroupBox Header="Adressaten" Margin="10,70,10,47" Grid.Column="1">
+                        <Grid>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsActiveMembersInput" Content="aktive Mitglieder"
+                                         Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsAreaComMembersInput" Content="Mitglieder mit Flächenbindung"
+                                         Margin="10,30,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryAncmtMembersInput" Content="Mitglieder mit Anmeldung"
+                                         Margin="10,50,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
+                                         Margin="10,70,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
+                                         Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                                         Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
 
-                        <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
-                        <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
-                                     Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
-                        <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
-                                     Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
-                        <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
-                                     Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
-                                     Checked="MemberInput_Checked"/>
+                            <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
+                            <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
+                                                Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                SelectionChanged="MemberInput_SelectionChanged"/>
 
-                        <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
-                        <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
-                                            IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
-                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            SelectionChanged="MemberInput_SelectionChanged"/>
+                            <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
+                            <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
+                                                IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
+                                                Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                SelectionChanged="MemberInput_SelectionChanged"/>
 
-                        <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
-                        <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
-                                            IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
-                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            SelectionChanged="MemberInput_SelectionChanged"/>
+                            <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
+                            <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
+                                         Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
+                            <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
+                                         Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
+                            <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
+                                         Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
 
-                        <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
-                                            IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
-                                            Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
-                                            SelectionChanged="MemberInput_SelectionChanged"/>
-                    </Grid>
-                </GroupBox>
+                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
+                            <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
+                                         Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
+                            <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
+                                         Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
+                            <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
+                                         Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="MemberInput_Checked"/>
 
-                <Button x:Name="ContinueButton" Content="Weiter" Grid.Column="1"
-                        Margin="10,10,10,10" Height="27" Width="100" Padding="9,3" FontSize="14"
-                        VerticalAlignment="Bottom" HorizontalAlignment="Right"
-                        Click="ContinueButton_Click"/>
-            </Grid>
-        </TabItem>
+                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
+                            <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
+                                                IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
+                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                SelectionChanged="MemberInput_SelectionChanged"/>
 
-        <TabItem Header="Absenden" Visibility="Collapsed">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="1.5*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*"/>
-                    <RowDefinition Height="80"/>
-                </Grid.RowDefinitions>
+                            <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
+                            <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
+                                                IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
+                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                SelectionChanged="MemberInput_SelectionChanged"/>
 
-                <GroupBox Header="Post" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,5,10" Grid.Column="0">
-                    <Grid>
-                        <GroupBox Header="Zusenden an..." Margin="10,10,10,10" Height="150" Width="220" VerticalAlignment="Top" HorizontalAlignment="Left">
-                            <StackPanel>
-                                <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5" Click="PostalInput_Changed">
-                                    <TextBlock>
-                                        ...alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
-                                    </TextBlock>
-                                </RadioButton>
-                                <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed" IsChecked="True">
-                                    <TextBlock>
-                                        ...Mitglieder, die Zusendung<LineBreak/>
-                                        per Post wünschen (<Run Text="{Binding Path=PostalWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
-                                    </TextBlock>
-                                </RadioButton>
-                                <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed">
-                                    <TextBlock>
-                                        ...Mitglieder, die keine<LineBreak/>
-                                        E-Mail erhalten würden (<Run Text="{Binding Path=PostalNoEmailCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
-                                    </TextBlock>
-                                </RadioButton>
-                                <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Click="PostalInput_Changed"/>
-                            </StackPanel>
-                        </GroupBox>
+                            <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
+                                                IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
+                                                Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                SelectionChanged="MemberInput_SelectionChanged"/>
+                        </Grid>
+                    </GroupBox>
 
-                        <GroupBox Header="Sortieren nach" Margin="10,180,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
-                            <StackPanel Margin="5,5,0,5">
-                                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" Click="OrderInput_Changed" IsChecked="True"/>
-                                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name" Click="OrderInput_Changed"/>
-                                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name" Click="OrderInput_Changed"/>
-                            </StackPanel>
-                        </GroupBox>
+                    <Button x:Name="ContinueButton" Content="Weiter" Grid.Column="1"
+                            Margin="10,10,10,10" Height="27" Width="100" Padding="9,3" FontSize="14"
+                            VerticalAlignment="Bottom" HorizontalAlignment="Right"
+                            Click="ContinueButton_Click"/>
+                </Grid>
+            </TabItem>
 
-                        <CheckBox x:Name="DoublePagedInput" Margin="20,270,10,10" Content="Doppelseitig drucken"
-                                  VerticalAlignment="Top" HorizontalAlignment="Left"
-                                  Checked="DoublePagedInput_Changed" Unchecked="DoublePagedInput_Changed"/>
-
-                        <TextBox x:Name="PostalSender1" TextChanged="PostalSender_TextChanged" IsEnabled="False"
-                                 Margin="10,300,10,10"/>
-                        <TextBox x:Name="PostalSender2" TextChanged="PostalSender_TextChanged"
-                                 Margin="10,330,10,10"/>
-                    </Grid>
-                </GroupBox>
-
-                <GroupBox Header="E-Mail" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,10,10,10" Grid.Column="1">
-                    <Grid>
-                        <GroupBox Header="Zusenden an..." Margin="80,10,10,10" Width="220" Height="110" VerticalAlignment="Top" HorizontalAlignment="Left">
-                            <StackPanel>
-                                <RadioButton x:Name="EmailAllInput" Margin="10,10,10,2.5" Checked="EmailInput_Changed">
-                                    <TextBlock>
-                                        ...alle mit E-Mail-Adressen (<Run Text="{Binding Path=EmailAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
-                                    </TextBlock>
-                                </RadioButton>
-                                <RadioButton x:Name="EmailWishInput" Margin="10,2.5,10,2.5" IsChecked="True" Checked="EmailInput_Changed">
-                                    <TextBlock>
-                                            ...Mitglieder, die Zusendung<LineBreak/>
-                                            per E-Mail wünschen (<Run Text="{Binding Path=EmailWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
-                                    </TextBlock>
-                                </RadioButton>
-                                <RadioButton x:Name="EmailNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Checked="EmailInput_Changed"/>
-                            </StackPanel>
-                        </GroupBox>
-
-                        <Label Content="Betreff:" Margin="10,130,10,10"/>
-                        <TextBox x:Name="EmailSubjectInput" Margin="80,130,10,10"/>
-
-                        <Label Content="Nachricht:" Margin="10,160,10,10"/>
-                        <TextBox x:Name="EmailBodyInput"
-                                 Margin="80,160,10,10" VerticalAlignment="Stretch" Height="Auto"
-                                 TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"/>
-                    </Grid>
-                </GroupBox>
-
-                <Grid Grid.Row="1" Grid.ColumnSpan="2" Width="400" Height="59">
+            <TabItem Header="Absenden" Visibility="Collapsed">
+                <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="0.7*"/>
-                        <ColumnDefinition Width="10"/>
-                        <ColumnDefinition Width="0.4*"/>
-                        <ColumnDefinition Width="5"/>
-                        <ColumnDefinition Width="0.6*"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="1.5*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="*"/>
-                        <RowDefinition Height="5"/>
-                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="80"/>
                     </Grid.RowDefinitions>
 
-                    <Button x:Name="GenerateButton" Content="Generieren"
-                            Grid.Row="0" Grid.Column="0" FontSize="14"
-                            Click="GenerateButton_Click"/>
-                    <ProgressBar x:Name="ProgressBar"
-                                 Grid.Row="2" Grid.Column="0" SnapsToDevicePixels="True"/>
+                    <GroupBox Header="Post" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,5,10" Grid.Column="0">
+                        <Grid>
+                            <GroupBox Header="Zusenden an..." Margin="10,10,10,10" Height="150" Width="220" VerticalAlignment="Top" HorizontalAlignment="Left">
+                                <StackPanel>
+                                    <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5" Click="PostalInput_Changed">
+                                        <TextBlock>
+                                            ...alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        </TextBlock>
+                                    </RadioButton>
+                                    <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed" IsChecked="True">
+                                        <TextBlock>
+                                            ...Mitglieder, die Zusendung<LineBreak/>
+                                            per Post wünschen (<Run Text="{Binding Path=PostalWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        </TextBlock>
+                                    </RadioButton>
+                                    <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed">
+                                        <TextBlock>
+                                            ...Mitglieder, die keine<LineBreak/>
+                                            E-Mail erhalten würden (<Run Text="{Binding Path=PostalNoEmailCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        </TextBlock>
+                                    </RadioButton>
+                                    <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Click="PostalInput_Changed"/>
+                                </StackPanel>
+                            </GroupBox>
 
-                    <Button x:Name="PreviewButton" Content="Vorschau" IsEnabled="False"
-                            Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" FontSize="14"
-                            Click="PreviewButton_Click"/>
-                    <Button x:Name="PrintButton" Content="Drucken" IsEnabled="False"
-                            Grid.Row="2" Grid.Column="2" FontSize="14"
-                            Click="PrintButton_Click"/>
-                    <Button x:Name="EmailButton" Content="E-Mails verschicken" IsEnabled="False"
-                            Grid.Row="2" Grid.Column="4" FontSize="14"
-                            Click="EmailButton_Click"/>
+                            <GroupBox Header="Sortieren nach" Margin="10,180,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
+                                <StackPanel Margin="5,5,0,5">
+                                    <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" Click="OrderInput_Changed" IsChecked="True"/>
+                                    <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name" Click="OrderInput_Changed"/>
+                                    <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name" Click="OrderInput_Changed"/>
+                                </StackPanel>
+                            </GroupBox>
+
+                            <CheckBox x:Name="DoublePagedInput" Margin="20,270,10,10" Content="Doppelseitig drucken"
+                                      VerticalAlignment="Top" HorizontalAlignment="Left"
+                                      Checked="DoublePagedInput_Changed" Unchecked="DoublePagedInput_Changed"/>
+
+                            <TextBox x:Name="PostalSender1" TextChanged="PostalSender_TextChanged" IsEnabled="False"
+                                     Margin="10,300,10,10"/>
+                            <TextBox x:Name="PostalSender2" TextChanged="PostalSender_TextChanged"
+                                     Margin="10,330,10,10"/>
+                        </Grid>
+                    </GroupBox>
+
+                    <GroupBox Header="E-Mail" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,10,10,10" Grid.Column="1">
+                        <Grid>
+                            <GroupBox Header="Zusenden an..." Margin="80,10,10,10" Width="220" Height="110" VerticalAlignment="Top" HorizontalAlignment="Left">
+                                <StackPanel>
+                                    <RadioButton x:Name="EmailAllInput" Margin="10,10,10,2.5" Checked="EmailInput_Changed">
+                                        <TextBlock>
+                                            ...alle mit E-Mail-Adressen (<Run Text="{Binding Path=EmailAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        </TextBlock>
+                                    </RadioButton>
+                                    <RadioButton x:Name="EmailWishInput" Margin="10,2.5,10,2.5" IsChecked="True" Checked="EmailInput_Changed">
+                                        <TextBlock>
+                                            ...Mitglieder, die Zusendung<LineBreak/>
+                                            per E-Mail wünschen (<Run Text="{Binding Path=EmailWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        </TextBlock>
+                                    </RadioButton>
+                                    <RadioButton x:Name="EmailNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Checked="EmailInput_Changed"/>
+                                </StackPanel>
+                            </GroupBox>
+
+                            <Label Content="Betreff:" Margin="10,130,10,10"/>
+                            <TextBox x:Name="EmailSubjectInput" Margin="80,130,10,10"/>
+
+                            <Label Content="Nachricht:" Margin="10,160,10,10"/>
+                            <TextBox x:Name="EmailBodyInput"
+                                     Margin="80,160,10,10" VerticalAlignment="Stretch" Height="Auto"
+                                     TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"/>
+                        </Grid>
+                    </GroupBox>
+
+                    <Grid Grid.Row="1" Grid.ColumnSpan="2" Width="400" Height="59">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="0.7*"/>
+                            <ColumnDefinition Width="10"/>
+                            <ColumnDefinition Width="0.4*"/>
+                            <ColumnDefinition Width="5"/>
+                            <ColumnDefinition Width="0.6*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="5"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+
+                        <Button x:Name="GenerateButton" Content="Generieren"
+                                Grid.Row="0" Grid.Column="0" FontSize="14"
+                                Click="GenerateButton_Click"/>
+                        <ProgressBar x:Name="ProgressBar"
+                                     Grid.Row="2" Grid.Column="0" SnapsToDevicePixels="True"/>
+
+                        <Button x:Name="PreviewButton" Content="Vorschau" IsEnabled="False"
+                                Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" FontSize="14"
+                                Click="PreviewButton_Click"/>
+                        <Button x:Name="PrintButton" Content="Drucken" IsEnabled="False"
+                                Grid.Row="2" Grid.Column="2" FontSize="14"
+                                Click="PrintButton_Click"/>
+                        <Button x:Name="EmailButton" Content="E-Mails verschicken" IsEnabled="False"
+                                Grid.Row="2" Grid.Column="4" FontSize="14"
+                                Click="EmailButton_Click"/>
+                    </Grid>
+
+                    <Button x:Name="BackButton" Content="Zurück" Grid.Row="1"
+                            Margin="10,10,10,10" Height="27" Width="100" Padding="9,3" FontSize="14"
+                            VerticalAlignment="Bottom" HorizontalAlignment="Left"
+                            Click="BackButton_Click"/>
                 </Grid>
+            </TabItem>
+        </TabControl>
 
-                <Button x:Name="BackButton" Content="Zurück" Grid.Row="1"
-                        Margin="10,10,10,10" Height="27" Width="100" Padding="9,3" FontSize="14"
-                        VerticalAlignment="Bottom" HorizontalAlignment="Left"
-                        Click="BackButton_Click"/>
-            </Grid>
-        </TabItem>
-    </TabControl>
+        <StatusBar Grid.Row="2" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock>
+                    Adressaten: <Run x:Name="StatusRecipients" Text="0"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock>
+                    Adressaten (Post): <Run x:Name="StatusPostalRecipients" Text="0"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock>
+                    Adressaten (E-Mail): <Run x:Name="StatusEmailRecipients" Text="0"/>
+                </TextBlock>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
 </local:ContextWindow>

Elwig/Windows/MailWindow.xaml.cs

@@ -58,6 +58,7 @@ namespace Elwig.Windows {
         public IEnumerable<Member> Recipients = [];
 
         protected Document? PrintDocument;
+        protected Dictionary<Member, List<Document>>? PrintMemberDocuments;
         protected Dictionary<Member, List<Document>>? EmailDocuments;
 
         public static readonly DependencyProperty PostalAllCountProperty = DependencyProperty.Register(nameof(PostalAllCount), typeof(int), typeof(MailWindow));
@@ -122,6 +123,26 @@ namespace Elwig.Windows {
             DeliveryConfirmationFooterInput.Text = App.Client.TextDeliveryConfirmation;
             CreditNoteFooterInput.Text = App.Client.TextCreditNote;
 
+            DocumentNonDeliverersInput.IsChecked = App.Client.MailIncludeNonDeliverers;
+            DoublePagedInput.IsChecked = App.Client.MailDoublePaged;
+
+            switch (App.Client.MailSendPostal) {
+                case 0: PostalNobodyInput.IsChecked = true; break;
+                case 1: PostalNoEmailInput.IsChecked = true; break;
+                case 2: PostalWishInput.IsChecked = true; break;
+                case 3: PostalAllInput.IsChecked = true; break;
+            }
+            switch (App.Client.MailSendEmail) {
+                case 0: EmailNobodyInput.IsChecked = true; break;
+                case 1: EmailWishInput.IsChecked = true; break;
+                case 2: EmailAllInput.IsChecked = true; break;
+            }
+            switch (App.Client.MailOrdering) {
+                case 0: OrderMgNrInput.IsChecked = true; break;
+                case 1: OrderNameInput.IsChecked = true; break;
+                case 2: OrderPlzInput.IsChecked = true; break;
+            }
+
             PostalSender1.Text = App.Client.Sender1;
             PostalSender2.Text = App.Client.Sender2;
             PostalLocation.Text = App.BranchLocation;
@@ -242,6 +263,11 @@ namespace Elwig.Windows {
                 rb.IsEnabled = true;
         }
 
+        private void Menu_Help_Log_Click(object sender, RoutedEventArgs evt) {
+            var w = new MailLogWindow();
+            w.Show();
+        }
+
         private void ContinueButton_Click(object sender, RoutedEventArgs evt) {
             TabControl.SelectedIndex = 1;
             TabControl.AllowDrop = false;
@@ -312,7 +338,7 @@ namespace Elwig.Windows {
             if (idx == 0) {
                 SelectedDocs.Add(new(DocType.MemberDataSheet, s, null));
             } else if (idx == 1) {
-                SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
+                SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, Year));
                 RecipientsDeliveryMembersInput.IsChecked = true;
             } else if (idx >= 2) {
                 var name = s.Split(" – ")[^1];
@@ -449,18 +475,32 @@ namespace Elwig.Windows {
         }
 
         private void UpdatePostalEmailRecipients() {
+            var modeEmail = EmailAllInput.IsChecked == true ? 2 : EmailWishInput.IsChecked == true ? 1 : 0;
+            var modePostal = PostalAllInput.IsChecked == true ? 3 : PostalWishInput.IsChecked == true ? 2 : PostalNoEmailInput.IsChecked == true ? 1 : 0;
             EmailAllCount = Recipients.Count(m => m.EmailAddresses.Count > 0);
             EmailWishCount = Recipients.Count(m => m.EmailAddresses.Count > 0 && m.ContactViaEmail);
             PostalAllCount = Recipients.Count();
             PostalWishCount = Recipients.Count(m => m.ContactViaPost);
-            var m = EmailAllInput.IsChecked == true ? 3 : EmailWishInput.IsChecked == true ? 2 : 1;
-            PostalNoEmailCount = PostalAllCount - (m == 3 ? EmailAllCount : m == 2 ? EmailWishCount : 0);
+            var countEmail = (modeEmail == 2 ? EmailAllCount : modeEmail == 1 ? EmailWishCount : 0);
+            PostalNoEmailCount = PostalAllCount - countEmail;
+            var countPostal = (modePostal == 3 ? PostalAllCount : modePostal == 2 ? PostalWishCount : modePostal == 1 ? PostalNoEmailCount : 0);
+            if (IsLoaded) {
+                StatusRecipients.Text = $"{Recipients.Count():N0}";
+                StatusPostalRecipients.Text = $"{countPostal:N0}";
+                StatusEmailRecipients.Text = $"{countEmail:N0}";
+            }
             ResetDocuments();
         }
 
-        private async Task UpdateTextParameters() {
+        private async Task UpdateClientParameters() {
             var changed = false;
 
+            var dcInclude = DocumentNonDeliverersInput.IsChecked ?? false;
+            if (dcInclude != App.Client.MailIncludeNonDeliverers) {
+                App.Client.MailIncludeNonDeliverers = dcInclude;
+                changed = true;
+            }
+
             var dcText = DeliveryConfirmationFooterInput.Text.Trim();
             if (dcText.Length == 0) dcText = null;
             if (dcText != App.Client.TextDeliveryConfirmation) {
@@ -475,6 +515,53 @@ namespace Elwig.Windows {
                 changed = true;
             }
 
+            var sendPostal = 0;
+            if (PostalAllInput.IsChecked ?? false) {
+                sendPostal = 3;
+            } else if (PostalWishInput.IsChecked ?? false) {
+                sendPostal = 2;
+            } else if (PostalNoEmailInput.IsChecked ?? false) {
+                sendPostal = 1;
+            }
+            if (sendPostal != App.Client.MailSendPostal) {
+                App.Client.MailSendPostal = sendPostal;
+                changed = true;
+            }
+
+            var sendEmail = 0;
+            if (EmailAllInput.IsChecked ?? false) {
+                sendEmail = 2;
+            } else if (EmailWishInput.IsChecked ?? false) {
+                sendEmail = 1;
+            }
+            if (sendEmail != App.Client.MailSendEmail) {
+                App.Client.MailSendEmail = sendEmail;
+                changed = true;
+            }
+
+            var ordering = 0;
+            if (OrderNameInput.IsChecked ?? false) {
+                ordering = 1;
+            } else if (OrderPlzInput.IsChecked ?? false) {
+                ordering = 2;
+            }
+            if (ordering != App.Client.MailOrdering) {
+                App.Client.MailOrdering = ordering;
+                changed = true;
+            }
+
+            var mailDoublePaged = DoublePagedInput.IsChecked ?? false;
+            if (mailDoublePaged != App.Client.MailDoublePaged) {
+                App.Client.MailDoublePaged = mailDoublePaged;
+                changed = true;
+            }
+
+            var sender2 = PostalSender2.Text.Trim();
+            if (sender2 != App.Client.Sender2) {
+                App.Client.Sender2 = sender2;
+                changed = true;
+            }
+
             var emailSubject = EmailSubjectInput.Text.Trim();
             if (emailSubject.Length == 0) emailSubject = null;
             if (emailSubject != App.Client.TextEmailSubject) {
@@ -515,11 +602,11 @@ namespace Elwig.Windows {
             PreviewButton.IsEnabled = false;
             PrintButton.IsEnabled = false;
             EmailButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             GenerateButton.IsEnabled = false;
 
             DisposeDocs();
-            await UpdateTextParameters();
+            await UpdateClientParameters();
 
             using var ctx = new AppDbContext();
 
@@ -562,8 +649,7 @@ namespace Elwig.Windows {
             Dictionary<(int, int), (IDictionary<int, CreditNoteDeliveryData>, IDictionary<int, PaymentMember>, BillingData)> cnData = [];
             foreach (var doc in docs) {
                 if (doc.Type == DocType.DeliveryConfirmation) {
-                    var details = ((int, bool))doc.Details!;
-                    var year = details.Item1;
+                    var year = (int)doc.Details!;
 
                     try {
                         var b = new Billing(year);
@@ -585,7 +671,7 @@ namespace Elwig.Windows {
                     var avnr = details.Item2;
                     try {
                         cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr),
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
                             await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
                             BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                         );
@@ -610,13 +696,11 @@ namespace Elwig.Windows {
                         } else if (doc.Type == DocType.MemberDataSheet) {
                             return [new GeneratedDoc(new MemberDataSheet(m, ctx) { Date = postalDate })];
                         } else if (doc.Type == DocType.DeliveryConfirmation) {
-                            var details = ((int, bool))doc.Details!;
-                            var year = details.Item1;
-                            var include = details.Item2;
+                            var year = (int)doc.Details!;
                             DeliveryConfirmationDeliveryData data;
                             if (dcData[year].TryGetValue(m.MgNr, out var d)) {
                                 data = d;
-                            } else if (include) {
+                            } else if (App.Client.MailIncludeNonDeliverers) {
                                 data = DeliveryConfirmationDeliveryData.CreateEmpty(year, m);
                             } else {
                                 return [];
@@ -691,11 +775,13 @@ namespace Elwig.Windows {
                 EmailDocuments = email;
             }
 
-            var printDocs = memberDocs
+            var printMemberDocs = memberDocs
                 .Where(d =>
                     printMode == 3 ||
                     (printMode == 2 && d.Member.ContactViaPost) ||
                     (printMode == 1 && !emailRecipients.Contains(d.Member.MgNr)))
+                .ToList();
+            var printDocs = printMemberDocs
                 .SelectMany(m => {
                     var docs = m.Docs.Select(d => d.Doc).ToList();
                     if (docs.Count == 0 || m.Docs[0].Type == DocType.Custom) {
@@ -720,6 +806,7 @@ namespace Elwig.Windows {
                         ProgressBar.Value = 100.0 * emailNum / totalNum + v * printNum / totalNum;
                     }));
                     PrintDocument = print;
+                    PrintMemberDocuments = printMemberDocs.ToDictionary(m => m.Member, m => m.Docs.Select(d => d.Doc).ToList());
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     UnlockInputs();
@@ -727,6 +814,9 @@ namespace Elwig.Windows {
                     Mouse.OverrideCursor = null;
                     return;
                 }
+            } else {
+                PrintDocument = null;
+                PrintMemberDocuments = null;
             }
             ProgressBar.Value = 100.0;
 
@@ -738,32 +828,34 @@ namespace Elwig.Windows {
             EmailButton.IsEnabled = EmailDocuments != null && App.Config.Smtp != null;
         }
 
-        private void PreviewButton_Click(object sender, RoutedEventArgs evt) {
+        private async void PreviewButton_Click(object sender, RoutedEventArgs evt) {
             var d = new OpenFolderDialog() {
                 Title = "Ordner auswählen - Elwig",
             };
             if (d.ShowDialog() == true) {
-                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 = 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 = null;
                 Process.Start("explorer.exe", d.FolderName);
             }
         }
 
         private async void PrintButton_Click(object sender, RoutedEventArgs evt) {
-            if (PrintDocument == null) return;
+            if (PrintDocument == null || PrintMemberDocuments == null) return;
 
             PrintButton.IsEnabled = false;
             GenerateButton.IsEnabled = false;
@@ -772,12 +864,22 @@ 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.AppStarting;
-                if (App.Config.Debug) {
-                    PrintDocument.Show();
-                } else {
-                    await PrintDocument.Print();
-                }
+                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 = null;
             }
 
@@ -795,8 +897,8 @@ namespace Elwig.Windows {
 
             SmtpClient? client = null;
             try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                client = await Utils.GetSmtpClient();
+                Mouse.OverrideCursor = Cursors.Wait;
+                client = await Task.Run(Utils.GetSmtpClient);
                 Mouse.OverrideCursor = null;
 
                 var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
@@ -805,24 +907,33 @@ namespace Elwig.Windows {
                     return;
                 }
 
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 var subject = EmailSubjectInput.Text;
                 var text = EmailBodyInput.Text;
-                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"));
+                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()
+                        )]);
                     }
-                    msg.Body = body;
-                    await client!.SendAsync(msg);
-                }
+                });
 
                 MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
@@ -870,7 +981,7 @@ namespace Elwig.Windows {
         }
 
         private void PostalInput_Changed(object sender, RoutedEventArgs evt) {
-            ResetDocuments();
+            UpdatePostalEmailRecipients();
         }
 
         private void OrderInput_Changed(object sender, RoutedEventArgs evt) {

Elwig/Windows/MainWindow.xaml

@@ -10,6 +10,7 @@
         <Style TargetType="Button">
             <Setter Property="VerticalAlignment" Value="Top"/>
             <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="9,3"/>
             <Setter Property="Height" Value="35"/>
@@ -19,23 +20,67 @@
     <Grid>
         <Menu BorderThickness="0,0,0,1" VerticalAlignment="Top" Height="19" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Datenbank">
-                <MenuItem Header="Daten exportieren..." Click="Menu_Database_Export_Click" IsEnabled="False"/>
-                <MenuItem Header="Daten importieren..." Click="Menu_Database_Import_Click"/>
+                <MenuItem Header="Daten exportieren..." Click="Menu_Database_Export_Click" IsEnabled="False">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEDE1;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Daten importieren..." Click="Menu_Database_Import_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8B5;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <Separator/>
-                <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click"/>
-                <MenuItem Header="Speicherort öffnen..." Click="Menu_Database_Open_Click"/>
+                <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE756;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Speicherort öffnen..." Click="Menu_Database_Open_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xED25;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Waage">
-                <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click"/>
+                <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEC92;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
             <MenuItem x:Name="HelpMenu" Header="Hilfe">
-                <MenuItem Header="Über"/>
-                <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>
-                <MenuItem x:Name="Menu_Help_Smtp" Header="E-Mail-Einstellungen testen" Click="Menu_Help_Smtp_Click"/>
-                <MenuItem x:Name="Menu_Help_Log" Header="Fehler-Protokoll anzeigen" Click="Menu_Help_Log_Click"/>
+                <MenuItem Header="Über">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE946;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE895;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Help_Smtp" Header="E-Mail-Einstellungen testen" Click="Menu_Help_Smtp_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE715;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Help_Log" Header="Fehler-Protokoll anzeigen" Click="Menu_Help_Log_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF168;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <Separator/>
-                <MenuItem x:Name="Menu_Help_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Help_Config_Click"/>
-                <MenuItem x:Name="Menu_Help_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Help_Directory_Click"/>
+                <MenuItem x:Name="Menu_Help_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Help_Config_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEC7A;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_Help_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Help_Directory_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xED25;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
         </Menu>
 
@@ -58,26 +103,64 @@
             </TextBlock>
         </Grid>
 
-        <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
-                Margin="0,170,205,0"/>
-        <Button x:Name="MailButton" Content="Rundschreiben" Click="MailButton_Click"
-                Margin="205,170,0,0"/>
-        <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
-                Margin="0,210,205,0"/>
-        <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
-                Margin="205,210,0,0"/>
-        <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
-                Margin="0,250,205,0"/>
-        <Button x:Name="DeliveryAncmtButton" Content="Anmeldungen" Click="DeliveryAncmtButton_Click"
-                Margin="205,250,0,0"/>
+        <Button x:Name="MemberAdminButton" Click="MemberAdminButton_Click"
+                Margin="0,170,205,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE77B;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Mitglieder</TextBlock>
+            </Grid>
+        </Button>
+        <Button x:Name="MailButton" Click="MailButton_Click"
+                Margin="205,170,0,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE715;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Rundschreiben</TextBlock>
+            </Grid>
+        </Button>
+        <Button x:Name="DeliveryAdminButton" Click="DeliveryAdminButton_Click"
+                Margin="0,210,205,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE736;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Lieferungen</TextBlock>
+            </Grid>
+        </Button>
+        <Button x:Name="ReceiptButton" Click="ReceiptButton_Click"
+                Margin="205,210,0,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xEC5B;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Übernahme</TextBlock>
+            </Grid>
+        </Button>
+        <Button x:Name="BaseDataButton" Click="BaseDataButton_Click"
+                Margin="0,250,205,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE713;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Stammdaten</TextBlock>
+            </Grid>
+        </Button>
+        <Button x:Name="DeliveryAncmtButton" Click="DeliveryAncmtButton_Click"
+                Margin="205,250,0,0">
+            <Grid>
+                <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xF0E4;"
+                           TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                <TextBlock TextAlignment="Center">Anmeldungen</TextBlock>
+            </Grid>
+        </Button>
 
         <Button x:Name="DownloadButton" Click="DownloadButton_Click"
-                Margin="310,135,0,0" Padding="1.5,0,0,0" Height="30" Width="30"
+                Margin="310,135,0,0" Padding="0.375,0.5,0,0" Height="30" Width="30"
                 Content="&#xE896;" FontFamily="Segoe MDL2 Assets" FontSize="16"
+                HorizontalContentAlignment="Center"
                 ToolTip="Lieferungen und Mitgliederdaten anderer Zweigstellen herunterladen"/>
         <Button x:Name="UploadButton" Click="UploadButton_Click"
-                Margin="375,135,0,0" Padding="1.5,0,0,0" Height="30" Width="30"
+                Margin="375,135,0,0" Padding="1.0,0.5,0,0" Height="30" Width="30"
                 Content="&#xE898;" FontFamily="Segoe MDL2 Assets" FontSize="16"
+                HorizontalContentAlignment="Center"
                 ToolTip="Lieferungen dieser Zweigstelle hochladen"/>
 
         <Expander x:Name="SeasonFinish" Header="Leseabschluss" SnapsToDevicePixels="True"
@@ -90,21 +173,104 @@
                                     Margin="0,13,0,0" VerticalAlignment="Top" HorizontalAlignment="Center"
                                     TextChanged="SeasonInput_TextChanged"/>
 
-                <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
-                        Click="OverUnderDeliveryButton_Click"
-                        Margin="0,50,195,10" Width="190"/>
-
-                <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigung"
+                <Button x:Name="DeliveryConfirmationButton"
                         Click="DeliveryConfirmationButton_Click"
-                        Margin="195,50,0,10" Width="190"/>
+                        Margin="0,50,195,10" Width="190">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE715;"
+                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,0.5,0,0"/>
+                        <TextBlock FontSize="12" Margin="18,1,0,0" TextAlignment="Center">Anlieferungsbestätigung</TextBlock>
+                    </Grid>
+                </Button>
 
-                <Button x:Name="BreakdownButton" Content="Sorten-/Qual.aufteilung"
-                        Click="BreakdownButton_Click"
-                        Margin="0,90,195,10" Width="190"/>
-
-                <Button x:Name="PaymentButton" Content="Auszahlung"
+                <Button x:Name="PaymentButton"
                         Click="PaymentButton_Click"
-                        Margin="195,90,0,10" Width="190"/>
+                        Margin="195,50,0,10" Width="190">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8EF;"
+                                  TextAlignment="Left" HorizontalAlignment="Left" Padding="0.5,1.5,0,0"/>
+                        <TextBlock TextAlignment="Center">Auszahlung</TextBlock>
+                    </Grid>
+                </Button>
+
+                <Button x:Name="OverUnderDeliveryButton"
+                        Click="OverUnderDeliveryButton_Click"
+                        Margin="0,90,195,10" Width="190" Padding="3,5,5,5"
+                        ToolTip="Über-/Unterlieferungen laut gezeichneten Geschäftsanteilen und Unterlieferungen nach Flächenbindungen">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
+                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>
+                        <TextBlock FontSize="12" Margin="18,1,0,0" TextAlignment="Center">Über-/Unterlieferungen</TextBlock>
+                    </Grid>
+                </Button>
+
+                <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">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
+                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>
+                        <TextBlock FontSize="12" Margin="18,1,0,0" TextAlignment="Center">Sorten-/Qual.aufschlüssel.</TextBlock>
+                    </Grid>
+                </Button>
+
+                <Button x:Name="AreaCommitmentsButton"
+                        Click="AreaCommitmentsButton_Click"
+                        Margin="0,130,195,10" Width="190" Padding="3,5,5,5"
+                        ToolTip="Aktive Flächenbindungen der Saison pro Mitglied und Sorte/Attribut">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
+                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,1.5,0,0"/>
+                        <TextBlock Margin="18,0,0,0" TextAlignment="Center">Flächenbindungen</TextBlock>
+                    </Grid>
+                </Button>
+
+                <Button x:Name="BreakdownMemberVarietyButton"
+                        Click="BreakdownMemberVarietyButton_Click"
+                        Margin="195,130,0,10" Width="190" Padding="3,5,5,5"
+                        ToolTip="Liefermengen und Ertrag (kg/ha) pro Mitglied">
+                    <Grid>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
+                                   TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,1.5,0,0"/>
+                        <TextBlock Margin="18,0,0,0" TextAlignment="Center">Liefermengen/Ertrag</TextBlock>
+                    </Grid>
+                </Button>
+
+                <Grid VerticalAlignment="Bottom" Margin="50,175,50,15">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="20"/>
+                        <RowDefinition Height="20"/>
+                        <RowDefinition Height="20"/>
+                        <RowDefinition Height="20"/>
+                    </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="3" TextAlignment="Right"><Bold>Fläche</Bold></TextBlock>
+
+                    <TextBlock Grid.Row="1" Grid.Column="0">Gesamt:</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="0">Gebunden:</TextBlock>
+                    <TextBlock Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2">Ungebunden:</TextBlock>
+
+                    <TextBlock Grid.Row="1" Grid.Column="1" TextAlignment="Right" x:Name="SeasonStatMembersTotal">-</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="1" TextAlignment="Right" x:Name="SeasonStatMembersGeb">-</TextBlock>
+                    <TextBlock Grid.Row="3" Grid.Column="1" TextAlignment="Right">-</TextBlock>
+
+                    <TextBlock Grid.Row="1" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightTotal">-</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightGeb">-</TextBlock>
+                    <TextBlock Grid.Row="3" Grid.Column="2" TextAlignment="Right" x:Name="SeasonStatWeightUngeb">-</TextBlock>
+
+                    <TextBlock Grid.Row="1" Grid.Column="3" TextAlignment="Right">-</TextBlock>
+                    <TextBlock Grid.Row="2" Grid.Column="3" TextAlignment="Right" x:Name="SeasonStatArea">-</TextBlock>
+                    <TextBlock Grid.Row="3" Grid.Column="3" TextAlignment="Right">-</TextBlock>
+                </Grid>
             </Grid>
         </Expander>
     </Grid>

Elwig/Windows/MainWindow.xaml.cs

@@ -25,7 +25,7 @@ namespace Elwig.Windows {
         public MainWindow() {
             InitializeComponent();
             var v = Assembly.GetExecutingAssembly().GetName().Version;
-            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}";
+            VersionField.Text = $"Version: {v?.ToString() ?? "?"} – {App.BranchName}";
             if (App.Client.Client == null) VersionField.Text += " (Unbekannt)";
             Menu_Help_Update.IsEnabled = App.Config.UpdateUrl != null;
             Menu_Help_Smtp.IsEnabled = App.Config.Smtp != null;
@@ -62,7 +62,7 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
             try {
                 using var client = await Utils.GetSmtpClient();
                 await client!.DisconnectAsync(true);
@@ -133,8 +133,10 @@ namespace Elwig.Windows {
                     Multiselect = true,
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
+                    });
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -145,77 +147,81 @@ namespace Elwig.Windows {
         private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            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();
+            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();
 
-                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, "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);
                 }
-                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.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 von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
-                        MessageBoxButton.OK, MessageBoxImage.Information);
+            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)
+                        .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 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);
                 }
-            } 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;
         }
 
@@ -251,7 +257,7 @@ namespace Elwig.Windows {
         }
 
         private void SeasonFinish_Expanded(object sender, RoutedEventArgs evt) {
-            Height = 530;
+            Height = 660;
         }
 
         private void SeasonFinish_Collapsed(object sender, RoutedEventArgs evt) {
@@ -260,12 +266,41 @@ namespace Elwig.Windows {
 
         private async void SeasonInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             using var ctx = new AppDbContext();
-            var s0 = await ctx.Seasons.FindAsync(SeasonInput.Value);
+            var year = SeasonInput.Value;
+            var s0 = await ctx.Seasons.FindAsync(year);
             var valid = (s0 != null);
             DeliveryConfirmationButton.IsEnabled = valid;
-            OverUnderDeliveryButton.IsEnabled = valid;
             PaymentButton.IsEnabled = valid;
+            OverUnderDeliveryButton.IsEnabled = valid;
             BreakdownButton.IsEnabled = valid;
+            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²";
+                    });
+                });
+            };
         }
 
         private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@@ -275,6 +310,12 @@ namespace Elwig.Windows {
             w.AddDeliveryConfirmation();
         }
 
+        private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            App.FocusPaymentVariants(year);
+        }
+
         private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
@@ -287,33 +328,27 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                var b = new Billing(year);
-                await b.FinishSeason();
-                await b.CalculateBuckets();
-                App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                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);
-                var tbl3 = await MemberDeliveryPerVariantData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
-                using var ods = new OdsFile(d.FileName);
-                await ods.AddTable(tbl1);
-                await ods.AddTable(tbl2);
-                await ods.AddTable(tbl3);
-            } 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;
         }
 
-        private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
-            if (SeasonInput.Value is not int year)
-                return;
-            App.FocusPaymentVariants(year);
-        }
-
         private async void BreakdownButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
@@ -326,24 +361,88 @@ namespace Elwig.Windows {
             if (d.ShowDialog() == false)
                 return;
 
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                var b = new Billing(year);
-                await b.FinishSeason();
-                await b.CalculateBuckets();
-                App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                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);
+                    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);
                 }
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            });
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void AreaCommitmentsButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new SaveFileDialog() {
+                FileName = $"Flächenbindungen-{year}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Flächenbindungen {year} speichern unter - Elwig"
+            };
+            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();
+
+                    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;
+        }
+
+        private async void BreakdownMemberVarietyButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new SaveFileDialog() {
+                FileName = $"Liefermengen-Ertrag-{year}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Liefermengen/Ertrag {year} speichern unter - Elwig"
+            };
+            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();
+
+                    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;
         }
     }