Documents: Replace Razor templates with iText

.gitea/workflows/test.yaml

@@ -23,16 +23,6 @@ jobs:
             echo "No files with BOM found"
             exit 0
           }
-      - name: Check for code smells
-        shell: powershell
-        run: |
-          git grep -IEn "\.(Single|First|Min|Max|Any)(OrDefault)?Async\([^)]|^using System.Data.Entity;"
-          if ( $lastexitcode -ne 1 ) {
-            exit 1
-          } else {
-            echo "No files with code smells found"
-            exit 0
-          }
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
       - name: Setup NuGet

.gitignore

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

CHANGELOG.md

@@ -2,197 +2,6 @@
 Changelog
 =========
 
-[v1.1.0.0][v1.1.0.0] (2026-07-09) {#v1.1.0.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.1.0.0-features}
-
-* Per Opt-In Einstellung in den Stammdaten ist es nun möglich Mitgliederbewegungen und Verläufe von Geschäftsanteilen mit Elwig zu erfassen. ([#20][i20])
-* Es wird nun unterstützt verschiedene Typen von Geschäftsanteilen pro Mitglied zu erfassen (normal, rot, weiß, ruhend). ([#80][i80])
-
-### Behobene Fehler {#v1.1.0.0-bugfixes}
-
-* Falls die Datenbank für die momentan verwndete Elwig-Version zu neu war kam es beim Überprüfen auf ein Update zu einem Fehler. (4ebe07f579)
-* Im Stammdatenblatt (`MemberDataSheet`) wurde die Stamm-Zweigstelle nicht angeführt. (a71c41af5c)
-
-### Sonstiges {#v1.1.0.0-misc}
-
-* In der Buchungsliste (`CreditNoteData`) wird nun auch das Buchhaltungskonto der Mitglieder angeführt. (000117dc67)
-* Viele kleine Verbesserungen der Code-Qualität. (u.a. fcd0555e4d, 69efca1cc3,  beacba6bd9, 1169ba5101)
-* Abhängigkeiten aktualisiert. (e8789aff37, 2350b55cea)
-
-[v1.1.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.0
-[i20]: https://git.necronda.net/winzer/elwig/issues/20
-[i80]: https://git.necronda.net/winzer/elwig/issues/80
-
-
-
-
-[v1.0.5.6][v1.0.5.6] (2026-06-25) {#v1.0.5.6}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.6-bugfixes}
-
-* Beim Speichern von Auszahlungsvarianten wurden Einstellungen für Abwertungen nicht immer übernommen. (15de07a4c3)
-* Im Stammdaten-Fenster (`BaseDataWindow`) war es nicht möglich Zweigstellen, Attribute, oder Bewirtschaftungsarten zu bearbeiten/erstellen/löschen. (1261be001c)
-
-### Sonstiges {#v1.0.5.6-misc}
-
-* Mandant `Seewinkel` hinzugefügt. (1ad97a78ff)
-
-[v1.0.5.6]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.6
-
-
-
-
-[v1.0.5.5][v1.0.5.5] (2026-06-24) {#v1.0.5.5}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.5-bugfixes}
-
-* Beim Exportieren der Überweisungsdaten (EBICS) im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`) kam es zu einem Absturz. (3f65b2350b)
-* Einige Einstellungen einer Auszahlungsvariante wurden vom Auszahlungsvariante-Fenster (`ChartWindow`) beim Speichern überschrieben. (f32ff945ec)
-
-### Sonstiges {#v1.0.5.5-misc}
-
-* Traubengutschriften mit negativem Betrag sind nun wieder möglich. (ba3f66591e)
-* Abhängigkeiten aktualisiert. (4e027a9add)
-
-[v1.0.5.5]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.5
-
-
-
-
-[v1.0.5.4][v1.0.5.4] (2026-06-22) {#v1.0.5.4}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.4-bugfixes}
-
-* Seit [v1.0.5.0](#v1.0.5.0) (2026-04-08) war es bei nicht-aktiven Mitgliedern nicht möglich Lieferungen oder Flächenbindungen anzusehen. (d0ce377d92)
-
-### Sonstiges {#v1.0.5.4-misc}
-
-* Bei der Installation wird nun auch der Quellcode mit ausgeliefert. (5db5876905)
-* Abhängigkeiten aktualisiert. (b4ab8349b4, f8b3147c72, 7a993585c3)
-
-[v1.0.5.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.4
-
-
-
-
-[v1.0.5.3][v1.0.5.3] (2026-04-29) {#v1.0.5.3}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.3-bugfixes}
-
-* Manche Anlieferungsbestätigungen und Traubengutschriften konnten nicht angezeigt werden. Dies lag an einem internen Fehler, der manchmal bei Zu-/Abschlägen auftrat. (72155fc54e, 9dfe71d6d0)
-
-[v1.0.5.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.3
-
-
-
-
-[v1.0.5.2][v1.0.5.2] (2026-04-24) {#v1.0.5.2}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.2-bugfixes}
-
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) sind Attribut/Bewirtschaftungsart in der Liste für Teil-Lieferungen nicht angezeigt worden. (5c2fae1855)
-
-### Sonstiges {#v1.0.5.2-misc}
-
-* Abhängigkeiten aktualisiert. (2915f08a6b)
-
-[v1.0.5.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.2
-
-
-
-
-[v1.0.5.1][v1.0.5.1] (2026-04-20) {#v1.0.5.1}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.5.1-bugfixes}
-
-* Zu-/Abschläge mit absolutem Wert (z.B. `€/kg`) wurden bei der Auszahlung nie mit der Menge multipliziert. (ea2b6db1fc)
-* Massenaktionen im Lieferungen-Fenster (`DeliveryAdminWindow`) haben für Zu-/Abschläge nicht funktioniert. (4eac8cd629, cf48f005e2)
-
-### Sonstiges {#v1.0.5.1-misc}
-
-* Behebung von Kleinigkeiten im Layout bei Dokumenten (`CreditNote`, `PaymentVariantSummary`). (7edf395497, a852dbb242)
-* Zuordnung von zwei Gemeinden vom Weinbaugebiet Neusiedlersee (`WLNS`) zu Leithaberg (`WLLB`). (2b3c293730)
-* Abhängigkeiten aktualisiert. (20fd5d5826, 7861a15e2e)
-
-[v1.0.5.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.1
-
-
-
-
-[v1.0.5.0][v1.0.5.0] (2026-04-08) {#v1.0.5.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.5.0-features}
-
-* Flächenbindungen werden nun in _Verträgen_ zusammengefasst um bessere Übersicht und historische Nachvollziehbarkeit zu gewährleisten. ([#77][i77])
-
-### Sonstiges {#v1.0.5.0-misc}
-
-* Erhebliche Verbesserung der Leistung/Geschwindigkeit. ([#79][i79], e5e5e10cd7, 22fbb0772f)
-* Am Stammdatenblatt (`MemberDataSheet`) wird nun als Datum das Datum der letzten Bearbeitung angegeben. (0a9c800116)
-* Abhängigkeiten aktualisiert. (07d93dd384, ce1a55df86, cc6e31a006)
-
-[v1.0.5.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.5.0
-[i77]: https://git.necronda.net/winzer/elwig/issues/77
-[i79]: https://git.necronda.net/winzer/elwig/issues/79
-
-
-
-
-[v1.0.4.1][v1.0.4.1] (2026-03-27) {#v1.0.4.1}
----------------------------------------------
-
-### Behobene Fehler {#v1.0.4.1-bugfixes}
-
-* In der Anlieferungsbestätigung (`DeliveryConfirmation`) war in einer Spalte der Text nicht rechtsbündig. (0aefab5d63)
-* Die zweite Zeile des Absenders wurde nicht mehr abgedruckt und der Briefkopf (`Letterhead`) beinhaltete zu viele Informationen. (3c52156b7e)
-
-### Sonstiges {#v1.0.4.1-misc}
-
-* Evtl. wurden bei Änderungen in der Datenbank unnötigerweise einige Daten in Elwig doppelt angefordert. (cc018ded10)
-* Massenaktionen im Lieferungen-Fenster (`DeliveryAdminWindow`) sind nun nicht mehr während dem Bearbeiten oder Erstellen möglich. (b1075d1e69)
-* Das Datum auf Lieferscheinen (`DeliveryNote`) ist nun statt des heutigen, das Datum der letzten Änderung der Lieferung. (982a6616e1)
-* Sollte es im Rundschreiben-Fenster (`MailWindow`) zu einem Fehler während dem Bereinigen der Dokumenten kommen wird dieser ignoriert. (ae0a082421)
-* Abhängigkeiten aktualisiert. (ddfc86197d, cdb4b0a2bd)
-
-[v1.0.4.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.4.1
-
-
-
-
-[v1.0.4.0][v1.0.4.0] (2026-03-16) {#v1.0.4.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.0.4.0-features}
-
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) gibt es nun über die Menü-Leiste die Möglichkeit _Massenaktionen_ für mehrere Lieferungen durchzuführen (z.B. Attribut oder Zu-/Abschlag setzen). ([#78][i78])
-
-### Behobene Fehler {#v1.0.4.0-bugfixes}
-
-* Waagen mit Netzwerkschnittstelle versuchen die Verbindung nun wieder neu aufzubauen, sollte diese unterbrochen werden. ([#74][i74])
-
-### Sonstiges {#v1.0.4.0-misc}
-
-* Die bisher verwendeten Programm-Bibliotheken zum Erstellen von PDF-Dokumente wurden vollständig durch [iText](https://itextpdf.com/) ersetzt.
-  Das ermöglicht ein schnelleres, effizienteres, und stabileres Erstellen der PDF-Dokumente.
-  Außerdem konnte so die Größe der Installations-Datei von ~138 MB auf ~98 MB um ca. 30 % reduziert werden. (d8c967b2f2, 8054a024f4)
-* Abhängigkeiten aktualisiert. (af73226c90, f4fddd111f)
-
-[v1.0.4.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.4.0
-[i74]: https://git.necronda.net/winzer/elwig/issues/74
-[i78]: https://git.necronda.net/winzer/elwig/issues/78
-
-
-
-
 [v1.0.3.4][v1.0.3.4] (2026-02-19) {#v1.0.3.4}
 ---------------------------------------------
 

Elwig/App.xaml.cs

@@ -5,9 +5,7 @@ using Elwig.Helpers.Export;
 using Elwig.Helpers.Printing;
 using Elwig.Helpers.Weighing;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Elwig.Windows;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -92,11 +90,11 @@ namespace Elwig {
 
             try {
                 await AppDbUpdater.CheckDb();
-            } catch (Exception exc) {
+            } catch (Exception e) {
                 if (Config.UpdateUrl != null && Utils.HasInternetConnectivity()) {
                     await CheckForUpdates();
                 }
-                InteractionService.ShowException("Fehlerhafte Datenbank", "Fehlerhafte Datenbank", exc);
+                MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
                 return;
             }
@@ -106,13 +104,11 @@ namespace Elwig {
 
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
-                branches = ctx.FetchBranches()
+                branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
-                    .ToDictionaryAsync(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr))
-                    .GetAwaiter().GetResult();
                 try {
                     Client = new(ctx);
-                } catch (Exception exc) {
+                } catch (Exception e) {
-                    InteractionService.ShowException("Fehler", "Fehler beim Laden der Mandantendaten", exc);
+                    MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                     return;
                 }
@@ -146,17 +142,18 @@ namespace Elwig {
             foreach (var s in Config.Scales) {
                 try {
                     list.Add(Scale.FromConfig(s));
-                } catch (Exception exc) {
+                } catch (Exception e) {
                     list.Add(new InvalidScale(s.Id));
                     if (s.Required)
-                        InteractionService.ShowException("Waagenfehler", $"Verbindung zu Waage {s.Id} konnte nicht hergestellt werden", exc);
+                        MessageBox.Show($"Verbindung zu Waage {s.Id} konnte nicht hergestellt werden:\n\n{e.Message}", "Waagenfehler",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             Scales = list;
 
             if (Config.Branch != null) {
                 if (!branches.ContainsKey(Config.Branch.ToLower())) {
-                    InteractionService.ShowError("Ungültige Zweigstelle", "Ungültige Zweigstelle in Konfigurationsdatei!");
+                    MessageBox.Show("Ungültige Zweigstelle in Konfigurationsdatei!", "Ungültige Zweigstelle", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                 } else {
                     SetBranch(branches[Config.Branch.ToLower()]);
@@ -164,7 +161,7 @@ namespace Elwig {
             } else if (branches.Count == 1) {
                 SetBranch(branches.First().Value);
             } else {
-                InteractionService.ShowError("Ungültige Zweigstelle", "Erkennen der lokalen Zweigstelle nicht möglich!");
+                MessageBox.Show("Erkennen der lokalen Zweigstelle nicht möglich!", "Ungültige Zweigstelle", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
             }
 
@@ -201,7 +198,6 @@ namespace Elwig {
             BranchName = entry.Item2;
             BranchPlz = entry.Item3;
             BranchLocation = entry.Item4?
-                .Split(",")[0]
                 .Split(" in ")[0]
                 .Split(" im ")[0]
                 .Split(" an ")[0]
@@ -222,8 +218,7 @@ namespace Elwig {
             MainDispatcher.Invoke(() => {
                 foreach (Window w in CurrentApp.Windows) {
                     if (w is not ContextWindow c) continue;
-                    MainDispatcher.Invoke(c.HintContextChange);
+                    MainDispatcher.BeginInvoke(c.HintContextChange);
-                    MainDispatcher.BeginInvoke(c.TryContextReload);
                 }
             });
         }
@@ -254,13 +249,14 @@ namespace Elwig {
                     if (Scales[i] is InvalidScale) {
                         try {
                             Scales[i] = Scale.FromConfig(s);
-                            InteractionService.ShowInformation($"Waage {s.Id}", $"Verbindung zu Waage {s.Id} wieder hergestellt!");
+                            MessageBox.Show($"Verbindung zu Waage {s.Id} wieder hergestellt!", $"Waage {s.Id}", MessageBoxButton.OK, MessageBoxImage.Information);
-                        } catch (Exception exc) {
+                        } catch (Exception e) {
                             Scales[i] = new InvalidScale(s.Id);
-                            InteractionService.ShowException("Waagenfehler", $"Verbindung zu Waage {s.Id} konnte nicht hergestellt werden", exc);
+                            MessageBox.Show($"Verbindung zu Waage {s.Id} konnte nicht hergestellt werden:\n\n{e.Message}", "Waagenfehler",
+                                MessageBoxButton.OK, MessageBoxImage.Error);
                         }
                     } else if (Scales[i] is IEventScale) {
-                        InteractionService.ShowInformation($"Waage {s.Id}", $"Verbindung zu Waage {s.Id} wieder hergestellt!");
+                        MessageBox.Show($"Verbindung zu Waage {s.Id} wieder hergestellt!", $"Waage {s.Id}", MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 }
             }
@@ -271,7 +267,7 @@ namespace Elwig {
             for (var i = 0; i < Config.Scales.Count; i++) {
                 var s = Config.Scales[i];
                 if ((s.Connection?.StartsWith($"serial://{name}:") ?? false) && Scales[i] is not InvalidScale) {
-                    InteractionService.ShowWarning($"Waagen {s.Id}", $"Verbindung zu Waage {s.Id} unterbrochen!");
+                    MessageBox.Show($"Verbindung zu Waage {s.Id} unterbrochen!", $"Waagen {s.Id}", MessageBoxButton.OK, MessageBoxImage.Warning);
                     if (Scales[i] is ICommandScale) {
                         try {
                             Scales[i].Dispose();
@@ -306,9 +302,11 @@ namespace Elwig {
                 });
             } else if (showAlert) {
                 if (latest == null) {
-                    InteractionService.ShowError("Nach Updates suchen", "Informationen konnten nicht abgerufen werden!");
+                    MessageBox.Show("Informationen konnten nicht abgerufen werden!", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                 } else {
-                    InteractionService.ShowInformation("Nach Updates suchen", $"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})");
+                    MessageBox.Show($"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             }
         }
@@ -318,11 +316,11 @@ namespace Elwig {
                 await Task.Run(async () => {
                     await Database.Import(filename);
                 });
-                InteractionService.ShowInformation("Datenbank ersetzen", "Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!");
+                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
                 ForceShutdown = true;
                 Current.Shutdown();
             } catch (Exception exc) {
-                InteractionService.ShowException("Datenbank ersetzen", "Fehler beim Ersetzen", exc);
+                MessageBox.Show("Fehler beim Ersetzen:\n\n" + exc.Message, "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -344,10 +342,6 @@ namespace Elwig {
             return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt);
         }
 
-        public static MemberBusinessSharesAdminWindow FocusMemberBusinessSharesWindow(int mgnr) {
-            return FocusWindow<MemberBusinessSharesAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
-        }
-
         public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
             return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
         }

Elwig/Controls/CheckComboBox.cs

@@ -122,7 +122,7 @@ namespace Elwig.Controls {
 
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
             SelectItemsReverse();
-            var dmp = !string.IsNullOrWhiteSpace(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrWhiteSpace(DisplayMemberPath) ? DisplayMemberPath : null;
+            var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null;
             if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
                 AllItemsSelected = true;
             } else if (SelectedItems.Count == 0) {

Elwig/Controls/IntegerUpDown.cs

@@ -41,21 +41,13 @@ namespace Elwig.Controls {
             incButton!.Click += IncrementButton_Click;
             decButton!.Click += DecrementButton_Click;
             base.OnApplyTemplate();
-            UpdateButtons();
-        }
-
-        private void UpdateButtons() {
-            var incButton = GetTemplateChild("IncrementButton") as RepeatButton;
-            var decButton = GetTemplateChild("DecrementButton") as RepeatButton;
-            incButton?.IsEnabled = Maximum == null || Value < Maximum;
-            decButton?.IsEnabled = Minimum == null || Value > Minimum;
         }
 
         private void IntegerUpDown_TextChanged(object sender, TextChangedEventArgs evt) {
             var idx = CaretIndex;
-            Text = new string([.. Text.Where(char.IsAsciiDigit).Take(4)]);
+            Text = new string(Text.Where(char.IsAsciiDigit).Take(4).ToArray());
             CaretIndex = idx;
-            evt.Handled = !((!Minimum.HasValue || Value >= Minimum) && (!Maximum.HasValue || Value <= Maximum));
+            evt.Handled = !(Value >= Minimum && Value <= Maximum);
             if (idx >= 4) {
                 if (Value < Minimum) {
                     Value = Minimum;
@@ -64,7 +56,6 @@ namespace Elwig.Controls {
                 }
                 CaretIndex = 4;
             }
-            UpdateButtons();
         }
 
         private void IntegerUpDown_LostFocus(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using System;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -13,27 +12,23 @@ namespace Elwig.Dialogs {
         public string OrigYearTo { get; set; }
         public string Area { get; set; }
 
-        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete, bool forceRetroactive = false) {
+        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";
-            forceRetroactive = forceRetroactive || yearFrom.HasValue && yearTo.HasValue && yearFrom.Value == yearTo.Value;
-            RetroactiveInput.IsEnabled = !forceRetroactive;
             if (delete) {
                 QuestionBlock1.Visibility = Visibility.Hidden;
                 QuestionBlock2.Visibility = Visibility.Visible;
                 DescBlock1.Visibility = Visibility.Hidden;
                 DescBlock2.Visibility = Visibility.Visible;
             }
-            SeasonInput.Minimum = yearFrom.HasValue ? yearFrom + 1 : null;
+            if ((yearTo.HasValue && yearTo < Utils.CurrentNextSeason) || (yearFrom.HasValue && yearFrom >= Utils.CurrentNextSeason)) {
-            SeasonInput.Maximum = yearTo.HasValue ? yearTo : null;
-            if (forceRetroactive || (yearTo.HasValue && yearTo < Utils.CurrentYear) || (yearFrom.HasValue && yearFrom >= Utils.CurrentYear)) {
                 RetroactiveInput.IsChecked = true;
             } else {
-                SeasonInput.Text = $"{Utils.CurrentYear}";
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
             }
         }
 
@@ -53,7 +48,7 @@ namespace Elwig.Dialogs {
                 DescBlock2.Visibility = Visibility.Hidden;
             } else {
                 SeasonInput.IsEnabled = true;
-                SeasonInput.Text = $"{Math.Max(SeasonInput.Minimum ?? Utils.CurrentYear, Utils.CurrentYear)}";
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
                 DescBlock1.Visibility = QuestionBlock1.Visibility;
                 DescBlock2.Visibility = QuestionBlock2.Visibility;
             }

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -8,7 +8,7 @@
         ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
         WindowStartupLocation="CenterOwner"
         DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="240" Width="450">
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -48,8 +48,12 @@
                             Minimum="1900" Maximum="9999"
                             HorizontalAlignment="Center" VerticalAlignment="Top"
                             TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearFrom}"/>
 
-        <TextBlock x:Name="DescBlock1" Margin="0,90,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                    HorizontalAlignment="Center" VerticalAlignment="Top">
             Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
             und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

@@ -5,51 +5,51 @@ using System.Windows.Controls;
 namespace Elwig.Dialogs {
     public partial class AreaComTransferDialog : Window {
 
-        public int CancelSeason => SuccessorSeason - 1;
+        public int CancelSeason { get; set; }
-        public int SuccessorSeason { get; set; }
+        public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearFrom { get; set; }
 
         public string AreaComNum { get; set; }
         public string Area { get; set; }
 
         public AreaComTransferDialog(string name, int areaComNum, int area) {
-            SuccessorSeason = Utils.FollowingSeason;
+            CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
-            SeasonInput.Text = $"{SuccessorSeason}";
+            SeasonInput.Text = $"{CancelSeason}";
-            SeasonInput.Minimum = Utils.CurrentLastSeason;
             Title = $"Aktive Flächenbindungen kündigen - {name}";
             QuestionBlock1.Visibility = Visibility.Hidden;
             QuestionBlock2.Visibility = Visibility.Visible;
             DescBlock1.Visibility = Visibility.Hidden;
             DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
             Height = 240;
             SeasonInput.Margin = new(0, 40, 0, 0);
             SeasonLabel.Margin = new(0, 40, 100, 0);
         }
 
         public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
-            SuccessorSeason = Utils.FollowingSeason;
+            CancelSeason = Utils.FollowingSeason - 1;
             AreaComNum = $"{areaComNum:N0}";
             Area = $"{area:N0}";
             InitializeComponent();
-            SeasonInput.Text = $"{SuccessorSeason}";
+            SeasonInput.Text = $"{CancelSeason}";
-            SeasonInput.Minimum = Utils.CurrentLastSeason;
             Title = $"Aktive Flächenbindungen übertragen - {name} - {successorName}";
             InfoBlock.Visibility = Visibility.Hidden;
         }
 
         private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            SuccessorSeason = (int)SeasonInput.Value!;
+            CancelSeason = (int)SeasonInput.Value!;
             CancelSeason1.Text = $"{CancelSeason}";
             CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
-            DescBlock1Season.Text = "inkl. Saison ";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

Elwig/Dialogs/DeliverySplittingDialog.xaml.cs

@@ -44,10 +44,15 @@ namespace Elwig.Dialogs {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers().ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
             ControlUtils.RenewItemsSource(DeliveryInput, await ctx.Deliveries
                 .Where(d => d.DateString == $"{_delivery.Date:yyyy-MM-dd}" && d.ZwstId == _delivery.ZwstId)
                 .OrderBy(d => d.LsNr)
+                .Include(d => d.Member)
                 .Include(d => d.Parts)
                 .ToListAsync());
             if (DeliveryInput.SelectedItem == null)

Elwig/Dialogs/UpdateDialog.xaml.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using Elwig.Services;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -52,7 +51,7 @@ namespace Elwig.Dialogs {
                 File.Delete(fileName);
                 return;
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Process.Start(fileName);
             DialogResult = true;

Elwig/Documents/BusinessDocument.cs

@@ -2,7 +2,6 @@ using Elwig.Helpers;
 using Elwig.Models;
 using Elwig.Models.Entities;
 using iText.Kernel.Colors;
-using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
 using iText.Kernel.Pdf.Action;
 using iText.Kernel.Pdf.Canvas;
@@ -18,12 +17,10 @@ namespace Elwig.Documents {
     public class BusinessDocument : Document {
 
         public Member Member;
-        public MemberHistoryPoint MemberShares;
         public string? Location;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
         public bool ShowDateAndLocation = false;
-        public DateOnly? DateFrom;
         protected Table? Aside;
 
         public string Address {
@@ -49,17 +46,16 @@ namespace Elwig.Documents {
             return NewAsideCell(new KernedParagraph(text, 10), colspan, isName);
         }
 
-        public BusinessDocument(string title, Member m, DateOnly? dateFrom, bool includeSender = false) :
+        public BusinessDocument(string title, Member m, bool includeSender = false) :
             base(title) {
             Member = m;
-            MemberShares = new(m.Shares, m.SharesRed, m.SharesWhite, m.SharesDormant);
             Location = App.BranchLocation;
             IncludeSender = includeSender;
-            DateFrom = dateFrom;
         }
 
-        protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
-            base.BeforeRenderBody(doc, pdf);
+            base.RenderHeader(doc, pdf);
+
             var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10);
             if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)"));
             Aside = new Table(ColsMM(22.5, 42.5))
@@ -72,20 +68,6 @@ namespace Elwig.Documents {
                 .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
         }
 
-        protected void RenderAddress(Canvas canvas, Rectangle pageSize) {
-            canvas.Add(new Div()
-                .SetFixedPositionMM(25, 50, 80, 45, pageSize)
-                .SetFont(NF)
-                .Add(new KernedParagraph(IncludeSender ? $"{App.Client.Sender1}\n{App.Client.Sender2}" : "", 8).SetMargins(8, 0, 8, 0).SetHeight(16.0625f))
-                .Add(new KernedParagraph(Address, 12).SetMargin(0).SetHeight(12 * 5)));
-        }
-
-        protected static void RenderAside(Table aside, Canvas canvas, Rectangle pageSize) {
-            canvas.Add(new Div()
-                .SetFixedPositionMM(125, 50, 65, 50, pageSize)
-                .Add(aside));
-        }
-
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
             base.RenderBody(doc, pdf);
 
@@ -102,14 +84,20 @@ namespace Elwig.Documents {
                 header.Add(new KernedParagraph(App.Client.NameTypeFull, 12).SetFont(NF).SetMargin(0));
                 canvas.Add(header);
                 // address
-                RenderAddress(canvas, pageSize);
+                canvas.Add(new Div()
+                    .SetFixedPositionMM(25, 50, 80, 45, pageSize)
+                    .SetFont(NF)
+                    .Add(new KernedParagraph(IncludeSender ? $"{App.Client.Sender1}\n{App.Client.Sender2}" : "", 8).SetMargin(0).SetHeight(16).SetPaddings(8, 0, 8, 0))
+                    .Add(new KernedParagraph(Address, 12).SetMargin(0).SetHeight(12 * 5)));
                 // aside
                 if (Aside != null) {
-                    RenderAside(Aside, canvas, pageSize);
+                    canvas.Add(new Div()
+                        .SetFixedPositionMM(125, 50, 65, 50, pageSize)
+                        .Add(Aside));
                 }
             }
 
-            doc.Add(new KernedParagraph(ShowDateAndLocation ? $"{Location}, am {DateFrom ?? Date:dd.MM.yyyy}" : "", 12).SetTextAlignment(TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE).SetHeight(24).SetMargin(0));
+            doc.Add(new KernedParagraph(ShowDateAndLocation ? $"{Location}, am {Date:dd.MM.yyyy}" : "", 12).SetTextAlignment(TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE).SetHeight(24).SetMargin(0));
             doc.Add(new KernedParagraph(Title, 12).SetFont(BF).SetMargins(0, 0, 12, 0));
         }
 
@@ -265,7 +253,7 @@ namespace Elwig.Documents {
         }
 
         protected Table NewBucketTable(
-            Season season, Dictionary<string, MemberBucket> buckets, int deliveredWeightRed, int deliveredWeightWhite,
+            Season season, Dictionary<string, MemberBucket> buckets,
             bool includeDelivery = true, bool includePayment = false,
             bool isTiny = false, IEnumerable<string>? filter = null
         ) {
@@ -318,21 +306,11 @@ namespace Elwig.Documents {
                 .Where(b => !fbVars.Contains(b.Key))
                 .OrderBy(b => b.Value.Name);
 
-            if (MemberShares.Shares != 0 || (MemberShares.SharesRed == 0 && MemberShares.SharesWhite == 0)) {
+            tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
+            tbl.AddCells(FormatRow(Member.BusinessShares * season.MinKgPerBusinessShare,
-                tbl.AddCells(FormatRow(MemberShares.Shares * (season.MinKgPerShare ?? 0), MemberShares.Shares * (season.MaxKgPerShare ?? 0),
+                    Member.BusinessShares * season.MaxKgPerBusinessShare,
-                        deliveredWeightRed + deliveredWeightWhite, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
+                    season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
-            }
+                    isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-
-            if (MemberShares.SharesRed != 0 || MemberShares.SharesWhite != 0) {
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA (rot)", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberShares.SharesRed * (season.MinKgPerShareRed ?? season.MinKgPerShare ?? 0), MemberShares.SharesRed * (season.MaxKgPerShareRed ?? season.MaxKgPerShare ?? 0),
-                        deliveredWeightRed, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA (weiß)", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberShares.SharesWhite * (season.MinKgPerShareWhite ?? season.MinKgPerShare ?? 0), MemberShares.SharesWhite * (season.MaxKgPerShareWhite ?? season.MaxKgPerShare ?? 0),
-                        deliveredWeightWhite, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-            }
 
             if (fbs.Any()) {
                 tbl.AddCell(NewBucketSubHdr("Flächenbindungen" + (vtr.Any() ? " (inkl. Verträge)" : "") + ":", includePayment ? 8 : 7, isTiny: isTiny));

Elwig/Documents/CreditNote.cs

@@ -1,82 +1,55 @@
 using Elwig.Helpers;
-using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class CreditNote : BusinessDocument {
 
         public new static string Name => "Traubengutschrift";
 
-        public PaymentMember Payment;
+        public PaymentMember? Payment;
         public Credit? Credit;
+        public CreditNoteDeliveryData Data;
         public string? Text;
         public string CurrencySymbol;
         public int Precision;
-        public string? MemberModifier;
+        public string MemberModifier;
         public List<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
         public int MemberAutoBusinessShares;
         public decimal MemberAutoBusinessSharesAmount;
         public PaymentCustom? CustomPayment;
 
-        protected bool ConsiderContractPenalties;
+        public CreditNote(
-        protected bool ConsiderTotalPenalty;
+            AppDbContext ctx,
-        protected bool ConsiderAutoBusinessShares;
+            PaymentMember p,
-        protected bool ConsiderCustomModifiers;
+            CreditNoteDeliveryData data,
-
+            bool considerContractPenalties,
-        private CreditNoteDeliveryData? _data;
+            bool considerTotalPenalty,
-        private Dictionary<string, UnderDelivery>? _underDeliveries;
+            bool considerAutoBusinessShares,
-
+            bool considerCustomModifiers,
-        public CreditNote(PaymentMember p, DateOnly? dateFrom, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) :
+            Dictionary<string, UnderDelivery>? underDeliveries = null
-            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member, dateFrom) {
+        ) :
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
+            Data = data;
             Payment = p;
             Credit = p.Credit;
-            Text = App.Client.TextCreditNote;
+            IsPreview = Payment == null || Credit == null;
-            DocumentId = $"Tr.-Gutschr. " + (Credit != null ? $"{Credit.Year}/{Credit.TgNr:000}" : Payment.MgNr);
+            var season = p.Variant.Season;
-            IsPreview = Credit == null;
+            if (considerCustomModifiers) {
-            _data = data;
+                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
-            _underDeliveries = underDeliveries;
-            CurrencySymbol = Payment.Variant.Season.Currency.Symbol ?? Payment.Variant.Season.Currency.Code;
-            Precision = Payment.Variant.Season.Precision;
-
-            billingData ??= BillingData.FromJson(Payment.Variant.Data);
-            ConsiderContractPenalties = billingData.ConsiderContractPenalties;
-            ConsiderTotalPenalty = billingData.ConsiderTotalPenalty;
-            ConsiderAutoBusinessShares = billingData.ConsiderAutoBusinessShares;
-            ConsiderCustomModifiers = billingData.ConsiderCustomModifiers;
-        }
-
-        public static async Task<CreditNote> Initialize(int year, int avnr, int mgnr, DateOnly? dateFrom, BillingData? billingData = null, CreditNoteDeliveryData? data = null, Dictionary<string, UnderDelivery>? underDeliveries = null) {
-            using var ctx = new AppDbContext();
-            var p = await ctx.MemberPayments
-                .Where(p => p.Year == year && p.AvNr == avnr && p.MgNr == mgnr)
-                .SingleAsync();
-            return new CreditNote(p, dateFrom, billingData, data, underDeliveries);
-        }
-
-        protected override async Task LoadData(AppDbContext ctx) {
-            await base.LoadData(ctx);
-            var season = Payment.Variant.Season;
-            if (ConsiderCustomModifiers) {
-                CustomPayment = await ctx.CustomPayments.FindAsync(Payment.Year, Payment.MgNr);
             }
 
-            _data ??= (await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, Payment.Year, Payment.AvNr))[Member.MgNr];
+            var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
-            _underDeliveries ??= await ctx.GetMemberUnderDelivery(Payment.Year, Member.MgNr);
-
-            var mod = App.Client.IsMatzen ? await ctx.FetchModifiers(season.Year).Where(m => m.Name.StartsWith("Treue")).FirstOrDefaultAsync() : null;
             if (CustomPayment?.ModComment != null) {
                 MemberModifier = CustomPayment.ModComment;
             } else if (mod != null) {
@@ -84,33 +57,32 @@ namespace Elwig.Documents {
             } else {
                 MemberModifier = "Sonstige Zu-/Abschläge";
             }
+            Text = App.Client.TextCreditNote;
+            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
+            CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
+            Precision = season.Precision;
 
-            if (ConsiderTotalPenalty) {
+            if (considerTotalPenalty) {
-                var weights = _data.Rows.Select(r => new {r.Type, Weight = r.Buckets.Sum(b => b.Value)}).GroupBy(r => r.Type).ToDictionary(r => r.Key, g => g.Sum(r => r.Weight));
+                var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
-                var red = weights.GetValueOrDefault("R", 0);
+                var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
-                var white = weights.GetValueOrDefault("W", 0);
+                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
-                var total = red + white;
-                var underDeliveryTotal = total - Member.Shares * (season.MinKgPerShare ?? 0);
-                var underDeliveryRed = red - Member.SharesRed * (season.MinKgPerShareRed ?? season.MinKgPerShare ?? 0);
-                var underDeliveryWhite = white - Member.SharesWhite * (season.MinKgPerShareWhite ?? season.MinKgPerShare ?? 0);
-                MemberTotalUnderDelivery =
-                    (underDeliveryTotal < 0 ? underDeliveryTotal * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerShareAmount * Math.Floor(-(decimal)underDeliveryTotal / (season.MinKgPerShare ?? 0)) ?? 0) : 0) +
-                    (underDeliveryRed < 0 ? underDeliveryRed * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerShareAmount * Math.Floor(-(decimal)underDeliveryRed / (season.MinKgPerShareRed ?? season.MinKgPerShare ?? 0)) ?? 0) : 0) +
-                    (underDeliveryWhite < 0 ? underDeliveryWhite * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerShareAmount * Math.Floor(-(decimal)underDeliveryWhite / (season.MinKgPerShareWhite ?? season.MinKgPerShare ?? 0)) ?? 0) : 0);
                 if (total == 0)
-                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerShareNone * (Member.Shares + Member.SharesRed + Member.SharesWhite) ?? 0);
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
             }
-            if (ConsiderAutoBusinessShares) {
+            if (considerAutoBusinessShares) {
-                MemberAutoBusinessShares = await ctx.MemberHistory
+                var fromDate = $"{season.Year}-01-01";
-                    .Where(h => h.ToMgNr == Member.MgNr && h.DeductYear == season.Year)
+                var toDate = $"{season.Year}-12-31";
-                    .SumAsync(h => h.Shares);
+                MemberAutoBusinessShares = ctx.MemberHistory
+                    .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
+                    .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
+                    .Sum(h => h.BusinessShares);
                 MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
-            if (ConsiderContractPenalties) {
+            if (considerContractPenalties) {
-                var varieties = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+                var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
-                var attributes = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a);
+                var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-                var comTypes = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
+                var comTypes = ctx.AreaCommitmentTypes.ToDictionary(t => t.VtrgId, t => t);
-                MemberUnderDeliveries = _underDeliveries?
+                MemberUnderDeliveries = underDeliveries?
                     .OrderBy(u => u.Key)
                     .Select(u => (
                         varieties[u.Key[..2]].Name + (u.Key.Length > 2 ? " " + attributes[u.Key[2..]].Name : ""),
@@ -123,8 +95,8 @@ namespace Elwig.Documents {
             }
         }
 
-        protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
-            base.BeforeRenderBody(doc, pdf);
+            base.RenderHeader(doc, pdf);
             Aside?.AddCell(NewAsideCell("Gutschrift", 2))
                 .AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-"))
                 .AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}"))
@@ -132,20 +104,19 @@ namespace Elwig.Documents {
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            if (_data == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
-            doc.Add(NewCreditTable(_data));
+            doc.Add(NewCreditTable(Data));
 
             var div = new Table(ColsMM(60, 105))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorderTop(new SolidBorder(BorderThickness));
             var hint = new KernedParagraph(8)
                 .Add(Italic("Hinweis:\n" +
                     $"Die Summe der Lieferungen und die Summe der anfal\u00adlenden Pönalen werden mit " +
                     $"{Payment?.Variant.Season.Precision} Nach\u00adkomma-stellen berechnent, " +
                     $"erst das Ergebnis wird kauf-männisch auf 2 Nach\u00adkomma\u00adstellen gerundet."))
                 .SetWidth(56 * PtInMM).SetMarginsMM(4, 2, 4, 2);
-            div.AddCell(new Cell(1, 2).SetPadding(0).SetBorder(Border.NO_BORDER).SetBorderTop(new SolidBorder(BorderThickness)));
             div.AddCell(new Cell(3, 1).SetPadding(0).SetBorder(Border.NO_BORDER).Add(hint).SetKeepTogether(true));
             var tbl1 = new Table(ColsMM(70, 5, 5, 25))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
@@ -160,7 +131,7 @@ namespace Elwig.Documents {
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                 .SetKeepTogether(true);
 
-            var sum = _data.Rows.Sum(p => p.Amount);
+            var sum = Data.Rows.Sum(p => p.Amount);
             if (Payment == null) {
                 tbl1.AddCells(FormatRow("Gesamt", sum, bold: true, noTopBorder: true));
             } else {
@@ -168,7 +139,7 @@ namespace Elwig.Documents {
                 if (Payment.NetAmount != Payment.Amount) {
                     tbl1.AddCells(FormatRow("Zwischensumme", Payment.NetAmount, noTopBorder: noBorder));
                     noBorder = false;
-                    tbl1.AddCells(FormatRow(MemberModifier ?? "", Payment.Amount - Payment.NetAmount, add: true));
+                    tbl1.AddCells(FormatRow(MemberModifier, Payment.Amount - Payment.NetAmount, add: true));
                 }
                 if (Credit == null) {
                     tbl1.AddCells(FormatRow("Gesamtbetrag", Payment.Amount, bold: true, noTopBorder: noBorder));
@@ -202,7 +173,7 @@ namespace Elwig.Documents {
                 penalty += MemberTotalUnderDelivery;
             }
             if (MemberAutoBusinessSharesAmount != 0) {
-                tbl2.AddCells(FormatRow($"Nachzeichnung von GA ({MemberAutoBusinessShares})", MemberAutoBusinessSharesAmount, add: true));
+                tbl2.AddCells(FormatRow($"Autom. Nachz. von GA ({MemberAutoBusinessShares})", MemberAutoBusinessSharesAmount, add: true));
                 penalty += MemberAutoBusinessSharesAmount;
             }
             if (CustomPayment?.Amount != null) {
@@ -232,12 +203,12 @@ namespace Elwig.Documents {
             div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl1));
             div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl2));
             div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl3));
-            doc.Add(div);
+            doc.Add(div.SetMarginBottomMM(10));
 
             if (comment != null) {
-                doc.Add(new KernedParagraph($"*{comment}", 12).SetMarginTopMM(10));
+                doc.Add(new KernedParagraph($"*{comment}", 12));
             }
-            doc.Add(new KernedParagraph($"Überweisung erfolgt auf Konto {Utils.FormatIban(Member.Iban ?? "-")}.", 12).SetPaddingTopMM(10));
+            doc.Add(new KernedParagraph($"Überweisung erfolgt auf Konto {Utils.FormatIban(Member.Iban ?? "-")}.", 12));
             if (Text != null) {
                 doc.Add(new KernedParagraph(Text, 12).SetMarginTop(12).SetKeepTogether(true));
             }
@@ -301,14 +272,11 @@ namespace Elwig.Documents {
                         if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
                         sub.AddCell(NewCell(colspan: 2))
                             .AddCell(NewTd(varibute, colspan: 3).SetPaddingTop(0));
+                    } else if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
+                        sub.AddCell(NewCell(colspan: 2))
+                            .AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
                     } else {
-                        var idx = i - (rows - p.Modifiers.Length);
+                        sub.AddCell(NewCell(colspan: 5));
-                        if (idx >= 0 && idx < p.Modifiers.Length) {
-                            sub.AddCell(NewCell(colspan: 2))
-                                .AddCell(NewTd(p.Modifiers[idx], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
-                        } else {
-                            sub.AddCell(NewCell(colspan: 5));
-                        }
                     }
 
                     if (i < p.Buckets.Length) {
@@ -329,7 +297,7 @@ namespace Elwig.Documents {
                         var totalMod = p.TotalModifiers ?? 0;
                         var pad = i == 0 ? 0.5f : 0;
                         sub.AddCell(NewTd(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"), 6, center: true)
-                                .SetPaddingTopMM(pad).SetPaddingLeft(0).SetPaddingRight(0))
+                                .SetPaddingTopMM(pad))
                             .AddCell(NewTd(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}", center: totalMod == 0, right: true)
                                 .SetPaddingTopMM(pad))
                             .AddCell(NewTd($"{p.Amount:N2}", right: true)

Elwig/Documents/DeliveryConfirmation.cs

@@ -5,54 +5,34 @@ using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
         public new static string Name => "Anlieferungsbestätigung";
 
-        private readonly int _year;
+        public Season Season;
-        public Season? Season;
+        public DeliveryConfirmationDeliveryData Data;
-        public int MemberDeliveredWeightRed;
-        public int MemberDeliveredWeightWhite;
-        public DeliveryConfirmationDeliveryData? Data;
         public string? Text = App.Client.TextDeliveryConfirmation;
-        public Dictionary<string, MemberBucket> MemberBuckets = [];
+        public Dictionary<string, MemberBucket> MemberBuckets;
-        public List<MemberStat> MemberStats = [];
+        public List<MemberStat> MemberStats;
 
-        public DeliveryConfirmation(int year, Member m, DateOnly? dateFrom, DeliveryConfirmationDeliveryData? data = null) :
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) :
-            base($"{Name} {year}", m, dateFrom) {
+            base($"{Name} {year}", m) {
-            _year = year;
+            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;
-            DocumentId = $"Anl.-Best. {_year}/{m.MgNr}";
+            DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
             Data = data;
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
+            MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
 
-        protected override async Task LoadData(AppDbContext ctx) {
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
-            await base.LoadData(ctx);
+            base.RenderHeader(doc, pdf);
-            Season = await ctx.FetchSeasons(_year).SingleOrDefaultAsync() ?? throw new ArgumentException("Invalid season");
-            var weights = await ctx.Deliveries
-                .Where(d => d.Year == Season.Year && d.MgNr == Member.MgNr)
-                .SelectMany(d => d.Parts)
-                .GroupBy(p => p.Variety.Type)
-                .ToDictionaryAsync(g => g.Key, g => g.Sum(p => p.Weight));
-            MemberDeliveredWeightRed = weights.GetValueOrDefault("R", 0);
-            MemberDeliveredWeightWhite = weights.GetValueOrDefault("W", 0);
-            MemberShares = await ctx.GetMemberHistory(Season.Year, Member.MgNr);
-            MemberBuckets = await ctx.GetMemberBuckets(Season.Year, Member.MgNr);
-            MemberStats = await AppDbContext.GetMemberStats(Season.Year, Member.MgNr);
-            Data ??= await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, Season.Year, Member);
-        }
-
-        protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            if (Data == null) throw new Exception("Call LoadData before BeforeRenderBody");
-            base.BeforeRenderBody(doc, pdf);
             var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
             var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
             Aside?.AddCell(NewAsideCell("Saison", 2))
@@ -62,13 +42,12 @@ namespace Elwig.Documents {
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            if (Season == null || Data == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
 
             doc.Add(NewDeliveryListTable(Data));
             doc.Add(NewWeightsTable(MemberStats)
                 .SetMarginTopMM(10).SetKeepTogether(true));
-            doc.Add(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeightRed, MemberDeliveredWeightWhite, includePayment: true)
+            doc.Add(NewBucketTable(Season, MemberBuckets, includePayment: true)
                 .SetMarginTopMM(10).SetKeepTogether(true));
 
             if (Text != null) {
@@ -119,14 +98,13 @@ namespace Elwig.Documents {
                     } else if (i == 1 && attr) {
                         sub.AddCell(NewCell(colspan: 2))
                             .AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", 8, colspan: 2)
-                                .SetPaddingTop(0))
+                                .SetPaddingsMM(0.125f, 1, 0.125f, 1))
                             .AddCell(NewCell(colspan: 2));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));
-                        var idx = i - (rows - p.Modifiers.Length);
+                        if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
-                        if (idx >= 0 && idx < p.Modifiers.Length) {
+                            sub.AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 2)
-                            sub.AddCell(NewTd(p.Modifiers[idx], 8, colspan: 2)
+                                .SetPaddingsMM(0.125f, 0, 0.125f, 5));
-                                .SetPaddingTop(0).SetPaddingLeftMM(5));
                         } else {
                             sub.AddCell(NewCell(colspan: 2));
                         }
@@ -135,16 +113,15 @@ namespace Elwig.Documents {
 
                     if (i < p.Buckets.Length) {
                         var bucket = p.Buckets[i];
-                        var pad = i == 0 ? 0.5f : 0;
+                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingsMM(0.125f, 0, 0.125f, 0));
-                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingTopMM(pad));
+                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true));
-                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true).SetPaddingTopMM(pad));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));
                     }
 
                     if (i == p.Buckets.Length - 1) {
-                        sub.AddCell(NewTd($"{p.Weight:N0}", right: true).SetPaddingTop(0));
+                        sub.AddCell(NewTd($"{p.Weight:N0}"));
-                        sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: true).SetFont(SF).SetPadding(0));
+                        sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, center: true).SetFont(SF).SetPadding(0));
                     } else {
                         sub.AddCell(NewCell(colspan: 2));
                     }

Elwig/Documents/DeliveryNote.cs

@@ -5,12 +5,10 @@ using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Layout;
 using iText.Layout.Properties;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class DeliveryNote : BusinessDocument {
@@ -19,9 +17,7 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public int MemberDeliveredWeightRed;
+        public Dictionary<string, MemberBucket> MemberBuckets;
-        public int MemberDeliveredWeightWhite;
-        public Dictionary<string, MemberBucket> MemberBuckets = [];
 
         // 0 - none
         // 1 - GA only
@@ -29,49 +25,19 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d) :
+        public DeliveryNote(Delivery d, AppDbContext? ctx = null) :
-            base($"{Name} Nr. {d.LsNr}", d.Member, DateOnly.FromDateTime(d.ModifiedAt)) {
+            base($"{Name} Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Delivery = d;
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
+            IsDoublePaged = true;
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
         }
 
-        public static async Task<DeliveryNote> Initialize(int year, int did) {
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
-            using var ctx = new AppDbContext();
+            base.RenderHeader(doc, pdf);
-            await ctx.WineOrigins.LoadAsync();
-            var d = await ctx.Deliveries
-                .Where(d => d.Year == year && d.DId == did)
-                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                .SingleAsync();
-            return new DeliveryNote(d);
-        }
-
-        public static async Task<DeliveryNote> Initialize(string lsnr) {
-            using var ctx = new AppDbContext();
-            await ctx.WineOrigins.LoadAsync();
-            var d = await ctx.Deliveries
-                .Where(d => d.LsNr == lsnr)
-                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                .SingleAsync();
-            return new DeliveryNote(d);
-        }
-
-        protected override async Task LoadData(AppDbContext ctx) {
-            await base.LoadData(ctx);
-            var weights = await ctx.DeliveryParts
-                .Where(d => d.Year == Delivery.Year && d.Delivery.MgNr == Member.MgNr)
-                .GroupBy(p => p.Variety.Type)
-                .ToDictionaryAsync(g => g.Key, g => g.Sum(p => p.Weight));
-            MemberDeliveredWeightRed = weights.GetValueOrDefault("R", 0);
-            MemberDeliveredWeightWhite = weights.GetValueOrDefault("W", 0);
-            MemberShares = await ctx.GetMemberHistory(Delivery.Year, Member.MgNr);
-            MemberBuckets = await ctx.GetMemberBuckets(Delivery.Year, Member.MgNr) ?? [];
-        }
-
-        protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            base.BeforeRenderBody(doc, pdf);
             Aside?.AddCell(NewAsideCell("Lieferung", 2))
                 .AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr))
                 .AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}"))
@@ -86,7 +52,7 @@ namespace Elwig.Documents {
                 doc.Add(new KernedParagraph($"Anmerkung zur Lieferung: {Delivery.Comment}", 10).SetMarginsMM(5, 0, 0, 0));
             }
             if (DisplayStats > 0) {
-                doc.Add(NewBucketTable(Delivery.Season, MemberBuckets, MemberDeliveredWeightRed, MemberDeliveredWeightWhite, isTiny: true,
+                doc.Add(NewBucketTable(Delivery.Season, MemberBuckets, isTiny: true,
                         filter: DisplayStats > 2 ? null : DisplayStats == 1 ? [] : Delivery.Parts.Select(p => p.SortId).Distinct().ToList())
                     .SetKeepTogether(true)
                     .SetMarginsMM(5, 0, 0, 0));

Elwig/Documents/Document.cs

@@ -49,12 +49,14 @@ namespace Elwig.Documents {
         public bool IsPreview = false;
         private iText.Layout.Document? _doc;
 
+        public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
         public string Author;
         public DateOnly Date;
 
         public Document(string title) {
+            CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = App.Client.NameFull;
             Date = DateOnly.FromDateTime(Utils.Today);
@@ -86,15 +88,11 @@ namespace Elwig.Documents {
         }
 
         public int Render(string path) {
-            using (var writer = new PdfWriter(path)) {
+            using var writer = new PdfWriter(path);
-                Render(writer);
+            return Render(writer);
-            }
-            using var reader = new PdfReader(path);
-            using var pdf = new PdfDocument(reader);
-            return pdf.GetNumberOfPages();
         }
 
-        private void Render(PdfWriter writer) {
+        private int Render(PdfWriter writer) {
             NF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\times.ttf",    PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
             BF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesbd.ttf",  PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
             IF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesi.ttf",   PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
@@ -119,16 +117,16 @@ namespace Elwig.Documents {
             _doc = new iText.Layout.Document(pdf, iText.Kernel.Geom.PageSize.A4);
             try {
                 _doc.SetFont(NF).SetFontSize(12);
-                BeforeRenderBody(_doc, pdf);
+                RenderHeader(_doc, pdf);
                 RenderBody(_doc, pdf);
+                var pageNum = pdf.GetNumberOfPages();
+                return pageNum;
             } finally {
                 _doc.Close();
             }
         }
 
-        protected virtual async Task LoadData(AppDbContext ctx) { }
+        protected virtual void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { }
-
-        protected virtual void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
 
         protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
 
@@ -136,7 +134,7 @@ namespace Elwig.Documents {
             return new KernedParagraph(App.Client.NameFull, 10);
         }
 
-        public async Task Generate(AppDbContext ctx, CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
+        public async Task Generate(CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
             if (_pdfFile != null)
                 return;
             progress?.Report(0.0);
@@ -152,78 +150,84 @@ namespace Elwig.Documents {
                     using var mergedPdf = new PdfDocument(writer);
                     var merger = new PdfMerger(mergedPdf);
 
-                    (PdfPage Page, int InsertIndex, int DocIndex)? letterhead = null;
+                    PdfPage? letterheadPage = null;
+                    int letterheadInsertIndex = 0;
+                    int letterheadDocIndex = 0;
 
-                    int p = mergedPdf.GetNumberOfPages();
                     for (int i = 0; i < m.Documents.Count; i++) {
                         if (cancelToken?.IsCancellationRequested ?? false)
                             throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                         var doc = m.Documents[i];
-                        int p0 = p;
+                        int p0 = mergedPdf.GetNumberOfPages();
 
-                        if (letterhead != null && doc is Letterhead) {
+                        if (letterheadPage != null && doc is Letterhead) {
-                            if (p0 <= letterhead.Value.InsertIndex) {
+                            if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) {
-                                mergedPdf.AddPage(letterhead.Value.Page);
+                                mergedPdf.AddPage(letterheadPage);
                                 mergedPdf.AddNewPage();
                             } else {
-                                mergedPdf.AddPage(letterhead.Value.InsertIndex + 1, letterhead.Value.Page);
+                                mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage);
-                                mergedPdf.AddNewPage(letterhead.Value.InsertIndex + 2);
+                                mergedPdf.AddNewPage(letterheadInsertIndex + 2);
                             }
 
-                            pageNums[letterhead.Value.DocIndex] = 1;
+                            pageNums[letterheadDocIndex] = 1;
-                            letterhead = null;
+                            letterheadPage = null;
-                            p += 2;
                         }
 
                         if (doc is RawPdfDocument) {
-                            using var reader = new PdfReader(doc.PdfPath);
+                            if (IsDoublePaged && doc is Letterhead) {
-                            using var src = new PdfDocument(reader);
+                                using var reader = new PdfReader(doc.PdfPath);
-                            merger.Merge(src, 1, src.GetNumberOfPages());
+                                using var src = new PdfDocument(reader);
-                            p += src.GetNumberOfPages();
+                                letterheadPage = src.GetPage(1).CopyTo(mergedPdf);
+                                letterheadInsertIndex = p0;
+                                letterheadDocIndex = i;
+                            } else {
+                                using var reader = new PdfReader(doc.PdfPath);
+                                using var src = new PdfDocument(reader);
+                                merger.Merge(src, 1, src.GetNumberOfPages());
+                            }
                         } else {
-                            await doc.LoadData(ctx);
                             int pageNum = doc.Render(tmpPdf.FilePath);
                             if (IsDoublePaged && doc is Letterhead) {
                                 using var reader = new PdfReader(tmpPdf.FilePath);
                                 using var src = new PdfDocument(reader);
-                                letterhead = (src.GetPage(1).CopyTo(mergedPdf), p0, i);
+                                letterheadPage = src.GetPage(1).CopyTo(mergedPdf);
+                                letterheadInsertIndex = p0;
+                                letterheadDocIndex = i;
                             } else {
                                 using var reader = new PdfReader(tmpPdf.FilePath);
                                 using var src = new PdfDocument(reader);
                                 merger.Merge(src, 1, pageNum);
-                                p += pageNum;
                             }
                         }
 
-                        int p1 = p;
+                        int p1 = mergedPdf.GetNumberOfPages();
                         pageNums.Add(p1 - p0);
 
-                        if (IsDoublePaged && doc is not Letterhead && p % 2 != 0) {
+                        if (IsDoublePaged && doc is not Letterhead && mergedPdf.GetNumberOfPages() % 2 != 0) {
-                            if (letterhead != null) {
+                            if (letterheadPage != null) {
-                                mergedPdf.AddPage(letterhead.Value.Page);
+                                mergedPdf.AddPage(letterheadPage);
-                                letterhead = null;
+                                letterheadPage = null;
                             } else {
                                 mergedPdf.AddNewPage();
                             }
-                            p++;
                         }
 
                         progress?.Report(100.0 * (i + 1) / (m.Documents.Count + 1));
                     }
 
-                    if (letterhead != null) {
+                    if (letterheadPage != null) {
-                        if (p <= letterhead.Value.InsertIndex) {
+                        if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) {
-                            mergedPdf.AddPage(letterhead.Value.Page);
+                            mergedPdf.AddPage(letterheadPage.CopyTo(mergedPdf));
                             mergedPdf.AddNewPage();
                         } else {
-                            mergedPdf.AddPage(letterhead.Value.InsertIndex + 1, letterhead.Value.Page);
+                            mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage.CopyTo(mergedPdf));
-                            mergedPdf.AddNewPage(letterhead.Value.InsertIndex + 2);
+                            mergedPdf.AddNewPage(letterheadInsertIndex + 2);
                         }
-                        pageNums[letterhead.Value.DocIndex] = 1;
+
-                        p += 2;
+                        pageNums[letterheadDocIndex] = 1;
                     }
 
-                    TotalPages = p;
+                    TotalPages = pageNums.Sum();
                 } catch {
                     pdf.Dispose();
                     throw;
@@ -234,7 +238,6 @@ namespace Elwig.Documents {
                     throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                 var pdf = new TempFile("pdf");
                 try {
-                    await LoadData(ctx);
                     TotalPages = Render(pdf.FilePath);
                 } catch {
                     pdf.Dispose();
@@ -294,7 +297,7 @@ namespace Elwig.Documents {
 
         protected Cell NewTh(string? text, float fontSize = 8, int rowspan = 1, int colspan = 1, bool left = false, bool rotated = false) {
             var p = new KernedParagraph(text ?? "", fontSize);
-            if (rotated) p.SetRotationAngle(0.5 * Math.PI);
+            if (rotated) p.SetRotationAngle(rotated ? 0.5 * Math.PI : 0);
             var cell = NewCell(p, rowspan: rowspan, colspan: colspan)
                 .SetTextAlignment(left ? TextAlignment.LEFT : TextAlignment.CENTER)
                 .SetVerticalAlignment(VerticalAlignment.MIDDLE)
@@ -391,8 +394,6 @@ namespace Elwig.Documents {
             }
 
             private void OnPageEnd(PdfDocumentEvent evt) {
-                if (_doc is Letterhead) return;
-
                 var pdf = evt.GetDocument();
                 var page = evt.GetPage();
                 var pageNum = pdf.GetPageNumber(page);

Elwig/Documents/Letterhead.cs

@@ -1,21 +1,10 @@
 using Elwig.Models.Entities;
-using iText.Kernel.Pdf;
-using iText.Kernel.Pdf.Canvas;
-using iText.Layout;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {
         public Letterhead(Member m) :
-            base($"Briefkopf {m.FullName}", m, null, includeSender: true) {
+            base($"Briefkopf {m.FullName}", m, true) {
-        }
+            Aside = null;
-
-        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            // do not render anything except this
-            var page = pdf.AddNewPage();
-            var pageSize = page.GetPageSize();
-            var pdfCanvas = new PdfCanvas(page.NewContentStreamBefore(), page.GetResources(), pdf);
-            using var canvas = new Canvas(pdfCanvas, pageSize);
-            RenderAddress(canvas, pageSize);
         }
     }
 }

Elwig/Documents/MemberDataSheet.cs

@@ -1,83 +1,43 @@
 using Elwig.Helpers;
-using Elwig.Models;
 using Elwig.Models.Entities;
 using iText.Kernel.Colors;
 using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class MemberDataSheet : BusinessDocument {
 
         public new static string Name => "Stammdatenblatt";
 
-        public Season? Season;
+        public Season Season;
-        public int MemberDeliveredWeightRed;
+        public Dictionary<string, MemberBucket> MemberBuckets;
-        public int MemberDeliveredWeightWhite;
+        public List<AreaCom> ActiveAreaCommitments;
-        public List<MemberHistory> MemberHistory = [];
-        public Dictionary<string, MemberBucket> MemberBuckets = [];
-        public List<AreaCom> ActiveAreaCommitments = [];
 
-        public MemberDataSheet(Member m) :
+        public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
-            base($"{Name} {m.AdministrativeName}", m, DateOnly.FromDateTime(m.ModifiedAt)) {
-            ShowDateAndLocation = true;
             DocumentId = $"{Name} {m.MgNr}";
-        }
+            Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
-
+            MemberBuckets = ctx.GetMemberBuckets(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult();
-        public static async Task<MemberDataSheet> Initialize(int mgnr) {
+            ActiveAreaCommitments = [.. m.ActiveAreaCommitments(ctx)];
-            using var ctx = new AppDbContext();
-            return new MemberDataSheet(await ctx.FetchMembers(mgnr, includeContactInfo: true).SingleAsync());
-        }
-
-        protected override async Task LoadData(AppDbContext ctx) {
-            await base.LoadData(ctx);
-            Season = await ctx.FetchSeasons().FirstOrDefaultAsync() ?? throw new ArgumentException("Invalid season");
-            MemberHistory = await ctx.MemberHistory
-                .Where(h => h.FromMgNr == Member.MgNr || h.ToMgNr == Member.MgNr)
-                .OrderBy(h => h.DateNoticeString).ThenBy(h => h.HistNr)
-                .ToListAsync();
-            MemberBuckets = await ctx.GetMemberBuckets(Utils.CurrentYear, Member.MgNr);
-            ActiveAreaCommitments = await Member.ActiveAreaCommitments(ctx)
-                .Include(c => c.Contract).ThenInclude(c => c.Revisions)
-                .ToListAsync();
-            var weights = await ctx.Deliveries
-                .Where(d => d.Year == Season.Year && d.MgNr == Member.MgNr)
-                .SelectMany(d => d.Parts)
-                .GroupBy(p => p.Variety.Type)
-                .ToDictionaryAsync(g => g.Key, g => g.Sum(p => p.Weight));
-            MemberDeliveredWeightRed = weights.GetValueOrDefault("R", 0);
-            MemberDeliveredWeightWhite = weights.GetValueOrDefault("W", 0);
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            if (Season == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
-            doc.Add(NewMemberData(Season).SetMarginBottomMM(5));
+            doc.Add(NewMemberData().SetMarginBottomMM(5));
-            doc.Add(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeightRed, MemberDeliveredWeightWhite, includeDelivery: false));
+            doc.Add(NewBucketTable(Season, MemberBuckets, includeDelivery: false));
             if (ActiveAreaCommitments.Count != 0) {
                 bool firstOnPage = false;
                 if (pdf.GetNumberOfPages() == 1) {
                     doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
                     firstOnPage = true;
                 }
-                doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 6, 0));
+                doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 12, 0));
-                doc.Add(NewAreaComTable(ActiveAreaCommitments));
+                doc.Add(NewAreaComTable());
-            }
-            if (App.Client.EnableMemberHistory) {
-                bool firstOnPage = false;
-                if (pdf.GetNumberOfPages() == 1) {
-                    doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
-                    firstOnPage = true;
-                }
-                doc.Add(new KernedParagraph(12).Add(Bold($"Verlauf der Geschäftsanteile per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 6, 0));
-                doc.Add(NewMemberBusinessSharesTable(MemberHistory));
             }
         }
 
@@ -91,7 +51,7 @@ namespace Elwig.Documents {
                 .SetPaddingRightMM(0);
         }
 
-        protected Table NewMemberData(Season season) {
+        protected Table NewMemberData() {
             var tbl = new Table(ColsMM(30.0, 51.5, 20.0, 12.0, 18.0, 31.5))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
@@ -151,21 +111,18 @@ namespace Elwig.Documents {
                     .AddCell(NewTd(i < subTbl2.Count ? subTbl2[i][1] : "", colspan: 2));
             }
 
-            var shares = (Member.Shares != 0 || (Member.SharesRed == 0 && Member.SharesWhite == 0) ? $"{Member.Shares:N0}" : "") +
-                (Member.SharesRed != 0 || Member.SharesWhite != 0 ? (Member.Shares != 0 ? " / " : "") + $"{Member.SharesRed:N0} (rot) / {Member.SharesWhite:N0} (weiß)" : "") +
-                (Member.SharesDormant != 0 ? $" / {Member.SharesDormant:N0} (ruhend)" : "");
             tbl.AddCell(NewDataHdr("Betrieb", colspan: 6))
                 .AddCell(NewDataTh("Betriebs-Nr.:")).AddCell(NewTd(Member.LfbisNr))
                 .AddCell(NewDataTh("UID:", colspan: 2)).AddCell(NewTd(Member.UstIdNr, colspan: 2))
                 .AddCell(NewDataTh("Stammgemeinde:")).AddCell(NewTd(Member.DefaultKg?.Name))
                 .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
-                    .Add(Normal($"({(Member.IsBuchführend ? season.VatNormal : season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
+                    .Add(Normal($"({(Member.IsBuchführend ? Season.VatNormal : Season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
                 .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
                 .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(Member.IsOrganic ? "Ja" : "Nein", colspan: 2))
                 .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
                 .AddCell(NewDataTh("Status:")).AddCell(NewTd(new KernedParagraph(Member.IsActive ? "Aktiv " : "Nicht aktiv ", 10)
                     .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))
-                .AddCell(NewDataTh("Geschäftsanteile:", colspan: 2)).AddCell(NewTd(shares, colspan: 2))
+                .AddCell(NewDataTh("Geschäftsanteile:", colspan: 2)).AddCell(NewTd($"{Member.BusinessShares:N0}", colspan: 2))
                 .AddCell(NewDataTh("Stamm-Zweigstelle:")).AddCell(NewTd(Member.Branch?.Name))
                 .AddCell(NewDataTh("Volllieferant:", colspan: 2)).AddCell(NewTd(Member.IsVollLieferant ? "Ja" : "Nein", colspan: 2))
                 .AddCell(NewDataTh("Zusendungen per\u2026")).AddCell(NewTd(new KernedParagraph(10)
@@ -176,18 +133,18 @@ namespace Elwig.Documents {
             return tbl;
         }
 
-        protected Table NewAreaComTable(IEnumerable<AreaCom> activeAreaComs) {
+        protected Table NewAreaComTable() {
-            var areaComs = activeAreaComs.GroupBy(a => a.AreaComType).Select(group => new {
+            var areaComs = ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
                 Type = group.Key,
-                AreaComs = group.OrderBy(c => c.Contract.Kg.AtKg.Name).ToList(),
+                AreaComs = group.OrderBy(c => c.Kg.AtKg.Name).ToList(),
                 Size = group.Sum(c => c.Area)
             }).OrderByDescending(a => a.Size).ToList();
 
             var tbl = new Table(ColsMM(40, 30, 35, 15, 25, 20), true)
-                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+              .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+              .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
-                .SetBorder(Border.NO_BORDER)
+              .SetBorder(Border.NO_BORDER)
-                .SetFontSize(10);
+              .SetFontSize(10);
 
             tbl.AddHeaderCell(NewTh("Katastralgemeinde", rowspan: 2, left: true))
                 .AddHeaderCell(NewTh("Ried", rowspan: 2, left: true))
@@ -207,159 +164,21 @@ namespace Elwig.Documents {
                         .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER));
 
                 foreach (var areaCom in contractType.AreaComs) {
-                    var c = areaCom.Contract;
+                    tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{areaCom.Kg.AtKg.Name} ")).Add(Normal($"({areaCom.Kg.AtKg.KgNr:00000})", 8))))
-                    tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{c.Kg.AtKg.Name} ")).Add(Normal($"({c.Kg.AtKg.KgNr:00000})", 8))))
+                        .AddCell(NewTd(areaCom.Rd?.Name))
-                        .AddCell(NewTd(c.Rd?.Name))
                         .AddCell(NewTd(Regex.Replace(areaCom.GstNr.Replace(",", ", ").Replace("-", "\u2013"), @"\s+", " "), 10))
                         .AddCell(NewTd($"{areaCom.Area:N0}", right: true))
                         .AddCell(NewTd(areaCom.WineCult?.Name, center: true))
-                        .AddCell(NewTd(c.YearTo == null ? (c.YearFrom == null ? "unbefristet" : $"ab {c.YearFrom}") : (c.YearFrom == null ? $"bis {c.YearTo}" : $"{c.YearFrom}–{c.YearTo}"), center: true));
+                        .AddCell(NewTd(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"), center: true));
                     lastContract = contractType.Type.DisplayName;
                 }
             }
 
             tbl.AddCell(NewTd("Gesamt:", 12, colspan: 2, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
-            tbl.AddCell(NewTd($"{activeAreaComs.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            tbl.AddCell(NewTd($"{ActiveAreaCommitments.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
             tbl.AddCell(NewTd(colspan: 2, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
 
             return tbl;
         }
-
-        protected Cell[] NewBusinessSharesCells(MemberHistoryPoint p, bool isDiff = true) {
-            if (App.Client.HasRedWhite) {
-                return [
-                    NewTd(isDiff ? (p.SharesRed == 0 ? "" : p.SharesRed < 0 ? $"–{-p.SharesRed:N0}" : $"+{p.SharesRed:N0}") : $"{p.SharesRed:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesWhite == 0 ? "" : p.SharesWhite < 0 ? $"–{-p.SharesWhite:N0}" : $"+{p.SharesWhite:N0}") : $"{p.SharesWhite:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesDormant == 0 ? "" : p.SharesDormant < 0 ? $"–{-p.SharesDormant:N0}" : $"+{p.SharesDormant:N0}") : $"{p.SharesDormant:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                ];
-            } else {
-                return [
-                    NewTd(isDiff ? (p.Shares == 0 ? "" : p.Shares < 0 ? $"–{-p.Shares:N0}" : $"+{p.Shares:N0}") : $"{p.Shares:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesDormant == 0 ? "" : p.SharesDormant < 0 ? $"–{-p.SharesDormant:N0}" : $"+{p.SharesDormant:N0}") : $"{p.SharesDormant:N0}",
-                        right : true, bold: !isDiff, borderTop: !isDiff),
-                ];
-            }
-        }
-
-        protected Table NewMemberBusinessSharesTable(IEnumerable<MemberHistory> history) {
-            var tbl = new Table(ColsMM(18, 93, App.Client.HasRedWhite ? 18 : 12, App.Client.HasRedWhite ? 12 : 18, 12, 12), true)
-                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
-                .SetBorder(Border.NO_BORDER)
-                .SetFontSize(10);
-
-            var tw = App.Client.HasRedWhite ? 1 : 2;
-            tbl.AddHeaderCell(NewTh("Meldung am", rowspan: 2))
-                .AddHeaderCell(NewTh("Text", rowspan: 2, colspan: tw, left: true))
-                .AddHeaderCell(NewTh("Wirksam ab", rowspan: 2))
-                .AddHeaderCell(NewTh("Geschäftsanteile", colspan: App.Client.HasRedWhite ? 3 : 2));
-            if (App.Client.HasRedWhite) {
-                tbl.AddHeaderCell(NewTh("rot"))
-                    .AddHeaderCell(NewTh("weiß"))
-                    .AddHeaderCell(NewTh("ruhend"));
-            } else {
-                tbl.AddHeaderCell(NewTh("normal"))
-                  .AddHeaderCell(NewTh("ruhend"));
-            }
-
-            if (!history.Any() || Member.EntryDate <= history.First().DateNotice) {
-                tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            var recorded = history.Aggregate(new MemberHistoryPoint(), (s, h) => new(
-                s.Shares + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Normal ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Normal ? h.Shares : 0),
-                s.SharesRed + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Red ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Red ? h.Shares : 0),
-                s.SharesWhite + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.White ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.White ? h.Shares : 0),
-                s.SharesDormant + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Dormant ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Dormant ? h.Shares : 0)));
-            var cur = new MemberHistoryPoint(Member.Shares - recorded.Shares, Member.SharesRed - recorded.SharesRed, Member.SharesWhite - recorded.SharesWhite, Member.SharesDormant - recorded.SharesDormant);
-
-            if (cur.Shares != 0 || cur.SharesRed != 0 || cur.SharesWhite != 0 || cur.SharesDormant != 0) {
-                tbl.AddCell(NewTd())
-                    .AddCell(NewTd("Nicht in Software erfasst", colspan: tw, italic: true))
-                    .AddCell(NewTd())
-                    .AddCells(NewBusinessSharesCells(cur));
-                if (history.Any()) {
-                    tbl.AddCell(NewTd(borderTop: true))
-                        .AddCell(NewTd($"Bis Lese {history.First().DateNotice.Year - 1}", borderTop: true, colspan: tw, bold: true))
-                        .AddCell(NewTd(borderTop: true))
-                        .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-                }
-            }
-
-            DateOnly? lastDate = null;
-            foreach (var row in history) {
-                int s = 0, r = 0, w = 0, d = 0;
-                if (row.FromMgNr == Member.MgNr) {
-                    switch (row.FromType) {
-                        case BusinessShareType.Normal: s -= row.Shares; break;
-                        case BusinessShareType.Red: r -= row.Shares; break;
-                        case BusinessShareType.White: w -= row.Shares; break;
-                        case BusinessShareType.Dormant: d -= row.Shares; break;
-                    }
-                }
-                if (row.ToMgNr == Member.MgNr) {
-                    switch (row.ToType) {
-                        case BusinessShareType.Normal: s += row.Shares; break;
-                        case BusinessShareType.Red: r += row.Shares; break;
-                        case BusinessShareType.White: w += row.Shares; break;
-                        case BusinessShareType.Dormant: d += row.Shares; break;
-                    }
-                }
-
-                if (lastDate < Member.EntryDate && row.DateNotice <= Member.EntryDate) {
-                    tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                        .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                        .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                        .AddCells(NewBusinessSharesCells(new()));
-                }
-                if (lastDate != null && row.DateNotice.Year != lastDate?.Year) {
-                    tbl.AddCell(NewTd(borderTop: true))
-                        .AddCell(NewTd(lastDate?.Year == row.DateNotice.Year - 1 ? $"Lese {lastDate?.Year}" : $"Lese {lastDate?.Year}–{row.DateNotice.Year - 1}", borderTop: true, colspan: tw, bold: true))
-                        .AddCell(NewTd(borderTop: true))
-                        .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-                }
-                if (lastDate < Member.ExitDate && row.DateNotice <= Member.ExitDate) {
-                    tbl.AddCell(NewTd($"{Member.ExitDate:dd.MM.yyyy}"))
-                        .AddCell(NewTd("Austritt", colspan: tw, bold: true))
-                        .AddCell(NewTd($"31.12.{Member.ExitDate.Value.Year + 1}"))  // FIXME
-                        .AddCells(NewBusinessSharesCells(new()));
-                }
-                cur = new(cur.Shares + s, cur.SharesRed + r, cur.SharesWhite + w, cur.SharesDormant + d);
-
-                tbl.AddCell(NewTd($"{row.DateNotice:dd.MM.yyyy}"))
-                    .AddCell(NewTd(row.FormatReasonPhrase(Member.MgNr), colspan: tw))
-                    .AddCell(NewTd($"{row.DateEffective:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new(s, r, w, d)));
-                lastDate = row.DateNotice;
-            }
-
-            if (Member.EntryDate != null && history.Any() && Member.EntryDate > lastDate) {
-                tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            if (Member.ExitDate != null && (!history.Any() || Member.ExitDate > lastDate)) {
-                tbl.AddCell(NewTd($"{Member.ExitDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Austritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"31.12.{Member.ExitDate.Value.Year + 1}"))  // FIXME
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            tbl.AddCell(NewTd(borderTop: true))
-                .AddCell(NewTd(lastDate == null ? "Aktuell" : $"Ab Lese {lastDate?.Year}", borderTop: true, colspan: tw, bold: true))
-                .AddCell(NewTd(borderTop: true))
-                .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-
-            return tbl;
-        }
     }
 }

Elwig/Documents/MemberList.cs

@@ -86,7 +86,7 @@ namespace Elwig.Documents {
                     .AddCell(NewTd($"{m.Plz}", 8))
                     .AddCell(NewTd(m.Locality, 6))
                     .AddCell(NewTd(m.LfbisNr ?? "", 8))
-                    .AddCell(NewTd($"{m.SharesActive:N0}", 8, right: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd($"{m.BusinessShares:N0}", 8, right: true).SetPaddingLeft(0).SetPaddingRight(0))
                     .AddCell(NewTd(m.DefaultKg ?? "", 6));
                 if (AreaComFilters.Length > 0) {
                     foreach (var v in AreaComFilters) {

Elwig/Documents/PaymentVariantSummary.cs

@@ -7,60 +7,40 @@ using iText.Kernel.Pdf;
 using iText.Layout.Borders;
 using iText.Layout.Element;
 using iText.Layout.Properties;
-using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace Elwig.Documents {
     public class PaymentVariantSummary : Document {
 
         public new static string Name => "Auszahlungsvariante";
 
-        public PaymentVariantSummaryData? Data;
+        public PaymentVariantSummaryData Data;
         public PaymentVar Variant;
         public BillingData BillingData;
         public string CurrencySymbol;
         public int MemberNum;
         public int DeliveryNum;
         public int DeliveryPartNum;
-        public List<ModifierStat>? ModifierStat;
+        public List<ModifierStat> ModifierStat;
-        public Dictionary<string, Modifier>? Modifiers;
+        public Dictionary<string, Modifier> Modifiers;
 
-        private List<Credit> _credits = [];
+        public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) :
-        private List<PaymentDeliveryPart> _parts = [];
-
-        public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData? data = null) :
             base($"{Name} {v.Year} - {v.Name}") {
             Variant = v;
             BillingData = BillingData.FromJson(v.Data);
             Data = data;
             CurrencySymbol = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
-        }
+            MemberNum = v.Credits.Count;
-
-        public static async Task<PaymentVariantSummary> Initialize(int year, int avnr, PaymentVariantSummaryData? data = null) {
-            using var ctx = new AppDbContext();
-            var v = await ctx.PaymentVariants
-                .Where(v => v.Year == year && v.AvNr == avnr)
-                .SingleAsync();
-            return new PaymentVariantSummary(v, data);
-        }
-
-        protected override async Task LoadData(AppDbContext ctx) {
-            _credits = await ctx.Credits.Where(c => c.Year == Variant.Year && c.AvNr == Variant.AvNr).ToListAsync();
-            _parts = await ctx.PaymentDeliveryParts.Where(p => p.Year == Variant.Year && p.AvNr == Variant.AvNr).ToListAsync();
-            MemberNum = _credits.Count;
             IsPreview = MemberNum == 0;
-            DeliveryNum = await ctx.Deliveries.Where(d => d.Year == Variant.Year).CountAsync();
+            DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count();
-            DeliveryPartNum = await ctx.DeliveryParts.Where(d => d.Year == Variant.Year).CountAsync();
+            DeliveryPartNum = v.DeliveryPartPayments.Count;
-            Data ??= await PaymentVariantSummaryData.ForPaymentVariant(Variant, ctx.PaymentVariantSummaryRows);
+            ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
-            ModifierStat = await AppDbContext.GetModifierStats(Variant.Year, Variant.AvNr);
+            Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
-            Modifiers = await ctx.FetchModifiers(Variant.Year).ToDictionaryAsync(m => m.ModId);
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
-            if (Data == null || Modifiers == null || ModifierStat == null) throw new Exception("Call LoadData before RenderBody");
             base.RenderBody(doc, pdf);
             doc.Add(new KernedParagraph($"{Name} Lese {Variant.Year}", 24)
                 .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
@@ -68,10 +48,10 @@ namespace Elwig.Documents {
             doc.Add(new KernedParagraph(Variant.Name, 14)
                 .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
                 .SetMarginsMM(0, 0, 10, 0));
-            doc.Add(NewVariantStatTable(Data).SetMarginBottomMM(10));
+            doc.Add(NewVariantStatTable().SetMarginBottomMM(10));
-            doc.Add(NewModifierStatTable(Modifiers, ModifierStat));
+            doc.Add(NewModifierStatTable());
             doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
-            doc.Add(NewPriceTable(Data));
+            doc.Add(NewPriceTable());
         }
 
         protected Cell NewSectionHdr(string text, int colspan = 1, bool borderLeft = false) {
@@ -87,33 +67,33 @@ namespace Elwig.Documents {
                 .SetBorderLeft(borderLeft ? new SolidBorder(BorderThickness) : Border.NO_BORDER);
         }
 
-        protected Table NewVariantStatTable(PaymentVariantSummaryData data) {
+        protected Table NewVariantStatTable() {
             var tbl = new Table(ColsMM(20, 30, 4.5, 4.5, 23.5, 47.5, 15, 20))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
                 .SetBorder(new SolidBorder(BorderThickness));
 
-            //var sum1 = _parts.Sum(p => p.NetAmount);
+            //var sum1 = Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
-            //var sum2 = _credits.Sum(p => p.);  //Variant.MemberPayments.Sum(p => p.Amount);
+            //var sum2 = Variant.Credits.Sum(p => p.);  //Variant.MemberPayments.Sum(p => p.Amount);
-            var deliveryModifiers = _parts.Sum(p => p.Amount - p.NetAmount);
+            var deliveryModifiers = Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
-            var memberModifiers = _credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
+            var memberModifiers = Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
-            var sum2 = _credits.Sum(p => p.NetAmount);
+            var sum2 = Variant.Credits.Sum(p => p.NetAmount);
             var sum1 = sum2 - deliveryModifiers - memberModifiers;
-            var payed = -_credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var payed = -Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var netSum = _credits.Sum(p => p.NetAmount) - _credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var netSum = Variant.Credits.Sum(p => p.NetAmount) - Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var vat = _credits.Sum(p => p.VatAmount);
+            var vat = Variant.Credits.Sum(p => p.VatAmount);
-            var grossSum = _credits.Sum(p => p.GrossAmount);
+            var grossSum = Variant.Credits.Sum(p => p.GrossAmount);
-            var totalMods = _credits.Sum(p => p.Modifiers ?? 0m);
+            var totalMods = Variant.Credits.Sum(p => p.Modifiers ?? 0m);
-            var considered = -_credits.Sum(p => p.PrevModifiers ?? 0m);
+            var considered = -Variant.Credits.Sum(p => p.PrevModifiers ?? 0m);
-            var totalSum = _credits.Sum(p => p.Amount);
+            var totalSum = Variant.Credits.Sum(p => p.Amount);
 
-            var weiRows = data.Rows.Where(r => r.QualityLevel == "Wein");
+            var weiRows = Data.Rows.Where(r => r.QualityLevel == "Wein");
             var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
             var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
-            var quwRows = data.Rows.Where(r => r.QualityLevel != "Wein");
+            var quwRows = Data.Rows.Where(r => r.QualityLevel != "Wein");
             var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
             var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
-            var gebRows = data.Rows
+            var gebRows = Data.Rows
                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
             var minGeb = gebRows.Min();
@@ -139,7 +119,7 @@ namespace Elwig.Documents {
 
                 .AddCell(NewSectionTh("Datum/Überw.:", overflow: true))
                 .AddCell(NewTd($"{Variant.Date:dd.MM.yyyy} / {Variant.TransferDate:dd.MM.yyyy}", colspan: 4, center: true))
-                .AddCell(NewSectionTh("(Automatische) Nachzeichnung von GA:", colspan: 2, borderLeft: true))
+                .AddCell(NewSectionTh("Automatische Nachzeichnung der GA:", colspan: 2, borderLeft: true))
                 .AddCell(NewTd(BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein", center: true))
 
                 .AddCell(NewSectionTh("Berechnung:"))
@@ -183,21 +163,21 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(payed):N2}", right: true))
                 .AddCell(NewSectionTh("Preis (abgewertet):", borderTop: true, borderLeft: true))
-                .AddCell(NewTd(minWei == null && maxWei == null ? "-" : (minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
+                .AddCell(NewTd((minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
 
                 .AddCell(NewSectionTh("Nettosumme:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
                 .AddCell(NewTd(CurrencySymbol, borderTop: true))
                 .AddCell(NewTd($"{netSum:N2}", right: true, borderTop: true))
                 .AddCell(NewSectionTh("Preis (ungeb., nicht abgew.):", borderLeft: true))
-                .AddCell(NewTd(minPrice == null && maxPrice == null ? "-" : (minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd((minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
 
                 .AddCell(NewSectionTh("Mehrwertsteuer:", colspan: 2))
                 .AddCell(NewTd(Utils.GetSign(vat), right: true))
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(vat):N2}", right: true))
                 .AddCell(NewSectionTh("Gebunden-Zuschlag:", borderLeft: true))
-                .AddCell(NewTd(minGeb == null && maxGeb == null ? "-" : minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
+                .AddCell(NewTd(minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
 
                 .AddCell(NewSectionTh("Bruttosumme:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
@@ -211,26 +191,26 @@ namespace Elwig.Documents {
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(totalMods):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (ungebunden):", borderLeft: true, borderTop: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
 
                 .AddCell(NewSectionTh("Bereits berücksichtigte Abzüge:", colspan: 2))
                 .AddCell(NewTd(Utils.GetSign(considered)))
                 .AddCell(NewTd(CurrencySymbol))
                 .AddCell(NewTd($"{Math.Abs(considered):N2}", right: true))
                 .AddCell(NewSectionTh("Menge (gebunden):", borderLeft: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
 
                 .AddCell(NewSectionTh("Auszahlungsbetrag:", colspan: 2))
                 .AddCell(NewTd(borderTop: true))
                 .AddCell(NewTd(CurrencySymbol, borderTop: true))
                 .AddCell(NewTd($"{totalSum:N2}", right: true, borderTop: true))
                 .AddCell(NewSectionTh("Gesamtmenge:", borderLeft: true))
-                .AddCell(NewTd($"{data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
 
             return tbl;
         }
 
-        protected Table NewModifierStatTable(Dictionary<string, Modifier> modifiers, IEnumerable<ModifierStat> modStat) {
+        protected Table NewModifierStatTable() {
             var tbl = new Table(ColsMM(35, 30, 25, 25, 25, 25))
                 .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                 .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
@@ -248,8 +228,8 @@ namespace Elwig.Documents {
                 .AddCell(NewTh($"[{CurrencySymbol}]"))
                 .AddCell(NewTh($"[{CurrencySymbol}]"));
 
-            foreach (var m in modStat) {
+            foreach (var m in ModifierStat) {
-                var mod = modifiers[m.ModId];
+                var mod = Modifiers[m.ModId];
                 tbl.AddCell(NewTd(mod.Name, italic: true))
                     .AddCell(NewTd(mod.ValueStr, right: true))
                     .AddCell(NewTd($"{m.Count:N0}", right: true))
@@ -261,7 +241,7 @@ namespace Elwig.Documents {
             return tbl;
         }
 
-        protected Table NewPriceTable(PaymentVariantSummaryData data) {
+        protected Table NewPriceTable() {
             var tbl = new Table(ColsMM(25, 19, 18, 15, 18, 15, 18, 15, 22))
                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
@@ -282,10 +262,10 @@ namespace Elwig.Documents {
                 .AddHeaderCell(NewTh($"[{CurrencySymbol}]"));
 
             string? lastHdr = null;
-            foreach (var row in data.Rows) {
+            foreach (var row in Data.Rows) {
                 var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
                 if (lastHdr != hdr) {
-                    var rows = data.Rows
+                    var rows = Data.Rows
                         .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation)
                         .ToList();
                     var border = lastHdr != null;

Elwig/Elwig.csproj

@@ -9,7 +9,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.1.0.0</Version>
+    <Version>1.0.3.4</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -23,21 +23,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="152.0.7934" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="147.0.7690" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="itext" Version="9.7.0" />
+    <PackageReference Include="itext" Version="9.5.0" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
+    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
     <PackageReference Include="LinqKit" Version="1.3.11" />
-    <PackageReference Include="MailKit" Version="4.17.0" />
+    <PackageReference Include="MailKit" Version="4.15.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4078.44" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.3" />
-    <PackageReference Include="NJsonSchema" Version="11.6.1" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3800.47" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
+    <PackageReference Include="NJsonSchema" Version="11.5.2" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.9" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.9" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.3" />
-    <PackageReference Include="System.Management" Version="10.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.3" />
+    <PackageReference Include="System.Management" Version="10.0.3" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -1,20 +1,19 @@
-using Elwig.Models.Dtos;
-using Elwig.Models.Entities;
-using Elwig.Services;
-using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
+using Elwig.Models.Entities;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.IO;
+using System;
+using System.Windows;
+using Microsoft.Extensions.Logging;
+using Microsoft.Data.Sqlite;
+using System.Text.RegularExpressions;
+using System.Collections.Generic;
+using Elwig.Models.Dtos;
+using System.Data;
 
 namespace Elwig.Helpers {
 
-    public record struct MemberHistoryPoint(int Shares, int SharesRed, int SharesWhite, int SharesDormant);
     public record struct AreaComBucket(int Area, int Obligation, int Right);
     public record struct UnderDelivery(int Weight, int Diff);
     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int DeliveryTotal, int Payment);
@@ -49,7 +48,6 @@ namespace Elwig.Helpers {
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
         public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
         public DbSet<MemberHistory> MemberHistory { get; private set; }
-        public DbSet<AreaComContract> AreaCommitmentContracts { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
@@ -83,71 +81,6 @@ namespace Elwig.Helpers {
         public static string? ConnectionStringOverride { get; set; } = null;
         public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False";
 
-        private static readonly Func<AppDbContext, string?, bool, IAsyncEnumerable<Branch>> _compiledQueryBranches =
-            EF.CompileAsyncQuery<AppDbContext, string?, bool, Branch>((ctx, zwstid, includeWithoutMembers) => ctx.Branches
-                .Where(b => includeWithoutMembers || b.Members.Count > 0)
-                .Where(b => zwstid == null || b.ZwstId == zwstid)
-                .Include(b => b.PostalDest)
-                .OrderBy(b => b.Name));
-
-        private static readonly Func<AppDbContext, string?, IAsyncEnumerable<WineVar>> _compiledQueryWineVarieties =
-            EF.CompileAsyncQuery<AppDbContext, string?, WineVar>((ctx, sortid) => ctx.WineVarieties
-                .Where(v => sortid == null || v.SortId == sortid)
-                .OrderBy(v => v.Name));
-
-        private static readonly Func<AppDbContext, string?, bool, IAsyncEnumerable<WineAttr>> _compiledQueryWineAttributes =
-            EF.CompileAsyncQuery<AppDbContext, string?, bool, WineAttr>((ctx, attrid, includeNotActive) => ctx.WineAttributes
-                .Where(a => includeNotActive || a.IsActive)
-                .Where(a => attrid == null || a.AttrId == attrid)
-                .OrderBy(a => a.Name));
-
-        private static readonly Func<AppDbContext, string?, IAsyncEnumerable<WineCult>> _compiledQueryWineCultivations =
-            EF.CompileAsyncQuery<AppDbContext, string?, WineCult>((ctx, cultid) => ctx.WineCultivations
-                .Where(c => cultid == null || c.CultId == cultid)
-                .OrderBy(v => v.Name));
-
-        private static readonly Func<AppDbContext, bool, IAsyncEnumerable<WineQualLevel>> _compiledQueryWineQualityLevels =
-            EF.CompileAsyncQuery<AppDbContext, bool, WineQualLevel>((ctx, includePredicate) => ctx.WineQualityLevels
-                .Where(l => includePredicate || !l.IsPredicate)
-                .OrderBy(l => l.MinKmw));
-
-        private static readonly Func<AppDbContext, int?, bool, IAsyncEnumerable<Modifier>> _compiledQueryModifiers =
-            EF.CompileAsyncQuery<AppDbContext, int?, bool, Modifier>((ctx, year, incudeNotActive) => ctx.Modifiers
-                .Where(m => (year == null || m.Year == year) && (incudeNotActive || m.IsActive))
-                .OrderBy(m => m.Year).ThenBy(m => m.Ordering).ThenBy(m => m.Name));
-
-        private static readonly Func<AppDbContext, int?, bool, IAsyncEnumerable<Member>> _compiledQueryMembers =
-            EF.CompileAsyncQuery<AppDbContext, int?, bool, Member>((ctx, mgnr, includeNotActive) => ctx.Members
-                .Where(m => includeNotActive || m.IsActive)
-                .Where(m => mgnr == null || m.MgNr == mgnr)
-                .OrderBy(m => m.Name).ThenBy(m => m.GivenName).ThenBy(m => m.MgNr));
-
-        private static readonly Func<AppDbContext, int?, bool, IAsyncEnumerable<Member>> _compiledQueryMembersContactInfo =
-            EF.CompileAsyncQuery<AppDbContext, int?, bool, Member>((ctx, mgnr, includeNotActive) => ctx.Members
-                .Where(m => includeNotActive || m.IsActive)
-                .Where(m => mgnr == null || m.MgNr == mgnr)
-                .Include(m => m.EmailAddresses)
-                .Include(m => m.TelephoneNumbers)
-                .OrderBy(m => m.Name).ThenBy(m => m.GivenName).ThenBy(m => m.MgNr)
-                .AsSplitQuery());
-
-        private static readonly Func<AppDbContext, int?, IAsyncEnumerable<AreaCom>> _compiledQueryAreaCommitments =
-            EF.CompileAsyncQuery<AppDbContext, int?, AreaCom>((ctx, fbnr) => ctx.AreaCommitments
-                .Where(c => fbnr == null || c.FbNr == fbnr)
-                .OrderBy(c => c.FbNr).ThenBy(c => c.RevNr));
-
-        private static readonly Func<AppDbContext, int?, IAsyncEnumerable<Season>> _compiledQuerySeasons =
-            EF.CompileAsyncQuery<AppDbContext, int?, Season>((ctx, year) => ctx.Seasons
-                .Where(s => year == null || s.Year == year)
-                .OrderByDescending(s => s.Year));
-
-        private static readonly Func<AppDbContext, int?, IAsyncEnumerable<Season>> _compiledQuerySeasonsModifiers =
-            EF.CompileAsyncQuery<AppDbContext, int?, Season>((ctx, year) => ctx.Seasons
-                .Where(s => year == null || s.Year == year)
-                .Include(s => s.Modifiers)
-                .OrderByDescending(s => s.Year));
-
-        private readonly Dictionary<int, Dictionary<int, MemberHistoryPoint>> _memberHistory = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBucketsStrict = [];
@@ -161,8 +94,8 @@ namespace Elwig.Helpers {
                     LogFile = new(file) {
                         AutoFlush = true
                     };
-                } catch (Exception exc) {
+                } catch (Exception e) {
-                    InteractionService.ShowException("Database Log", $"Unable to open database log file", exc);
+                    MessageBox.Show($"Unable to open database log file:\n\n{e.Message}", "Database Log", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             SavedLastWriteTime = LastWriteTime;
@@ -185,59 +118,11 @@ namespace Elwig.Helpers {
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
+            optionsBuilder.UseLazyLoadingProxies();
             optionsBuilder.LogTo(Log, LogLevel.Information);
             base.OnConfiguring(optionsBuilder);
         }
 
-        protected override void OnModelCreating(ModelBuilder modelBuilder) {
-            modelBuilder.Entity<WbKg>().Navigation(k => k.AtKg).AutoInclude();
-            modelBuilder.Entity<WbKg>().Navigation(k => k.Gl).AutoInclude();
-            modelBuilder.Entity<AT_Kg>().Navigation(k => k.Gem).AutoInclude();
-            modelBuilder.Entity<PostalDest>().Navigation(p => p.Country).AutoInclude();
-            modelBuilder.Entity<PostalDest>().Navigation(p => p.AtPlz).AutoInclude();
-            modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.AtPlz).AutoInclude();
-            modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.Ort).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.Branch).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.DefaultWbKg).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.Country).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.PostalDest).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.BillingAddress).AutoInclude();
-            modelBuilder.Entity<BillingAddr>().Navigation(a => a.Country).AutoInclude();
-            modelBuilder.Entity<BillingAddr>().Navigation(a => a.PostalDest).AutoInclude();
-            modelBuilder.Entity<Modifier>().Navigation(m => m.Season).AutoInclude();
-            modelBuilder.Entity<Season>().Navigation(s => s.Currency).AutoInclude();
-            modelBuilder.Entity<PaymentVar>().Navigation(v => v.Season).AutoInclude();
-            modelBuilder.Entity<PaymentDeliveryPart>().Navigation(p => p.Variant).AutoInclude();
-            modelBuilder.Entity<Credit>().Navigation(c => c.Payment).AutoInclude();
-            modelBuilder.Entity<Delivery>().Navigation(d => d.Member).AutoInclude();
-            modelBuilder.Entity<Delivery>().Navigation(d => d.Season).AutoInclude();
-            modelBuilder.Entity<Delivery>().Navigation(d => d.Branch).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Quality).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Variety).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Attribute).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Cultivation).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Kg).AutoInclude();
-            modelBuilder.Entity<DeliveryPart>().Navigation(p => p.Rd).AutoInclude();
-            modelBuilder.Entity<DeliveryPartModifier>().Navigation(m => m.Modifier).AutoInclude();
-            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Kg).AutoInclude();
-            modelBuilder.Entity<AreaComContract>().Navigation(c => c.Rd).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.Contract).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.WineCult).AutoInclude();
-            modelBuilder.Entity<AreaCom>().Navigation(c => c.AreaComType).AutoInclude();
-            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineVar).AutoInclude();
-            modelBuilder.Entity<AreaComType>().Navigation(c => c.WineAttr).AutoInclude();
-            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Credit).AutoInclude();
-            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Member).AutoInclude();
-            modelBuilder.Entity<PaymentMember>().Navigation(c => c.Variant).AutoInclude();
-            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Member).AutoInclude();
-            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Schedule).AutoInclude();
-            modelBuilder.Entity<DeliveryAncmt>().Navigation(a => a.Variety).AutoInclude();
-            modelBuilder.Entity<DeliverySchedule>().Navigation(s => s.Branch).AutoInclude();
-            modelBuilder.Entity<MemberHistory>().Navigation(s => s.FromMember).AutoInclude();
-            modelBuilder.Entity<MemberHistory>().Navigation(s => s.ToMember).AutoInclude();
-            modelBuilder.Entity<MemberHistory>().Navigation(s => s.Currency).AutoInclude();
-        }
-
         public override void Dispose() {
             base.Dispose();
             LogFile?.Dispose();
@@ -253,23 +138,23 @@ namespace Elwig.Helpers {
         }
 
         public async Task<bool> MgNrExists(int mgnr) {
-            return await _compiledQueryMembers.Invoke(this, mgnr, true).AnyAsync();
+            return await Members.FindAsync(mgnr) != null;
         }
 
         public async Task<bool> FbNrExists(int fbnr) {
-            return await _compiledQueryAreaCommitments.Invoke(this, fbnr).AnyAsync();
+            return await AreaCommitments.FindAsync(fbnr) != null;
         }
 
         public async Task<bool> SortIdExists(string sortId) {
-            return await _compiledQueryWineVarieties.Invoke(this, sortId).AnyAsync();
+            return await WineVarieties.FindAsync(sortId) != null;
         }
 
         public async Task<bool> AttrIdExists(string attrId) {
-            return await _compiledQueryWineAttributes.Invoke(this, attrId, true).AnyAsync();
+            return await WineAttributes.FindAsync(attrId) != null;
         }
 
         public async Task<bool> CultIdExists(string cultId) {
-            return await _compiledQueryWineCultivations.Invoke(this, cultId).AnyAsync();
+            return await WineCultivations.FindAsync(cultId) != null;
         }
 
         public async Task<int> NextMgNr() {
@@ -281,117 +166,87 @@ namespace Elwig.Helpers {
 
         public async Task<int> NextFbNr() {
             int c = 0;
-            (await AreaCommitmentContracts.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
+            (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
-        public async Task<int> NextRevNr(int fbnr) {
-            return (await AreaCommitments.Where(c => c.FbNr == fbnr).Select(c => (int?)c.RevNr).MaxAsync() ?? 0) + 1;
-        }
-
         public async Task<int> NextLNr(DateOnly date, string zwstid) {
             var dateStr = date.ToString("yyyy-MM-dd");
-            return (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => (int?)d.LNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => d.LNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public async Task<int> NextDId(int year) {
-            return (await Deliveries.Where(d => d.Year == year).Select(d => (int?)d.DId).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await Deliveries.Where(d => d.Year == year).Select(d => d.DId).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public async Task<int> NextDPNr(int year, int did) {
-            return (await DeliveryParts.Where(p => p.Year == year && p.DId == did).Select(p => (int?)p.DPNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await DeliveryParts.Where(p => p.Year == year && p.DId == did).Select(d => d.DPNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public async Task<int> NextRdNr(int kgnr) {
-            return (await WbRde.Where(r => r.KgNr == kgnr).Select(r => (int?)r.RdNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await WbRde.Where(r => r.KgNr == kgnr).Select(r => r.RdNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public async Task<int> NextAvNr(int year) {
-            return (await PaymentVariants.Where(v => v.Year == year).Select(v => (int?)v.AvNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
         public async Task<int> NextDsNr(int year) {
-            return (await DeliverySchedules.Where(s => s.Year == year).Select(v => (int?)v.DsNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await DeliverySchedules.Where(s => s.Year == year).Select(s => s.DsNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
         }
 
-        public async Task<int> NextHistNr() {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
-            return (await MemberHistory.Select(c => (int?)c.HistNr).MaxAsync() ?? 0) + 1;
+            foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
-        }
-
-        public IAsyncEnumerable<Branch> FetchBranches(string? zwstid = null, bool includeWithoutMembers = true) {
-            return _compiledQueryBranches.Invoke(this, zwstid, includeWithoutMembers);
-        }
-
-        public IAsyncEnumerable<WineVar> FetchWineVarieties() {
-            return _compiledQueryWineVarieties.Invoke(this, null);
-        }
-
-        public IAsyncEnumerable<WineAttr> FetchWineAttributes(bool incudeNotActive = true) {
-            return _compiledQueryWineAttributes.Invoke(this, null, incudeNotActive);
-        }
-
-        public IAsyncEnumerable<WineCult> FetchWineCultivations() {
-            return _compiledQueryWineCultivations.Invoke(this, null);
-        }
-
-        public IAsyncEnumerable<WineQualLevel> FetchWineQualityLevels(bool includePredicate = true) {
-            return _compiledQueryWineQualityLevels.Invoke(this, includePredicate);
-        }
-
-        public IAsyncEnumerable<Modifier> FetchModifiers(int? year, bool incudeNotActive = true) {
-            return _compiledQueryModifiers.Invoke(this, year, incudeNotActive);
-        }
-
-        public IAsyncEnumerable<Member> FetchMembers(int? mgnr = null, bool includeNotActive = false, bool includeContactInfo = false) {
-            if (includeContactInfo) {
-                return _compiledQueryMembersContactInfo.Invoke(this, mgnr, mgnr != null || includeNotActive);
-            } else {
-                return _compiledQueryMembers.Invoke(this, mgnr, mgnr != null || includeNotActive);
-            }
-        }
-
-        public IAsyncEnumerable<Season> FetchSeasons(int? year = null, bool includeModifiers = false) {
-            if (includeModifiers) {
-                return _compiledQuerySeasonsModifiers.Invoke(this, year);
-            } else {
-                return _compiledQuerySeasons.Invoke(this, year);
-            }
-        }
-
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<string> oldModIds, IEnumerable<string> newModIds) {
-            foreach (var m in await FetchModifiers(part.Year).ToListAsync()) {
                 var mod = new DeliveryPartModifier {
                     Year = part.Year,
                     DId = part.DId,
                     DPNr = part.DPNr,
                     ModId = m.ModId,
                 };
-                var old = oldModIds.Contains(m.ModId);
+                var old = oldModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
-                if (newModIds.Contains(m.ModId)) {
+                if (newModifiers.Any(md => md.ModId == m.ModId)) {
-                    if (!old) {
+                    if (old == null) {
                         Add(mod);
                     } else {
                         Update(mod);
                     }
                 } else {
-                    if (old) {
+                    if (old != null) {
                         Remove(mod);
                     }
                 }
             }
         }
 
-        public async Task UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(string, int)> oldVarieties, IEnumerable<(string, int)> newVarieties) {
+        public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) {
-            foreach (var v in await FetchWineVarieties().ToArrayAsync()) {
+            foreach (var v in WineVarieties) {
                 var e = new DeliveryScheduleWineVar {
                     Year = schedule.Year,
                     DsNr = schedule.DsNr,
                     SortId = v.SortId,
                     Priority = 1,
                 };
-                var o = oldVarieties.Where(x => x.Item1 == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
-                var n = newVarieties.Where(x => x.Item1 == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
                 if (n != -1) {
                     e.Priority = n;
                     if (o == -1) {
@@ -407,22 +262,6 @@ namespace Elwig.Helpers {
             }
         }
 
-        private async Task FetchMemberHistory(int year, SqliteConnection? cnx = null) {
-            var ownCnx = cnx == null;
-            cnx ??= await ConnectAsync();
-            var history = new Dictionary<int, MemberHistoryPoint>();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, shares, shares_red, shares_white, shares_dormant FROM v_member_history WHERE year = {year}";
-                using var reader = await cmd.ExecuteReaderAsync();
-                while (await reader.ReadAsync()) {
-                    var mgnr = reader.GetInt32(0);
-                    history[mgnr] = new(reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4));
-                }
-            }
-            if (ownCnx) await cnx.DisposeAsync();
-            _memberHistory[year] = history;
-        }
-
         private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
@@ -513,12 +352,6 @@ namespace Elwig.Helpers {
             _memberUnderDelivery[year] = buckets;
         }
 
-        public async Task<MemberHistoryPoint> GetMemberHistory(int year, int mgnr, SqliteConnection? cnx = null) {
-            if (!_memberHistory.ContainsKey(year))
-                await FetchMemberHistory(year, cnx);
-            return _memberHistory[year].GetValueOrDefault(mgnr, new());
-        }
-
         public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberAreaCommitmentBuckets.ContainsKey(year))
                 await FetchMemberAreaCommitmentBuckets(year, cnx);
@@ -558,12 +391,10 @@ namespace Elwig.Helpers {
             var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
             if (ownCnx) await cnx.DisposeAsync();
 
-            var varieties = await WineVarieties.ToDictionaryAsync(v => v.SortId);
-            var attributes = await WineAttributes.ToDictionaryAsync(a => a.AttrId);
             var buckets = new Dictionary<string, MemberBucket>();
             foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
-                var variety = varieties.GetValueOrDefault(id[..2]);
+                var variety = await WineVarieties.FindAsync(id[..2]);
-                var attribute = attributes.GetValueOrDefault(id[2..]);
+                var attribute = await WineAttributes.FindAsync(id[2..]);
                 var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
                 buckets[id] = new(
                     name,

Elwig/Helpers/AppDbUpdater.cs

@@ -1,6 +1,6 @@
+using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -9,41 +9,36 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 40;
+        public static readonly int RequiredSchemaVersion = 37;
 
         private static int VersionOffset = 0;
 
         public static async Task<Version> CheckDb() {
-            long? applId, schemaVers;
+            using var cnx = AppDbContext.Connect();
-            using (var cnx = await AppDbContext.ConnectAsync()) {
-                applId = (long?)await cnx.ExecuteScalar("PRAGMA application_id") ?? 0;
-                if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})");
 
-                schemaVers = (long?)await cnx.ExecuteScalar("PRAGMA schema_version") ?? 0;
+            var applId = (long?)await cnx.ExecuteScalar("PRAGMA application_id") ?? 0;
-                VersionOffset = (int)(schemaVers % 100);
+            if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})");
-                if (VersionOffset != 0) {
+
-                    // schema was modified manually/externally
+            var schemaVers = (long?)await cnx.ExecuteScalar("PRAGMA schema_version") ?? 0;
-                    // TODO issue warning
+            VersionOffset = (int)(schemaVers % 100);
-                }
+            if (VersionOffset != 0) {
+                // schema was modified manually/externally
+                // TODO issue warning
             }
+            await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
 
-            await UpdateDbSchema((int)(schemaVers / 100), RequiredSchemaVersion);
+            var userVers = (long?)await cnx.ExecuteScalar("PRAGMA user_version") ?? 0;
+            var v = new Version((int)(userVers >> 24), (int)((userVers >> 16) & 0xFF), (int)((userVers >> 8) & 0xFF), (int)(userVers & 0xFF));
 
-            Version v;
+            if (App.Version > v) {
-            using (var cnx = await AppDbContext.ConnectAsync()) {
+                long vers = (App.Version.Major << 24) | (App.Version.Minor << 16) | (App.Version.Build << 8) | App.Version.Revision;
-                var userVers = (long?)await cnx.ExecuteScalar("PRAGMA user_version") ?? 0;
+                await cnx.ExecuteBatch($"PRAGMA user_version = {vers}");
-                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 << 8) | App.Version.Revision;
-                    await cnx.ExecuteBatch($"PRAGMA user_version = {vers}");
-                }
             }
 
             return v;
         }
 
-        private static async Task UpdateDbSchema(int fromVersion, int toVersion) {
+        private static async Task UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
             if (fromVersion == toVersion) {
                 return;
             } else if (fromVersion > toVersion) {
@@ -53,48 +48,43 @@ namespace Elwig.Helpers {
             }
 
             var asm = Assembly.GetExecutingAssembly();
-            (int From, int To, string Name)[] scripts = [.. asm.GetManifestResourceNames()
+            (int From, int To, string Name)[] scripts = asm.GetManifestResourceNames()
                 .Where(n => n.StartsWith("Elwig.Resources.Sql."))
                 .Select(n => {
                     var p = n.Split(".")[^2].Split("-");
                     return (int.Parse(p[0]), int.Parse(p[1]), n);
                 })
-                .OrderBy(s => s.Item1).ThenBy(s => s.Item2)];
+                .OrderBy(s => s.Item1).ThenBy(s => s.Item2)
+                .ToArray();
 
             List<string> toExecute = [];
             var vers = fromVersion;
             while (vers < toVersion) {
-                var (_, to, name) = scripts.Last(s => s.From == vers);
+                var (_, to, name) = scripts.Where(s => s.From == vers).Last();
                 toExecute.Add(name);
                 vers = to;
             }
             if (toExecute.Count == 0)
                 return;
 
-            var backup = Path.ChangeExtension(App.Config.DatabaseFile, $".v{fromVersion}.sqlite3");
+            await cnx.ExecuteBatch("""
-            File.Copy(App.Config.DatabaseFile, backup, true);
+                PRAGMA locking_mode = EXCLUSIVE;
-            try {
+                BEGIN EXCLUSIVE;
-                using var cnx = await AppDbContext.ConnectAsync();
+                """);
-                await cnx.ExecuteBatch("PRAGMA locking_mode = EXCLUSIVE");
+            foreach (var script in toExecute) {
-                foreach (var script in toExecute) {
+                await cnx.ExecuteEmbeddedScript(asm, script);
-                    await cnx.ExecuteEmbeddedScript(asm, script);
-                }
-
-                var violations = await cnx.ForeignKeyCheck();
-                if (violations.Length > 0) {
-                    throw new Exception($"Foreign key violations ({violations.Length}):\n" + string.Join("\n", violations
-                        .Take(50)
-                        .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}")));
-                }
-
-                await cnx.ExecuteBatch("VACUUM");
-                await cnx.ExecuteBatch($"PRAGMA schema_version = {toVersion * 100 + VersionOffset}");
-            } catch (Exception) {
-                File.Move(backup, App.Config.DatabaseFile, true);
-                throw;
-            } finally {
-                File.Delete(backup);
             }
+            var violations = await cnx.ForeignKeyCheck();
+            if (violations.Length > 0) {
+                throw new Exception($"Foreign key violations ({violations.Length}):\n" + string.Join("\n", violations
+                    .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}")));
+            }
+
+            await cnx.ExecuteBatch($"""
+                COMMIT;
+                VACUUM;
+                PRAGMA schema_version = {toVersion * 100 + VersionOffset};
+                """);
         }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -1,5 +1,6 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -15,30 +16,13 @@ namespace Elwig.Helpers.Billing {
         protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
         protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes;
 
-        protected Billing(int year, Season season,
+        public Billing(int year) {
-            Dictionary<string, string> attributes,
-            Dictionary<string, (decimal?, decimal?)> modifiers,
-            Dictionary<string, (string, string?, string?, int?, decimal?)> areaComTypes
-        ) {
             Year = year;
-            Season = season;
-            Attributes = attributes;
-            Modifiers = modifiers;
-            AreaComTypes = areaComTypes;
-        }
-
-        protected static async Task<(Season, Dictionary<string, string>, Dictionary<string, (decimal?, decimal?)>, Dictionary<string, (string, string?, string?, int?, decimal?)>)> LoadData(AppDbContext ctx, int year) {
-            var season = await ctx.FetchSeasons(year).SingleOrDefaultAsync() ?? throw new ArgumentException("Invalid season");
-            var attributes = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a.Name);
-            var modifiers = await ctx.FetchModifiers(year).ToDictionaryAsync(m => m.ModId, m => (m.Abs, m.Rel));
-            var areaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
-            return (season, attributes, modifiers, areaComTypes);
-        }
-
-        public static async Task<Billing> Create(int year) {
             using var ctx = new AppDbContext();
-            var (season, attributes, modifiers, areaComTypes) = await LoadData(ctx, year);
+            Season = ctx.Seasons.Find(Year)!;
-            return new Billing(year, season, attributes, modifiers, areaComTypes);
+            Attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
+            Modifiers = ctx.Modifiers.Where(m => m.Year == Year).Include(m => m.Season).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
+            AreaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
         }
 
         public async Task FinishSeason() {
@@ -50,29 +34,45 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceShares = 0, int allowanceKgPerShare = 0, double allowanceRel = 0, int addMinShares = 1) {
+        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) {
-            if (addMinShares < 1) addMinShares = 1;
+            if (addMinBs < 1) addMinBs = 1;
             using var cnx = await AppDbContext.ConnectAsync();
             await cnx.ExecuteBatch($"""
-                DELETE FROM member_history WHERE source = 'elwig' AND reason = '{MemberHistory.REASON_PRESCRIPTION}' AND deduct_year = {Year};
+                UPDATE member
-                INSERT INTO member_history (histnr, from_mgnr, from_type, to_mgnr, to_type, date_notice, date_effective, reason, source, deduct_year, shares, value_per_share, currency, comment)
+                SET business_shares = member.business_shares - h.business_shares
-                SELECT COALESCE((SELECT MAX(histnr) AS histnr FROM member_history), 0) + ROW_NUMBER() OVER(ORDER BY m.mgnr),
+                FROM member_history h
-                       NULL, NULL, u.mgnr, 1, '{date:yyyy-MM-dd}', '{date:yyyy-MM-dd}', '{MemberHistory.REASON_PRESCRIPTION}', 'elwig', s.year,
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
-                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerShare}.0 * u.shares) / s.max_kg_per_share
+
-                            - {allowanceShares.ToString(CultureInfo.InvariantCulture)}
+                INSERT INTO member_history (mgnr, date, type, business_shares)
-                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.shares) AS adjust_shares,
+                SELECT u.mgnr,
-                       s.share_value / POW(10, s.precision - 2), s.currency, 'durch automatische Nachzeichnung'
+                       '{date:yyyy-MM-dd}',
+                       'auto',
+                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs
+                            - {allowanceBs.ToString(CultureInfo.InvariantCulture)}
+                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
                 FROM v_total_under_delivery u
                     JOIN season s ON s.year = u.year
                     JOIN member m ON m.mgnr = u.mgnr
-                WHERE s.year = {Year} AND adjust_shares >= {addMinShares} AND m.active
+                WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
+                ON CONFLICT DO UPDATE
+                SET business_shares = excluded.business_shares;
+
+                UPDATE member
+                SET business_shares = member.business_shares + h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr;
                 """);
         }
 
         public async Task UnAdjustBusinessShares() {
             using var cnx = await AppDbContext.ConnectAsync();
             await cnx.ExecuteBatch($"""
-                DELETE FROM member_history WHERE source = 'elwig' AND reason = '{MemberHistory.REASON_PRESCRIPTION}' AND deduct_year = {Year};
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
                 """);
         }
 

Elwig/Helpers/Billing/BillingData.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 
@@ -93,14 +92,6 @@ namespace Elwig.Helpers.Billing {
             Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster;
         }
 
-        public BillingData() {
-            Data = new JsonObject {
-                ["mode"] = "elwig",
-                ["version"] = 1,
-            };
-            Mode = CalculationMode.Elwig;
-        }
-
         protected static JsonObject ParseJson(string json) {
             if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
             try {
@@ -116,10 +107,6 @@ namespace Elwig.Helpers.Billing {
             return new(ParseJson(json));
         }
 
-        public string ToJsonString(JsonSerializerOptions? options = null) {
-            return Data.ToJsonString(options);
-        }
-
         protected JsonArray GetCurvesEntry() {
             return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException();
         }
@@ -425,7 +412,7 @@ namespace Elwig.Helpers.Billing {
             }
         }
 
-        public static BillingData FromGraphEntries(
+        public static JsonObject FromGraphEntries(
             IEnumerable<GraphEntry> graphEntries,
             BillingData? origData = null,
             IEnumerable<RawVaribute>? vaributes = null,
@@ -459,29 +446,40 @@ namespace Elwig.Helpers.Billing {
                 }
             }
 
-            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? [.. payment.Select(e => new RawVaribute(e.Key))], useDefaultPayment);
+            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))], useDefaultQuality);
+            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
+
+            var data = new JsonObject {
+                ["mode"] = "elwig",
+                ["version"] = 1,
+            };
+
+            if (origData?.ConsiderDelieryModifiers == true)
+                data["consider_delivery_modifiers"] = true;
+            if (origData?.ConsiderContractPenalties == true)
+                data["consider_contract_penalties"] = true;
+            if (origData?.ConsiderTotalPenalty == true)
+                data["consider_total_penalty"] = true;
+            if (origData?.ConsiderAutoBusinessShares == true)
+                data["consider_auto_business_shares"] = true;
 
-            BillingData data = origData != null && origData.Mode == CalculationMode.Elwig ? new BillingData((JsonObject)origData.Data.DeepClone()) : new BillingData();
             if (payment.Count == 0) {
-                data.Data["payment"] = 0;
+                data["payment"] = 0;
             } else if (payment.Count == 1 && payment.First().Key == "default") {
-                data.Data["payment"] = payment.Single().Value?.DeepClone();
+                data["payment"] = payment.Single().Value?.DeepClone();
             } else {
-                data.Data["payment"] = payment;
+                data["payment"] = payment;
             }
             if (qualityWei.Count == 1 && qualityWei.First().Key == "default") {
-                data.Data["quality"] = new JsonObject() {
+                data["quality"] = new JsonObject() {
                     ["WEI"] = qualityWei.Single().Value?.DeepClone()
                 };
             } else if (qualityWei.Count >= 1) {
-                data.Data["quality"] = new JsonObject() {
+                data["quality"] = new JsonObject() {
                     ["WEI"] = qualityWei
                 };
-            } else {
-                data.Data.Remove("quality");
             }
-            data.Data["curves"] = curves;
+            data["curves"] = curves;
 
             return data;
         }

Elwig/Helpers/Billing/BillingVariant.cs

@@ -10,35 +10,17 @@ namespace Elwig.Helpers.Billing {
     public class BillingVariant : Billing {
 
         protected readonly int AvNr;
-        protected PaymentVar PaymentVariant;
+        protected readonly PaymentVar PaymentVariant;
-        protected PaymentBillingData Data;
+        protected readonly PaymentBillingData Data;
 
-        protected BillingVariant(int year, int avnr, Season season,
+        public BillingVariant(int year, int avnr) : base(year) {
-            Dictionary<string, string> attributes,
-            Dictionary<string, (decimal?, decimal?)> modifiers,
-            Dictionary<string, (string, string?, string?, int?, decimal?)> areaComTypes,
-            PaymentVar paymentVar, PaymentBillingData data) :
-            base(year, season, attributes, modifiers, areaComTypes) {
             AvNr = avnr;
-            PaymentVariant = paymentVar;
-            Data = data;
-        }
-
-        protected static async Task<(PaymentVar, PaymentBillingData)> LoadData(AppDbContext ctx, int year, int avnr) {
-            var paymentVar = await ctx.PaymentVariants.Where(v => v.Year == year && v.AvNr == avnr).SingleAsync();
-            var data = PaymentBillingData.FromJson(paymentVar.Data, await Utils.GetVaributes(ctx, year, onlyDelivered: false));
-            return (paymentVar, data);
-        }
-
-        public static async Task<BillingVariant> Create(int year, int avnr) {
             using var ctx = new AppDbContext();
-            var (season, attributes, modifiers, areaComTypes) = await LoadData(ctx, year);
+            PaymentVariant = ctx.PaymentVariants.Include(v => v.Season).Where(v => v.Year == Year && v.AvNr == AvNr).Single() ?? throw new ArgumentException("PaymentVar not found");
-            var (paymentVar, data) = await LoadData(ctx, year, avnr);
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
-            return new BillingVariant(year, avnr, season, attributes, modifiers, areaComTypes, paymentVar, data);
         }
 
         public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
-            if (PaymentVariant == null || Data == null) throw new Exception("Call Load before Calculate");
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
             await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
@@ -76,7 +58,7 @@ namespace Elwig.Helpers.Billing {
                            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)) +
+                           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,
                            IIF(lc.amount < 0, 0, lc.modifiers) AS prev_modifiers
@@ -98,7 +80,7 @@ namespace Elwig.Helpers.Billing {
                         LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
-                    WHERE s.year = {Year} AND v.avnr = {AvNr} AND p.amount != COALESCE(lp.amount, 0);
+                    WHERE s.year = {Year} AND v.avnr = {AvNr} AND p.amount > COALESCE(lp.amount, 0);
                     """);
             await cnx.ExecuteBatch($"""
                 UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
@@ -137,11 +119,11 @@ namespace Elwig.Helpers.Billing {
                 await cnx.ExecuteBatch($"""
                     INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
                     SELECT c.year, {AvNr}, s.mgnr, 0,
-                           ROUND(s.weight_total * COALESCE(m.abs, 0)),
+                           ROUND(s.sum * COALESCE(m.abs, 0)),
                            COALESCE(m.rel, 0)
                     FROM (SELECT {Year} AS year, m.mgnr,
-                                 ROUND(AVG(COALESCE(a.weight_total, b.weight_total)) * {multiplier}) AS baseline,
+                                 ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline,
-                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.weight_total, b.weight_total)) > 0 AS allowed
+                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.sum, b.sum)) > 0 AS allowed
                           FROM member m
                               LEFT JOIN v_stat_member a ON a.mgnr = m.mgnr
                               FULL OUTER JOIN v_stat_member b ON b.mgnr = m.predecessor_mgnr AND b.year = a.year AND {(includePredecessor ? "TRUE" : "FALSE")}
@@ -150,7 +132,7 @@ namespace Elwig.Helpers.Billing {
                           HAVING allowed) c
                         JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr)
                         LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}'
-                    WHERE weight_total >= baseline
+                    WHERE sum >= baseline
                     ON CONFLICT DO UPDATE
                     SET mod_abs = mod_abs + excluded.mod_abs,
                         mod_rel = mod_rel + excluded.mod_rel
@@ -232,7 +214,7 @@ namespace Elwig.Helpers.Billing {
                 SET mod_rel = mod_rel + excluded.mod_rel;
 
                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
-                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0) * d.weight, COALESCE(m.rel, 0)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
                 FROM delivery_part d
                     LEFT JOIN delivery_part_modifier p ON (p.year, p.did, p.dpnr) = (d.year, d.did, d.dpnr)
                     LEFT JOIN modifier m ON (m.year, m.modid) = (d.year, p.modid)

Elwig/Helpers/Billing/EditBillingData.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Billing {
     public class EditBillingData : BillingData {
@@ -71,14 +70,14 @@ namespace Elwig.Helpers.Billing {
             return (curves, dict3);
         }
 
-        private static async Task<List<GraphEntry>> CreateGraphEntries(
+        private static List<GraphEntry> CreateGraphEntries(
             AppDbContext ctx, int precision,
             Dictionary<int, Curve> curves,
             Dictionary<int, List<RawVaribute>> entries
         ) {
-            var vars = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+            var vars = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
-            var attrs = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a);
+            var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-            var cults = await ctx.FetchWineCultivations().ToDictionaryAsync(c => c.CultId, c => c);
+            var cults = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c);
             return entries
                 .Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value
                     .Select(s => new Varibute(s, vars, attrs, cults))
@@ -86,18 +85,18 @@ namespace Elwig.Helpers.Billing {
                 .ToList();
         }
 
-        public async Task<IEnumerable<GraphEntry>> GetPaymentGraphEntries(AppDbContext ctx, Season season) {
+        public IEnumerable<GraphEntry> GetPaymentGraphEntries(AppDbContext ctx, Season season) {
             var root = GetPaymentEntry();
             var (curves, entries) = GetGraphEntries(root);
-            return (await CreateGraphEntries(ctx, season.Precision, curves, entries)).Where(e => e.Vaributes.Count > 0);
+            return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
         }
 
-        public async Task<IEnumerable<GraphEntry>> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) {
+        public IEnumerable<GraphEntry> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) {
             var root = GetQualityEntry();
             if (root == null || root["WEI"] is not JsonNode qualityWei)
                 return [];
             var (curves, entries) = GetGraphEntries(qualityWei);
-            var list = (await CreateGraphEntries(ctx, season.Precision, curves, entries)).Where(e => e.Vaributes.Count > 0);
+            var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
             foreach (var e in list) {
                 e.Id += idOffset;
                 e.Abgewertet = true;

Elwig/Helpers/ClientParameters.cs

@@ -8,18 +8,16 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
     public class ClientParameters {
 
-        public enum Type { Matzen, Winzerkeller, Weinland, Baden, Seewinkel };
+        public enum Type { Matzen, Winzerkeller, Weinland, Baden };
 
         public bool IsMatzen => Client == Type.Matzen;
         public bool IsWinzerkeller => Client == Type.Winzerkeller;
         public bool IsWeinland => Client == Type.Weinland;
         public bool IsBaden => Client == Type.Baden;
-        public bool IsSeewinkel => Client == Type.Seewinkel;
         public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W";
         public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H";
         public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
         public bool IsGrInzersdorf => IsWeinland;
-        public bool IsPamhagen => IsSeewinkel;
 
         public string NameToken;
         public string NameShort;
@@ -56,10 +54,6 @@ namespace Elwig.Helpers {
         public string? EmailAddress;
         public string? Website;
 
-        public bool EnableMemberHistory;
-        public int ModeBusinessShares;
-        public bool HasRedWhite => ModeBusinessShares == 1;
-
         public int ModeDeliveryNoteStats;
         public int ModeWineQualityStatistics;
         public int OrderingMemberList;
@@ -79,7 +73,7 @@ namespace Elwig.Helpers {
         public int ExportEbicsVersion;
         public int ExportEbicsAddress;
 
-        public (int? AllowanceKg, double? AllowanceShares, int? AllowanceKgPerShare, double? AllowancePercent, int? MinShares) AutoAdjustShares;
+        public (int? AllowanceKg, double? AllowanceBs, int? AllowanceKgPerBs, double? AllowancePercent, int? MinBs) AutoAdjustBs;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -99,8 +93,6 @@ namespace Elwig.Helpers {
                         Client = Type.Weinland; break;
                     case "Winzergenossenschaft Baden - Bad Vöslau":
                         Client = Type.Baden; break;
-                    case "Winzerkeller Seewinkel":
-                        Client = Type.Seewinkel; break;
                 };
 
                 Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
@@ -116,15 +108,6 @@ namespace Elwig.Helpers {
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
                 OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
 
-                EnableMemberHistory = (parameters.GetValueOrDefault("ENABLE_MEMBERHISTORY")?.ToUpper()) switch {
-                    "1" or "TRUE" or "YES" or "JA" => true,
-                    _ => false,
-                };
-
-                switch (parameters.GetValueOrDefault("MODE_BUSINESSSHARES", "SIMPLE")?.ToUpper()) {
-                    case "SIMPLE": ModeBusinessShares = 0; break;
-                    case "RED_WHITE": ModeBusinessShares = 1; break;
-                }
                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
                     case "NONE": ModeDeliveryNoteStats = 0; break;
                     case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
@@ -189,7 +172,7 @@ namespace Elwig.Helpers {
                 }
 
                 var autoAdjust = (parameters.GetValueOrDefault("AUTOADJUST_BUSINESSSHARES") ?? "").Split(';');
-                AutoAdjustShares = autoAdjust.Length == 5 ? (
+                AutoAdjustBs = autoAdjust.Length == 5 ? (
                     int.TryParse(autoAdjust[0], out var v1) ? v1 : null,
                     double.TryParse(autoAdjust[1], out var v2) ? v2 : null,
                     int.TryParse(autoAdjust[2], out var v3) ? v3 : null,
@@ -202,11 +185,6 @@ namespace Elwig.Helpers {
         }
 
         private IEnumerable<(string, string?)> GetParamValues() {
-            string businessShares = "SIMPLE";
-            switch (ModeBusinessShares) {
-                case 0: businessShares = "SIMPLE"; break;
-                case 1: businessShares = "RED_WHITE"; break;
-            }
             string deliveryNoteStats = "SHORT";
             switch (ModeDeliveryNoteStats) {
                 case 0: deliveryNoteStats = "NONE"; break;
@@ -253,9 +231,9 @@ namespace Elwig.Helpers {
                 case 1: exportEbicsAddress = "LINES"; break;
                 case 2: exportEbicsAddress = "FULL"; break;
             }
-            string autoAdjust = $"{AutoAdjustShares.AllowanceKg};{AutoAdjustShares.AllowanceShares?.ToString(CultureInfo.InvariantCulture)};" +
+            string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" +
-                                $"{AutoAdjustShares.AllowanceKgPerShare};{AutoAdjustShares.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
-                                $"{AutoAdjustShares.MinShares}";
+                                $"{AutoAdjustBs.MinBs}";
             return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -274,8 +252,6 @@ namespace Elwig.Helpers {
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
                 ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
-                ("ENABLE_MEMBERHISTORY", EnableMemberHistory ? "YES" : "NO"),
-                ("MODE_BUSINESSSHARES", businessShares),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics),
                 ("ORDERING_MEMBERLIST", orderingMemberList),

Elwig/Helpers/Export/ElwigData.cs

@@ -1,6 +1,4 @@
-using Elwig.Models;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -43,7 +41,7 @@ namespace Elwig.Helpers.Export {
                 List<WbGl> currentWbGls;
 
                 using (var ctx = new AppDbContext()) {
-                    branches = await ctx.FetchBranches().ToDictionaryAsync(b => b.ZwstId);
+                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
                     currentDids = await ctx.Deliveries
                         .GroupBy(d => d.Year)
                         .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
@@ -61,16 +59,14 @@ namespace Elwig.Helpers.Export {
                     List<BillingAddr> BillingAddresses,
                     List<MemberTelNr> TelephoneNumbers,
                     List<MemberEmailAddr> EmailAddresses,
-                    List<MemberHistory> MemberHistory,
                     List<AreaCom> AreaCommitments,
-                    List<AreaComContract> Contracts,
                     List<WbRd> Riede,
                     List<WbKg> WbKgs,
                     List<WbGl> WbGls,
                     List<Delivery> Deliveries,
                     List<DeliveryPart> DeliveryParts,
                     List<DeliveryPartModifier> Modifiers,
-                    Dictionary<string, List<(int Id1, int Id2, int Id3, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
+                    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,
@@ -79,12 +75,10 @@ namespace Elwig.Helpers.Export {
 
                 foreach (var filename in filenames) {
                     try {
-                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], [], [], new() {
+                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
                             ["member"] = [],
-                            ["area_commitment_contract"] = [],
                             ["area_commitment"] = [],
                             ["delivery"] = [],
-                            ["delivery_part"] = [],
                         })));
                         var r = data[^1];
 
@@ -92,11 +86,9 @@ namespace Elwig.Helpers.Export {
                         using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
                         await zip.CheckIntegrity();
 
-                        string[] acceptableVersions = ["1", "2"];
                         var version = zip.GetEntry("version");
                         using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
-                            var v = await reader.ReadToEndAsync();
+                            if (await reader.ReadToEndAsync() != "elwig:1")
-                            if (!v.StartsWith("elwig:") || !acceptableVersions.Contains(v[6..]))
                                 throw new FileFormatException($"Ungültige Elwig-Export-Datei ({filename})");
                         }
 
@@ -104,8 +96,8 @@ namespace Elwig.Helpers.Export {
                         var meta = await JsonNode.ParseAsync(metaJson!.Open());
                         var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
                         var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
-                        var areaComCount = meta!["area_commitment_contracts"]?["count"]?.AsValue().GetValue<int>();
+                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
-                        var areaComFilters = meta!["area_commitment_contracts"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
                         var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
                         metaData.Add((Path.GetFileName(filename),
@@ -141,59 +133,23 @@ namespace Elwig.Helpers.Export {
                                 r.TelephoneNumbers.AddRange(telNrs);
                                 r.EmailAddresses.AddRange(emailAddrs);
                                 if (timestamps.HasValue)
-                                    r.Timestamps["member"].Add((m.MgNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
                             }
                         }
 
-                        var historyJson = zip.GetEntry("member_history.json");
-                        if (historyJson != null) {
-                            using var reader = new StreamReader(historyJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var h = obj.ToMemberHistory();
-                                r.MemberHistory.Add(h);
-                            }
-                        }
-
-                        // legacy area commitments
                         var areaComsJson = zip.GetEntry("area_commitments.json");
                         if (areaComsJson != null) {
                             using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
+                                var (areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
-                                r.Contracts.Add(contract);
                                 r.AreaCommitments.Add(areaCom);
                                 if (wbrd != null) {
                                     r.Riede.Add(wbrd);
                                 }
-                                if (timestamps.HasValue) {
-                                    r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                }
-                            }
-                        }
-
-                        var contractsJson = zip.GetEntry("area_commitment_contracts.json");
-                        if (contractsJson != null) {
-                            using var reader = new StreamReader(contractsJson.Open(), Utils.UTF8);
-                            string? line;
-                            while ((line = await reader.ReadLineAsync()) != null) {
-                                var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaComs, wbrd, timestamps) = obj.ToAreaComContract(currentWbRde);
-                                r.Contracts.Add(contract);
-                                r.AreaCommitments.AddRange(areaComs.Select(v => v.Item1));
-                                if (wbrd != null) {
-                                    r.Riede.Add(wbrd);
-                                }
                                 if (timestamps.HasValue)
-                                    r.Timestamps["area_commitment_contract"].Add((contract.FbNr, 0, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                foreach (var (areaCom, ts) in areaComs) {
-                                    if (!ts.HasValue) continue;
-                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, areaCom.RevNr, 0, ts.Value.CreatedAt, ts.Value.ModifiedAt));
-                                }
                             }
                         }
 
@@ -205,15 +161,11 @@ namespace Elwig.Helpers.Export {
                                 var obj = JsonNode.Parse(line)!.AsObject();
                                 var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
                                 r.Deliveries.Add(d);
-                                r.DeliveryParts.AddRange(parts.Select(p => p.Item1));
+                                r.DeliveryParts.AddRange(parts);
                                 r.Modifiers.AddRange(mods);
                                 r.Riede.AddRange(rde);
                                 if (timestamps.HasValue)
-                                    r.Timestamps["delivery"].Add((d.Year, d.DId, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
-                                foreach (var (part, ts) in parts) {
-                                    if (!ts.HasValue) continue;
-                                    r.Timestamps["area_commitment"].Add((part.Year, part.DId, part.DPNr, ts.Value.CreatedAt, ts.Value.ModifiedAt));
-                                }
                             }
                         }
                     } catch (Exception exc) when (
@@ -222,27 +174,30 @@ namespace Elwig.Helpers.Export {
                             exc is FileNotFoundException ||
                             exc is IOException) {
                         data.RemoveAt(data.Count - 1);
-                        InteractionService.ShowException("Fehler beim Importieren", $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen", exc);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen.\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
                         await AddImportedFiles(Path.GetFileName(filename));
                     } catch (Exception exc) {
                         data.RemoveAt(data.Count - 1);
-                        if (InteractionService.AskException("Fehler beim Importieren", $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?", exc)) {
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        var r = MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No);
+                        if (r == MessageBoxResult.Yes) {
                             await AddImportedFiles(Path.GetFileName(filename));
                         }
                     }
                 }
 
-                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
+                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
-                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
-                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
+                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
 
-                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, history, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
                     using var ctx = new AppDbContext();
-                    var tx = await ctx.Database.BeginTransactionAsync();
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
 
                     var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
                     var duplicateKgNrs = await ctx.WbKgs
@@ -250,12 +205,6 @@ namespace Elwig.Helpers.Export {
                         .Select(k => k.KgNr)
                         .ToListAsync();
 
-                    var histNrs = history.Select(h => h.HistNr).ToList();
-                    var duplicateHistNrs = await ctx.MemberHistory
-                        .Where(h => histNrs.Contains(h.HistNr))
-                        .Select(h => h.HistNr)
-                        .ToListAsync();
-
                     var mgnrs = members.Select(m => m.MgNr).ToList();
                     var duplicateMgNrs = await ctx.Members
                         .Where(m => mgnrs.Contains(m.MgNr))
@@ -271,20 +220,11 @@ namespace Elwig.Helpers.Export {
                     if (duplicateMgNrs.Count > 0)
                         importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count);
 
-                    var fbnrs = contracts.Select(c => c.FbNr).ToList();
+                    var fbnrs = areaCommitments.Select(c => c.FbNr).ToList();
-                    var duplicateFbNrs = await ctx.AreaCommitmentContracts
+                    var duplicateFbNrs = await ctx.AreaCommitments
                         .Where(c => fbnrs.Contains(c.FbNr))
                         .Select(c => c.FbNr)
                         .ToListAsync();
-                    bool importNewContracts = false, importDuplicateContracts = false;
-                    if (mode == ImportMode.Interactively) {
-                        if (fbnrs.Count - duplicateFbNrs.Count > 0)
-                            importNewContracts = ImportQuestion(branch.Name, device, "Flächenbindungsverträge", false, fbnrs.Count - duplicateFbNrs.Count);
-                    } else {
-                        importNewContracts = true;
-                    }
-                    if (duplicateFbNrs.Count > 0)
-                        importDuplicateContracts = ImportQuestion(branch.Name, device, "Flächenbindungsverträge", true, duplicateFbNrs.Count);
 
                     var lsnrs = deliveries.Select(d => d.LsNr).ToList();
                     var duplicateLsNrs = await ctx.Deliveries
@@ -318,52 +258,40 @@ namespace Elwig.Helpers.Export {
                             importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
                     }
 
-                    if (importDuplicateMembers || importNewMembers || importDuplicateContracts || importNewContracts || importDuplicateDeliveries || importNewDeliveries) {
+                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
                         ctx.AddRange(wbGls);
                         ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
                         ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
                     }
 
                     if (importDuplicateMembers) {
-                        ctx.RemoveRange(ctx.BillingAddresses.IgnoreAutoIncludes().Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
-                        ctx.RemoveRange(ctx.MemberTelephoneNrs.IgnoreAutoIncludes().Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
-                        ctx.RemoveRange(ctx.MemberEmailAddrs.IgnoreAutoIncludes().Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                         ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr)));
                         ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
                         ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
                         ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
                     }
                     if (importNewMembers) {
                         ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr)));
                         ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
                         ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr)));
                         ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
                     }
                     if (members.Count > 0) {
                         var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0;
                         var o = importDuplicateMembers ? duplicateMgNrs.Count : 0;
                         importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
                     }
-
+                    if (areaCommitments.Count > 0) {
-                    if (importDuplicateMembers || importNewMembers) {
-                        ctx.UpdateRange(history.Where(h => duplicateHistNrs.Contains(h.HistNr)));
-                        ctx.AddRange(history.Where(h => !duplicateHistNrs.Contains(h.HistNr)));
-                    }
-
-                    if (importDuplicateContracts) {
-                        ctx.RemoveRange(ctx.AreaCommitments.IgnoreAutoIncludes().Where(c => duplicateFbNrs.Contains(c.FbNr)));
-                        ctx.UpdateRange(contracts.Where(c => duplicateFbNrs.Contains(c.FbNr)));
-                        ctx.AddRange(areaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
-                    }
-                    if (importNewContracts) {
-                        ctx.AddRange(contracts.Where(c => !duplicateFbNrs.Contains(c.FbNr)));
-                        ctx.AddRange(areaCommitments.Where(c => !duplicateFbNrs.Contains(c.FbNr)));
-                    }
-                    if (contracts.Count > 0) {
                         ctx.AddRange(riede);
-                        var n = importNewContracts ? contracts.Count - duplicateFbNrs.Count : 0;
+                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
-                        var o = importDuplicateContracts ? duplicateFbNrs.Count : 0;
+                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
-                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, contracts.Count - n - o, meta.AreaComFilters));
                     }
 
                     if (allowedDuplicateLsNrs.Count > 0) {
@@ -372,10 +300,9 @@ namespace Elwig.Helpers.Export {
                             .Select(d => (d.Year, d.DId))
                             .ToList();
                         ctx.RemoveRange(ctx.DeliveryParts
-                            .IgnoreAutoIncludes()
                             .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))
                             .SelectMany(p => p.PartModifiers));
-                        ctx.RemoveRange(ctx.DeliveryParts.IgnoreAutoIncludes().Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
                         ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
                         ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
                         ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
@@ -387,10 +314,9 @@ namespace Elwig.Helpers.Export {
                             .Select(d => (d.Year, d.DId))
                             .ToList();
                         ctx.RemoveRange(ctx.DeliveryParts
-                            .IgnoreAutoIncludes()
                             .Where(p => l.Contains(p.Delivery.LsNr))
                             .SelectMany(p => p.PartModifiers));
-                        ctx.RemoveRange(ctx.DeliveryParts.IgnoreAutoIncludes().Where(p => l.Contains(p.Delivery.LsNr)));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr)));
                         ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
                         ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
                         ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
@@ -407,21 +333,17 @@ namespace Elwig.Helpers.Export {
                     }
 
                     await ctx.SaveChangesAsync();
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-                    await tx.CommitAsync();
 
                     var primaryKeys = new Dictionary<string, string>() {
-                        ["member"] = "mgnr, 0, 0",
+                        ["member"] = "mgnr, 0",
-                        ["area_commitment_contract"] = "fbnr, 0, 0",
+                        ["area_commitment"] = "fbnr, 0",
-                        ["area_commitment"] = "fbnr, revnr, 0",
+                        ["delivery"] = "year, did",
-                        ["delivery"] = "year, did, 0",
-                        ["delivery_part"] = "year, did, dpnr",
                     };
                     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}, {m.Id3});"));
+                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2});"));
                     using var cnx = AppDbContext.Connect();
                     await cnx.ExecuteBatch($"""
                         BEGIN;
@@ -435,7 +357,7 @@ namespace Elwig.Helpers.Export {
                 }
                 App.HintContextChange();
 
-                InteractionService.ShowInformation("Importieren erfolgreich",
+                MessageBox.Show(
                     $"Das importieren der Daten war erfolgreich!\n" +
                     $"Folgendes wurde importiert:\n" +
                     string.Join("\n", [
@@ -445,10 +367,10 @@ namespace Elwig.Helpers.Export {
                             $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                             $"    Filter: {d.Filters}"),
-                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.New + d.Overwritten)}",
+                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}",
                         ..importedAreaComs.Select(d =>
-                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"  {d.FileName} ({d.Imported})\n" +
-                            $"    ({d.New} importiert, {d.Overwritten} überschreiben, {d.NotImported} nicht importiert)\n" +
+                            $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" +
                             $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                             $"    Filter: {d.Filters}"),
                         $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}",
@@ -457,32 +379,37 @@ namespace Elwig.Helpers.Export {
                             $"    ({d.New} neu, {d.Overwritten} überschr., {d.NotImported} nicht importiert)\n" +
                             $"    Zwst.: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
                             $"    Filter: {d.Filters}")
-                    ]));
+                    ]),
+                    "Importieren erfolgreich",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                InteractionService.ShowException("Fehler beim Importieren", "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden.\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             GC.Collect();
             GC.WaitForPendingFinalizers();
         }
 
         private static bool ImportQuestion(string branch, string device, string subject, bool duplicate, int number) {
-            return InteractionService.AskQuestion($"{subject} importieren",
+            return MessageBox.Show(
                 $"Sollen {number} {(duplicate ? "" : "neue ")}{subject} durch die Zweigstelle\n" +
-                $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?", true);
+                $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?",
+                $"{subject} importieren",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes
+            ) == MessageBoxResult.Yes;
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<MemberHistory> history, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
-                History = (history, ["von exportierten Mitgliedern"]),
                 WbKgs = (wbKgs, ["von exportierten Mitgliedern"]),
             }.Export(filename);
         }
 
-        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<MemberHistory> history, IEnumerable<AreaComContract> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
             return new ElwigExport {
                 Members = (members, filters),
-                History = (history, ["von exportierten Mitgliedern"]),
                 AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
                 WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
             }.Export(filename);
@@ -498,8 +425,7 @@ namespace Elwig.Helpers.Export {
         public class ElwigExport {
             public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
             public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
-            public (IEnumerable<MemberHistory> History, IEnumerable<string> Filters)? History { get; set; }
+            public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
-            public (IEnumerable<AreaComContract> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
 
             public async Task Export(string filename) {
@@ -508,7 +434,7 @@ namespace Elwig.Helpers.Export {
 
                 var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
                 using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                    await writer.WriteAsync("elwig:2");
+                    await writer.WriteAsync("elwig:1");
                 }
 
                 var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
@@ -518,25 +444,20 @@ namespace Elwig.Helpers.Export {
                         ["zwstid"] = App.ZwstId,
                         ["device"] = Environment.MachineName,
                     };
-                    if (WbKgs != null)
+                    if (WbKgs != null) {
                         obj["wb_kgs"] = new JsonObject {
                             ["count"] = WbKgs.Value.WbKgs.Count(),
                             ["filters"] = new JsonArray(WbKgs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
+                    }
                     if (Members != null)
                         obj["members"] = new JsonObject {
                             ["count"] = Members.Value.Members.Count(),
                             ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
-                    if (History != null)
-                        obj["member_history"] = new JsonObject {
-                            ["count"] = History.Value.History.Count(),
-                            ["filters"] = new JsonArray(History.Value.Filters.Select(f => (JsonNode)f).ToArray()),
-                        };
                     if (AreaComs != null)
-                        obj["area_commitment_contracts"] = new JsonObject {
+                        obj["area_commitments"] = new JsonObject {
                             ["count"] = AreaComs.Value.AreaComs.Count(),
-                            ["revisions"] = AreaComs.Value.AreaComs.Sum(c => c.Revisions.Count),
                             ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
                         };
                     if (Deliveries != null)
@@ -563,15 +484,8 @@ namespace Elwig.Helpers.Export {
                         await writer.WriteLineAsync(m.ToJson().ToJsonString(Utils.JsonOpts));
                     }
                 }
-                if (History != null) {
-                    var json = zip.CreateEntry("member_history.json", CompressionLevel.SmallestSize);
-                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
-                    foreach (var h in History.Value.History) {
-                        await writer.WriteLineAsync(h.ToJson().ToJsonString(Utils.JsonOpts));
-                    }
-                }
                 if (AreaComs != null) {
-                    var json = zip.CreateEntry("area_commitment_contracts.json", CompressionLevel.SmallestSize);
+                    var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
                     foreach (var c in AreaComs.Value.AreaComs) {
                         await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
@@ -628,10 +542,7 @@ namespace Elwig.Helpers.Export {
                 ["birthday"] = m.Birthday,
                 ["entry_date"] = m.EntryDate != null ? $"{m.EntryDate:yyyy-MM-dd}" : null,
                 ["exit_date"] = m.ExitDate != null ? $"{m.ExitDate:yyyy-MM-dd}" : null,
-                ["shares"] = m.Shares,
+                ["business_shares"] = m.BusinessShares,
-                ["shares_red"] = m.SharesRed,
-                ["shares_white"] = m.SharesWhite,
-                ["shares_dormant"] = m.SharesDormant,
                 ["accounting_nr"] = m.AccountingNr,
                 ["zwstid"] = m.ZwstId,
                 ["lfbis_nr"] = m.LfbisNr,
@@ -700,10 +611,7 @@ namespace Elwig.Helpers.Export {
                 Birthday = json["birthday"]?.AsValue().GetValue<string>(),
                 EntryDateString = json["entry_date"]?.AsValue().GetValue<string>(),
                 ExitDateString = json["exit_date"]?.AsValue().GetValue<string>(),
-                Shares = json["shares"]?.AsValue().GetValue<int>() ?? json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
+                BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
-                SharesRed = json["shares_red"]?.AsValue().GetValue<int>() ?? 0,
-                SharesWhite = json["shares_white"]?.AsValue().GetValue<int>() ?? 0,
-                SharesDormant = json["shares_dormant"]?.AsValue().GetValue<int>() ?? 0,
                 AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(),
                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
@@ -731,142 +639,42 @@ namespace Elwig.Helpers.Export {
                 CountryNum = a["country"]!.AsValue().GetValue<int>(),
                 PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(),
                 Address = a["address"]!.AsValue().GetValue<string>(),
-            } : null, [.. json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
+            } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
                 MgNr = mgnr,
                 Nr = i + 1,
                 Type = n["type"]!.AsValue().GetValue<string>(),
                 Number = n["number"]!.AsValue().GetValue<string>(),
                 Comment = n["comment"]?.AsValue().GetValue<string>(),
-            })], [.. json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
+            }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
                 MgNr = mgnr,
                 Nr = i + 1,
                 Address = a["address"]!.AsValue().GetValue<string>(),
                 Comment = a["comment"]?.AsValue().GetValue<string>(),
-            })],
+            }).ToList(),
             createdAt == null || modifiedAt == null ? null :
             (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
              DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
-        public static JsonObject ToJson(this MemberHistory h) {
+        public static JsonObject ToJson(this AreaCom c) {
-            return new JsonObject {
-                ["histnr"] = h.HistNr,
-                ["from_mgnr"] = h.FromMgNr,
-                ["from_type"] = h.FromType?.ToString().ToLower(),
-                ["to_mgnr"] = h.ToMgNr,
-                ["to_type"] = h.ToType?.ToString().ToLower(),
-                ["date_notice"] = h.DateNoticeString,
-                ["date_effective"] = h.DateEffectiveString,
-                ["reason"] = h.Reason,
-                ["source"] = h.Source,
-                ["shares"] = h.Shares,
-                ["signed"] = h.MemberHasSigned,
-                ["value_per_share"] = h.ValuePerShare,
-                ["currency"] = h.CurrencyCode,
-                ["deduct_year"] = h.DeductYear,
-                ["comment"] = h.Comment,
-            };
-        }
-
-        public static MemberHistory ToMemberHistory(this JsonNode json) {
-            return new MemberHistory {
-                HistNr = json["histnr"]!.AsValue().GetValue<int>(),
-                FromMgNr = json["from_mgnr"]?.AsValue().GetValue<int>(),
-                FromType = Enum.TryParse<BusinessShareType>(json["from_type"]?.AsValue().GetValue<string>(), true, out var from) ? from : null,
-                ToMgNr = json["to_mgnr"]?.AsValue().GetValue<int>(),
-                ToType = Enum.TryParse<BusinessShareType>(json["to_type"]?.AsValue().GetValue<string>(), true, out var to) ? to : null,
-                DateNoticeString = json["date_notice"]!.AsValue().GetValue<string>(),
-                DateEffectiveString = json["date_effective"]!.AsValue().GetValue<string>(),
-                Reason = json["reason"]!.AsValue().GetValue<string>(),
-                Source = json["source"]!.AsValue().GetValue<string>(),
-                Shares = json["shares"]!.AsValue().GetValue<int>(),
-                MemberHasSigned = json["signed"]?.AsValue().GetValue<bool>() ?? false,
-                ValuePerShare = json["value_per_share"]?.AsValue().GetValue<decimal>(),
-                CurrencyCode = json["currency"]?.AsValue().GetValue<string>(),
-                DeductYear = json["deduct_year"]?.AsValue().GetValue<int>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
-            };
-        }
-
-        public static JsonObject ToJson(this AreaComContract c) {
             return new JsonObject {
                 ["fbnr"] = c.FbNr,
+                ["mgnr"] = c.MgNr,
+                ["vtrgid"] = c.VtrgId,
+                ["cultid"] = c.CultId,
+                ["area"] = c.Area,
                 ["kgnr"] = c.KgNr,
+                ["gstnr"] = c.GstNr,
                 ["ried"] = c.Rd?.Name,
-                ["revisions"] = new JsonArray(c.Revisions.OrderBy(r => r.RevNr).Select(r => r.ToJson()).ToArray()),
+                ["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}",
             };
         }
 
-        private static JsonObject ToJson(this AreaCom c) {
+        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
-            return new JsonObject {
-                ["revnr"] = c.RevNr,
-                ["mgnr"] = c.MgNr,
-                ["vtrgid"] = c.VtrgId,
-                ["cultid"] = c.CultId,
-                ["area"] = c.Area,
-                ["gstnr"] = c.GstNr,
-                ["year_from"] = c.YearFrom,
-                ["year_to"] = c.YearTo,
-                ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
-                ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
-            };
-        }
-
-        public static (AreaComContract, List<(AreaCom, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaComContract(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
-            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
-            var ried = json["ried"]?.AsValue().GetValue<string>();
-            var fbnr = json["fbnr"]!.AsValue()!.GetValue<int>();
-            WbRd? rd = null;
-            bool newRd = false;
-            if (ried != null) {
-                var rde = riede.GetValueOrDefault(kgnr, []);
-                rd = rde.FirstOrDefault(r => r.Name == ried);
-                if (rd == null) {
-                    newRd = true;
-                    rd = new WbRd {
-                        KgNr = kgnr,
-                        RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
-                        Name = ried,
-                    };
-                    rde.Add(rd);
-                    riede[rd.KgNr] = rde;
-                }
-            }
-            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
-            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-            return (new AreaComContract {
-                FbNr = fbnr,
-                KgNr = kgnr,
-                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
-                ImportedAt = DateTime.Now,
-            }, [.. json["revisions"]!.AsArray().Select(r => r!.AsObject()).Select<JsonObject, (AreaCom, (DateTime, DateTime)?)>(r => {
-                var createdAt = json["created_at"]?.AsValue().GetValue<string>();
-                var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-                return (new AreaCom {
-                    FbNr = fbnr,
-                    RevNr = r["revnr"]!.AsValue().GetValue<int>(),
-                    MgNr = r["mgnr"]!.AsValue().GetValue<int>(),
-                    VtrgId = r["vtrgid"]!.AsValue().GetValue<string>(),
-                    CultId = r["cultid"]?.AsValue().GetValue<string>(),
-                    Area = r["area"]!.AsValue().GetValue<int>(),
-                    GstNr = r["gstnr"]?.AsValue().GetValue<string>() ?? "-",
-                    YearFrom = r["year_from"]?.AsValue().GetValue<int>(),
-                    YearTo = r["year_to"]?.AsValue().GetValue<int>(),
-                    ImportedAt = DateTime.Now,
-                }, createdAt == null || modifiedAt == null ? null :
-                (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
-                 DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
-            })], newRd ? rd : null,
-            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 (AreaComContract, AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             WbRd? rd = null;
@@ -887,22 +695,18 @@ namespace Elwig.Helpers.Export {
             }
             var createdAt = json["created_at"]?.AsValue().GetValue<string>();
             var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
-            return (new AreaComContract {
+            return (new AreaCom {
                 FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
-                KgNr = kgnr,
-                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
-                ImportedAt = DateTime.Now,
-            }, new AreaCom {
-                FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
-                RevNr = 1,
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(),
                 CultId = json["cultid"]?.AsValue().GetValue<string>(),
                 Area = json["area"]!.AsValue().GetValue<int>(),
+                KgNr = kgnr,
                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
+                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
                 YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
             }, newRd ? rd : null,
             createdAt == null || modifiedAt == null ? null :
@@ -919,45 +723,43 @@ namespace Elwig.Helpers.Export {
                 ["lnr"] = d.LNr,
                 ["time"] = d.Time != null ? $"{d.Time:HH:mm:ss}" : null,
                 ["mgnr"] = d.MgNr,
-                ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => p.ToJson()).ToArray()),
+                ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => {
+                    var obj = new JsonObject {
+                        ["dpnr"] = p.DPNr,
+                        ["sortid"] = p.SortId,
+                        ["attrid"] = p.AttrId,
+                        ["cultid"] = p.CultId,
+                        ["weight"] = p.Weight,
+                        ["kmw"] = p.Kmw,
+                        ["qualid"] = p.QualId,
+                        ["hkid"] = p.HkId,
+                        ["kgnr"] = p.KgNr,
+                        ["ried"] = p.Rd?.Name,
+                        ["net_weight"] = p.IsNetWeight,
+                        ["manual_weighing"] = p.IsManualWeighing,
+                        ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
+                        ["comment"] = p.Comment,
+                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+                    };
+                    if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
+                    if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
+                    if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
+                    if (p.Unloading != null) obj["unloading"] = p.Unloading;
+                    if (p.Temperature != null) obj["temperature"] = p.Temperature;
+                    if (p.Acid != null) obj["acid"] = p.Acid;
+                    if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
+                    if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
+                    if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
+                    return obj;
+                }).ToArray()),
                 ["comment"] = d.Comment,
                 ["created_at"] = $"{d.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
                 ["modified_at"] = $"{d.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
             };
         }
 
-        private static JsonObject ToJson(this DeliveryPart p) {
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
-            var obj = new JsonObject {
-                ["dpnr"] = p.DPNr,
-                ["sortid"] = p.SortId,
-                ["attrid"] = p.AttrId,
-                ["cultid"] = p.CultId,
-                ["weight"] = p.Weight,
-                ["kmw"] = p.Kmw,
-                ["qualid"] = p.QualId,
-                ["hkid"] = p.HkId,
-                ["kgnr"] = p.KgNr,
-                ["ried"] = p.Rd?.Name,
-                ["net_weight"] = p.IsNetWeight,
-                ["manual_weighing"] = p.IsManualWeighing,
-                ["modids"] = new JsonArray(p.PartModifiers.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;
-            if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
-            if (p.Unloading != null) obj["unloading"] = p.Unloading;
-            if (p.Temperature != null) obj["temperature"] = p.Temperature;
-            if (p.Acid != null) obj["acid"] = p.Acid;
-            if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
-            if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
-            if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
-            return obj;
-        }
-
-        public static (Delivery, List<(DeliveryPart, (DateTime CreatedAt, DateTime ModifiedAt)?)>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -980,7 +782,7 @@ namespace Elwig.Helpers.Export {
                 MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
-            }, [.. json["parts"]!.AsArray().Select(p => p!.AsObject()).Select<JsonObject, (DeliveryPart, (DateTime, DateTime)?)>(p => {
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
                 var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
                 var ried = p["ried"]?.AsValue().GetValue<string>();
                 WbRd? rd = null;
@@ -998,9 +800,7 @@ namespace Elwig.Helpers.Export {
                         wbRde.Add(rd);
                     }
                 }
-                var createdAt = p["created_at"]?.AsValue().GetValue<string>();
+                return new DeliveryPart {
-                var modifiedAt = p["modified_at"]?.AsValue().GetValue<string>();
-                return (new DeliveryPart {
                     Year = year,
                     DId = did,
                     DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
@@ -1025,15 +825,13 @@ namespace Elwig.Helpers.Export {
                     ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
                     WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
                     WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
-                }, createdAt == null || modifiedAt == null ? null :
+                };
-                (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+            }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
-                 DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
-            })], [.. json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
                 Year = year,
                 DId = did,
                 DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
                 ModId = m!.AsValue().GetValue<string>(),
-            }))],
+            })).ToList(),
             wbRde,
             createdAt == null || modifiedAt == null ? null :
             (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),

Elwig/Helpers/Extensions.cs

@@ -4,14 +4,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.IO.Hashing;
-using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
 
 namespace Elwig.Helpers {
     public static partial class Extensions {
@@ -148,28 +145,5 @@ namespace Elwig.Helpers {
             }
             return [.. list];
         }
-
-        public static IEnumerable<T> Join<T>(this IEnumerable<T> src, Func<T> separatorFactory) {
-            var srcArr = src.ToArray();
-            for (int i = 0; i < srcArr.Length; i++) {
-                yield return srcArr[i];
-                if (i < srcArr.Length - 1) {
-                    yield return separatorFactory();
-                }
-            }
-        }
-
-        public static void AddToolTipCell(this 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,
-                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
-                Margin = new(0, 12 * row, 0, 0),
-                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
-            };
-            tb.SetValue(Grid.ColumnProperty, col);
-            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
-            grid.Children.Add(tb);
-        }
-
     }
 }

Elwig/Helpers/Printing/Pdf.cs

@@ -1,8 +1,8 @@
-using Elwig.Services;
 using Elwig.Windows;
 using System;
 using System.Drawing.Printing;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
@@ -46,8 +46,8 @@ namespace Elwig.Helpers.Printing {
                     PrinterSettings = settings,
                 };
                 printDoc.Print();
-            } catch (Exception exc) {
+            } catch (Exception e) {
-                InteractionService.ShowException("Fehler beim Drucken", "Beim Drucken ist ein Fehler aufgetreten", exc);
+                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             return Task.CompletedTask;
         }

Elwig/Helpers/Utils.cs

@@ -3,12 +3,12 @@ using Elwig.Documents;
 using Elwig.Helpers.Billing;
 using Elwig.Models;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using iText.Layout.Element;
 using LinqKit;
 using MailKit.Net.Smtp;
 using MailKit.Security;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
 using MimeKit;
 using System;
 using System.Collections;
@@ -31,7 +31,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Markup;
 
 namespace Elwig.Helpers {
@@ -210,29 +209,16 @@ namespace Elwig.Helpers {
             return Regex.Replace(iban.Trim(), ".{4}", "$0 ").Trim();
         }
 
-        public static void RunBackground(string title, Func<Task> function) {
+        public static void RunBackground(string title, Func<Task> a) {
             Task.Run(async () => {
                 try {
-                    await function();
+                    await a();
-                } catch (Exception exc) {
+                } catch (Exception e) {
-                    InteractionService.ShowException(title, exc);
+                    MessageBox.Show(e.ToString(), title, MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
         }
 
-        public static async Task RunForeground(Func<Task> function) {
-            var isSTA = Thread.CurrentThread.GetApartmentState() == ApartmentState.STA;
-            if (isSTA) Mouse.OverrideCursor = Cursors.Wait;
-            await Task.Run(async () => {
-                try {
-                    await function();
-                } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
-                }
-            });
-            if (isSTA) Mouse.OverrideCursor = null;
-        }
-
         public static void MailTo(string emailAddress) {
             MailTo([emailAddress]);
         }
@@ -427,8 +413,8 @@ namespace Elwig.Helpers {
             return output.OrderByDescending(l => l.Count());
         }
 
-        public static async Task<List<RawVaribute>> GetVaributes(AppDbContext ctx, int year, bool onlyDelivered = true) {
+        public static List<RawVaribute> GetVaributes(AppDbContext ctx, int year, bool onlyDelivered = true) {
-            var varieties = await ctx.FetchWineVarieties().Select(v => new RawVaribute(v.SortId, "", null)).ToListAsync();
+            var varieties = ctx.WineVarieties.Select(v => new RawVaribute(v.SortId, "", null)).ToList();
             var delivered = ctx.DeliveryParts
                .Where(d => d.Year == year)
                .Select(d => new RawVaribute(d.SortId, d.AttrId ?? "", d.CultId ?? ""))
@@ -437,11 +423,13 @@ namespace Elwig.Helpers {
             return [.. (onlyDelivered ? delivered : delivered.Union(varieties)).Order()];
         }
 
-        public static async Task<List<Varibute>> GetVaributeList(AppDbContext ctx, int year, bool onlyDelivered = true) {
+        public static List<Varibute> GetVaributeList(AppDbContext ctx, int year, bool onlyDelivered = true) {
-            var varieties = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+            var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
-            var attributes = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a);
+            var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-            var cultivations = await ctx.FetchWineCultivations().ToDictionaryAsync(c => c.CultId, c => c);
+            var cultivations = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c);
-            return [.. (await GetVaributes(ctx, year, onlyDelivered)).Select(s => new Varibute(s, varieties, attributes, cultivations))];
+            return GetVaributes(ctx, year, onlyDelivered)
+                .Select(s => new Varibute(s, varieties, attributes, cultivations))
+                .ToList();
         }
 
         [LibraryImport("wininet.dll")]
@@ -457,7 +445,7 @@ namespace Elwig.Helpers {
                 Timeout = TimeSpan.FromSeconds(5),
             };
             client.DefaultRequestHeaders.UserAgent.Clear();
-            client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client?.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})");
+            client.DefaultRequestHeaders.UserAgent.ParseAdd($"Elwig/{App.Version} ({App.Client.NameToken}, {App.BranchName}, {Environment.MachineName}, {Environment.OSVersion})");
             client.DefaultRequestHeaders.Accept.Clear();
             if (accept != null)
                 client.DefaultRequestHeaders.Accept.Add(new(accept));
@@ -551,7 +539,7 @@ namespace Elwig.Helpers {
                             subject, docs.Select(d => d.Title).ToArray()
                         )]);
                 } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     return false;
                 } finally {
                     if (client != null)
@@ -565,40 +553,41 @@ namespace Elwig.Helpers {
         public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member Member, string Subject, string Text)? emailData = null) {
             if (mode == ExportMode.Print && !App.Config.Debug) {
                 if (doc.IsPreview) {
-                    InteractionService.ShowError("Vorläufiges Dokument", "Dieses Dokument ist als vorläufig markiert und kann daher nicht ausgedruckt werden!");
+                    MessageBox.Show("Dieses Dokument ist als vorläufig markiert und kann daher nicht ausgedruckt werden!",
+                        "Vorläufiges Dokument", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
-                using (var ctx = new AppDbContext()) {
+                await doc.Generate();
-                    await doc.Generate(ctx);
-                }
                 await doc.Print();
             } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
                 if (doc.IsPreview) {
-                    InteractionService.ShowError("Vorläufiges Dokument", "Dieses Dokument ist als vorläufig markiert und kann daher nicht verschickt werden!");
+                    MessageBox.Show("Dieses Dokument ist als vorläufig markiert und kann daher nicht verschickt werden!",
+                        "Vorläufiges Dokument", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
                 }
-                using (var ctx = new AppDbContext()) {
+                await doc.Generate();
-                    await doc.Generate(ctx);
-                }
                 var success = await SendEmail(e.Member, e.Subject, e.Text, [doc]);
                 if (success)
-                    InteractionService.ShowInformation("E-Mail verschickt", "Die E-Mail wurde erfolgreich verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mail im Posteingang des Empfängers aufscheint.");
+                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mail im Posteingang des Empfängers aufscheint.", "E-Mail verschickt",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
             } else if (mode == ExportMode.SavePdf) {
                 if (doc.IsPreview) {
-                    InteractionService.ShowWarning("Vorläufiges Dokument", "Dieses Dokument ist als vorläufig markiert und sollte daher nicht langfristig gespeichert werden!");
+                    MessageBox.Show("Dieses Dokument ist als vorläufig markiert und sollte daher nicht langfristig gespeichert werden!",
+                        "Vorläufiges Dokument", MessageBoxButton.OK, MessageBoxImage.Warning);
                 }
-                filename = InteractionService.SaveFile(doc.Title, NormalizeFileName(filename ?? doc.Title), "pdf");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = $"{NormalizeFileName(filename ?? doc.Title)}.pdf",
-                    using (var ctx = new AppDbContext()) {
+                    DefaultExt = "pdf",
-                        await doc.Generate(ctx);
+                    Filter = "PDF-Datei (*.pdf)|*.pdf",
-                    }
+                    Title = $"{doc.Title} speichern unter - Elwig"
-                    doc.SaveTo(filename);
+                };
-                    if (!App.Config.Debug) Process.Start("explorer.exe", filename);
+                if (d.ShowDialog() == true) {
+                    await doc.Generate();
+                    doc.SaveTo(d.FileName);
+                    Process.Start("explorer.exe", d.FileName);
                 }
             } else {
-                using (var ctx = new AppDbContext()) {
+                await doc.Generate();
-                    await doc.Generate(ctx);
-                }
                 doc.Show();
             }
         }

Elwig/Helpers/Validator.cs

@@ -136,7 +136,8 @@ namespace Elwig.Helpers {
                 return new(false, "PLZ zu kurz");
             }
             using var ctx = new AppDbContext();
-            if (!int.TryParse(input.Text, out var plz) || ctx.Postleitzahlen.Find(plz) == null) {
+            int plz = int.Parse(input.Text);
+            if (ctx.Postleitzahlen.Find(plz) == null) {
                 return new(false, "Ungültige PLZ");
             }
             return new(true, null);
@@ -422,7 +423,8 @@ namespace Elwig.Helpers {
             }
 
             using var ctx = new AppDbContext();
-            if (!int.TryParse(input.Text, out var nr) || !ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
+            int nr = int.Parse(input.Text);
+            if (!ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Ungültige Mitgliedsnummer");
             }
 
@@ -438,7 +440,8 @@ namespace Elwig.Helpers {
             }
 
             using var ctx = new AppDbContext();
-            if (!int.TryParse(input.Text, out var nr) || nr != m?.MgNr && ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
+            int nr = int.Parse(input.Text);
+            if (nr != m?.MgNr && ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Mitgliedsnummer wird bereits verwendet");
             }
 
@@ -473,7 +476,7 @@ namespace Elwig.Helpers {
                 return res;
             } else if (!required && input.Text.Length == 0) {
                 return new(true, null);
-            } else if (!int.TryParse(input.Text, out var nr) ||!ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
+            } else if (!ctx.MgNrExists(int.Parse(input.Text)).GetAwaiter().GetResult()) {
                 return new(false, "Ein Mitglied mit dieser Mitgliedsnummer existiert nicht");
             }
 
@@ -534,7 +537,7 @@ namespace Elwig.Helpers {
                     return (parts[0]?.Length == 4) ? new(true, null) : new(false, "Datum ist ungültig");
                 } else if (p == 1) {
                     // only month and year provided
-                    int m = parts[0] != null && parts[0] != "" && int.TryParse(parts[0], out var v) ? v : 0;
+                    int m = parts[0] != null && parts[0] != "" ? int.Parse(parts[0] ?? "0") : 0;
                     if (parts[1]?.Length != 4 || parts[0]?.Length != 2 || m < 1 || m > 12)
                         return new(false, "Datum ist ungültig");
                     return new(true, null);
@@ -577,7 +580,7 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaComContract? c) {
+        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;
@@ -586,7 +589,8 @@ namespace Elwig.Helpers {
             }
 
             using var ctx = new AppDbContext();
-            if (!int.TryParse(input.Text, out var nr) || (nr != c?.FbNr && ctx.FbNrExists(nr).GetAwaiter().GetResult())) {
+            int nr = int.Parse(input.Text);
+            if (nr != c?.FbNr && ctx.FbNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Flächenbindungsnummer wird bereits verwendet");
             }
 
@@ -601,7 +605,8 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
-            if (!double.TryParse(input.Text, out var oe) || oe < 10 || oe >= 300) {
+            var oe = double.Parse(input.Text);
+            if (oe < 10 || oe >= 300) {
                 return new(false, "Ungültiger Oechsle-Wert");
             }
 
@@ -616,7 +621,8 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
-            if (!double.TryParse(input.Text, out var kmw) || kmw < 5 || kmw >= 50) {
+            var kmw = double.Parse(input.Text);
+            if (kmw < 5 || kmw >= 50) {
                 return new(false, "Ungültiger KMW-Wert");
             }
 

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -1,9 +1,9 @@
-using Elwig.Services;
 using System;
 using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Weighing {
     public class AveryEventScale : Scale, IEventScale, IDisposable {
@@ -60,8 +60,9 @@ namespace Elwig.Helpers.Weighing {
                 } catch (TimeoutException) {
                     await Task.Delay(500);
                     await Reconnect();
-                } catch (Exception exc) {
+                } catch (Exception ex) {
-                    InteractionService.ShowException("Waagenfehler", "Beim Wiegen ist ein Fehler Aufgetreten", exc, showExcType: true);
+                    MessageBox.Show($"Beim Wiegen ist ein Fehler Aufgetreten:\n\n{ex.Message} ({ex.GetType().Name})", "Waagenfehler",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
         }

Elwig/Helpers/Weighing/Scale.cs

@@ -1,9 +1,9 @@
-using Elwig.Services;
 using System;
 using System.IO;
 using System.IO.Ports;
 using System.Net.Sockets;
 using System.Text;
+using System.Windows;
 
 namespace Elwig.Helpers.Weighing {
     public abstract class Scale : IDisposable {
@@ -42,10 +42,11 @@ namespace Elwig.Helpers.Weighing {
             if (cnx.StartsWith("serial:")) {
                 try {
                     Serial = Utils.OpenSerialConnection(cnx);
-                } catch (Exception exc) {
+                } catch (Exception e) {
                     if (!softFail) throw;
                     if (!failSilent)
-                        InteractionService.ShowException("Waagenfehler", "Verbindung zu Waage konnte nicht hergestellt werden", exc, isError: false);
+                        MessageBox.Show($"Verbindung zu Waage konnte nicht hergestellt werden:\n\n{e.Message}", "Waagenfehler",
+                            MessageBoxButton.OK, MessageBoxImage.Warning);
                 }
                 Stream = Serial?.BaseStream ?? Stream.Null;
             } else if (cnx.StartsWith("tcp:")) {

Elwig/Models/BusinessShareType.cs

@@ -1,5 +0,0 @@
-namespace Elwig.Models {
-    public enum BusinessShareType {
-        Normal = 1, Red = 2, White = 3, Dormant = 9,
-    }
-}

Elwig/Models/Dtos/CreditNoteData.cs

@@ -17,7 +17,6 @@ namespace Elwig.Models.Dtos {
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
-            ("AccountingNr", "BH-Konto", null, 20),
             ("Iban", "IBAN", null, 45),
             ("TgNr", "TG-Nr.", null, 20),
             ("Sum", "Zwischens.", "€", 20),
@@ -30,7 +29,7 @@ namespace Elwig.Models.Dtos {
             ("Gross", "Brutto", "€", 20),
             ("Penalties", "Pönalen FB", "€", 20),
             ("Penalty", "Unterl. GA", "€", 20),
-            ("AutoShares", "GA Nachz.", "€", 20),
+            ("AutoBs", "GA Nachz.", "€", 20),
             ("Custom", "Weitere", "€", 20),
             ("Others", "Sonstige", "€", 20),
             ("Considered", "Berückstgt.", "€", 20),
@@ -54,12 +53,12 @@ namespace Elwig.Models.Dtos {
                 SELECT m.mgnr, m.name AS name_1,
                        COALESCE(m.prefix || ' ', '') || m.given_name ||
                        COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
-                       p.plz, o.name AS ort, m.address, m.accounting_nr, m.iban, c.tgnr, s.year, s.precision,
+                       p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
                        p.amount - p.net_amount AS surcharge,
                        c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
-                       ROUND(b.total_penalty / POW(10, s.precision - 2)) AS shares_penalty,
+                       ROUND(b.total_penalty / POW(10, s.precision - 2)) AS bs_penalty,
-                       ROUND(u.total_penalty / POW(10, 4 - 2)) AS ac_penalty,
+                       ROUND(u.total_penalty / POW(10, 4 - 2)) AS fb_penalty,
-                       -a.total_amount AS auto_shares,
+                       ROUND(-a.total_amount / POW(10, s.precision - 2)) AS auto_bs,
                        x.amount AS custom_mod
                 FROM credit c
                     LEFT JOIN member m ON m.mgnr = c.mgnr
@@ -84,7 +83,6 @@ namespace Elwig.Models.Dtos {
         public string Address;
         public int Plz;
         public string Locality;
-        public string? AccountingNr;
         public string? Iban;
         public string TgNr;
         public decimal Sum;
@@ -96,7 +94,7 @@ namespace Elwig.Models.Dtos {
         public decimal Gross;
         public decimal? Penalties;
         public decimal? Penalty;
-        public decimal? AutoShares;
+        public decimal? AutoBs;
         public decimal? Custom;
         public decimal? Others;
         public decimal? Considered;
@@ -110,7 +108,6 @@ namespace Elwig.Models.Dtos {
             Address = row.Address;
             Plz = row.Plz;
             Locality = row.Locality;
-            AccountingNr = row.AccountingNr;
             Iban = row.Iban != null ? Utils.FormatIban(row.Iban) : null;
             TgNr = $"{row.Year}/{row.TgNr}";
             Total = Utils.DecFromDb(row.NetAmount, prec1);
@@ -125,14 +122,14 @@ namespace Elwig.Models.Dtos {
             }
             decimal mod = (row.Modifiers == null) ? 0 : Utils.DecFromDb((long)row.Modifiers, prec1);
             if (data.ConsiderContractPenalties)
-                Penalties = (row.AcPenalty == null) ? null : Utils.DecFromDb((long)row.AcPenalty, prec1);
+                Penalties = (row.FbPenalty == null) ? null : Utils.DecFromDb((long)row.FbPenalty, prec1);
             if (data.ConsiderTotalPenalty)
-                Penalty = (row.SharesPenalty == null) ? null : Utils.DecFromDb((long)row.SharesPenalty, prec1);
+                Penalty = (row.BsPenalty == null) ? null : Utils.DecFromDb((long)row.BsPenalty, prec1);
             if (data.ConsiderAutoBusinessShares)
-                AutoShares = (row.AutoShares == null) ? null : Utils.DecFromDb((long)row.AutoShares, prec1);
+                AutoBs = (row.AutoBs == null) ? null : Utils.DecFromDb((long)row.AutoBs, prec1);
             if (data.ConsiderCustomModifiers)
                 Custom = (row.CustomMod == null) ? null : Utils.DecFromDb((long)row.CustomMod, prec1);
-            mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoShares ?? 0) + (Custom ?? 0);
+            mod -= (Penalties ?? 0) + (Penalty ?? 0) + (AutoBs ?? 0) + (Custom ?? 0);
             Others = (mod == 0) ? null : mod;
             Gross = Utils.DecFromDb(row.GrossAmount, prec1);
             Considered = (row.PrevModifiers == null || row.PrevModifiers == 0) ? null : -Utils.DecFromDb((long)row.PrevModifiers, prec1);
@@ -156,8 +153,6 @@ namespace Elwig.Models.Dtos {
         public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
-        [Column("accounting_nr")]
-        public string? AccountingNr { get; set; }
         [Column("iban")]
         public string? Iban { get; set; }
         [Column("year")]
@@ -184,12 +179,12 @@ namespace Elwig.Models.Dtos {
         public long? PrevModifiers { get; set; }
         [Column("amount")]
         public long Amount { get; set; }
-        [Column("shares_penalty")]
+        [Column("bs_penalty")]
-        public long? SharesPenalty { get; set; }
+        public long? BsPenalty { get; set; }
-        [Column("ac_penalty")]
+        [Column("fb_penalty")]
-        public long? AcPenalty { get; set; }
+        public long? FbPenalty { get; set; }
-        [Column("auto_shares")]
+        [Column("auto_bs")]
-        public long? AutoShares { get; set; }
+        public long? AutoBs { get; set; }
         [Column("custom_mod")]
         public long? CustomMod { get; set; }
     }

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -28,9 +28,9 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<PaymentVar> paymentVariants, int year, int avnr) {
-            var variant = await paymentVariants.Include(v => v.Season.Modifiers).Where(v => v.Year == year && v.AvNr == avnr).SingleAsync();
+            var variant = await paymentVariants.FindAsync(year, avnr);
             BillingData? varData = null;
-            try { varData = variant.Data != null ? BillingData.FromJson(variant.Data) : null; } catch { }
+            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 },
@@ -42,10 +42,13 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<CreditNoteDeliveryRowSingle>> FromDbSet(DbSet<CreditNoteDeliveryRowSingle> table, int? year = null, int? avnr = null, int? mgnr = null) {
-            return await table.FromSql($"""
+            var y = year?.ToString() ?? "NULL";
+            var v = avnr?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            return await table.FromSqlRaw($"""
                 SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
                        b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
-                       s.name AS variety, s.type AS type, a.name AS attribute, c.name AS cultivation, q.qualid AS qualid, q.name AS quality_level, d.oe, d.kmw, d.net_weight
+                       s.name AS variety, a.name AS attribute, c.name AS cultivation, q.qualid AS qualid, q.name AS quality_level, d.oe, d.kmw, d.net_weight
                 FROM v_delivery d
                     JOIN wine_variety s ON s.sortid = d.sortid
                     LEFT JOIN wine_attribute a ON a.attrid = d.attrid
@@ -56,7 +59,7 @@ namespace Elwig.Models.Dtos {
                     LEFT JOIN payment_delivery_part p ON (p.year, p.did, p.dpnr, p.avnr) = (d.year, d.did, d.dpnr, v.avnr)
                     LEFT JOIN payment_delivery_part_bucket pb ON (pb.year, pb.did, pb.dpnr, pb.bktnr, pb.avnr) = (b.year, b.did, b.dpnr, b.bktnr, v.avnr)
                     LEFT JOIN credit c ON (c.year, c.avnr, c.mgnr) = (d.year, v.avnr, d.mgnr)
-                WHERE b.value > 0 AND (d.year = {year} OR {year} IS NULL) AND (v.avnr = {avnr} OR {avnr} IS NULL) AND (d.mgnr = {mgnr} OR {mgnr} IS NULL)
+                WHERE b.value > 0 AND (d.year = {y} OR {y} IS NULL) AND (v.avnr = {v} OR {v} IS NULL) AND (d.mgnr = {m} OR {m} IS NULL)
                 ORDER BY d.year, v.avnr, d.mgnr, d.lsnr, d.dpnr
                 """).ToListAsync();
         }
@@ -72,7 +75,6 @@ namespace Elwig.Models.Dtos {
         public string LsNr;
         public int DPNr;
         public string Variety;
-        public string Type;
         public string? Attribute;
         public string? Cultivation;
         public string[] Modifiers;
@@ -95,24 +97,24 @@ namespace Elwig.Models.Dtos {
             LsNr = f.LsNr;
             DPNr = f.DPNr;
             Variety = f.Variety;
-            Type = f.Type;
             Attribute = f.Attribute;
             Cultivation = f.Cultivation;
             var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
                 .Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
                 .Where(m => m != null)
-                .OrderBy(m => m!.Ordering)
+                .OrderBy(m => m.Ordering)
                 .ToList();
-            Modifiers = [.. modifiers.Select(m => m.Name)];
+            Modifiers = modifiers.Select(m => m.Name).ToArray();
             QualId = f.QualId;
             QualityLevel = f.QualityLevel;
             Gradation = (f.Oe, f.Kmw);
-            Buckets = [.. rows
+            Buckets = rows
                 .Where(b => b.Value > 0)
                 .OrderByDescending(b => b.BktNr)
                 .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {f.SortId}{b.Discr}", b.Value,
                               b.Price != null ? season?.DecFromDb((long)b.Price) : null,
-                              b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))];
+                              b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
+                .ToArray();
             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;
@@ -159,8 +161,6 @@ namespace Elwig.Models.Dtos {
         public long? TotalAmount { get; set; }
         [Column("variety")]
         public required string Variety { get; set; }
-        [Column("type")]
-        public required string Type { get; set; }
         [Column("attribute")]
         public string? Attribute { get; set; }
         [Column("cultivation")]

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -28,7 +28,12 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<DeliveryAncmtListData> FromQuery(IQueryable<DeliveryAncmt> query, List<string> filterNames) {
-            return new((await query.ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
+            return new((await query
+                .Include(a => a.Schedule.Branch)
+                .Include(a => a.Member)
+                .Include(a => a.Variety)
+                .AsSplitQuery()
+                .ToListAsync()).Select(d => new DeliveryAncmtListRow(d)), filterNames);
         }
     }
 

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -52,8 +52,12 @@ namespace Elwig.Models.Dtos {
             if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
             await q
                  .Include(p => p.Delivery)
+                 .Include(p => p.Variety)
+                 .Include(p => p.Attribute)
+                 .Include(p => p.Quality)
                  .Include(p => p.Buckets)
-                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                 .Include(p => p.PartModifiers)
+                 .ThenInclude(m => m.Modifier)
                  .LoadAsync();
             return await table.FromSqlRaw($"""
                     SELECT p.*
@@ -61,7 +65,7 @@ namespace Elwig.Models.Dtos {
                         JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
                     WHERE (p.year = {y} OR {y} IS NULL) AND (v.mgnr = {m} OR {m} IS NULL)
                     ORDER BY p.year, v.mgnr, v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
-                    """).IgnoreAutoIncludes().ToListAsync();
+                    """).ToListAsync();
         }
     }
 

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -40,7 +40,12 @@ namespace Elwig.Models.Dtos {
                 .Include(p => p.Delivery.Member.Branch)
                 .Include(p => p.Delivery.Branch)
                 .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                .Include(p => p.Variety)
+                .Include(p => p.Attribute)
+                .Include(p => p.Cultivation)
                 .Include(p => p.Origin)
+                .Include(p => p.Quality)
+                .AsSplitQuery()
                 .ToListAsync()).Select(d => new DeliveryJournalRow(d)), filterNames);
         }
     }

Elwig/Models/Dtos/MemberDeliveryData.cs

@@ -8,7 +8,7 @@ namespace Elwig.Models.Dtos {
     public class MemberDeliveryData : DataTable<MemberDeliveryRow> {
 
         private static readonly (string, string, string?, int?)[] FieldNames = [
-            ("MgNr", "MgNr.", null, 12),
+          ("MgNr", "MgNr.", null, 12),
             ("Name1", "Name", null, 40),
             ("Name2", "Vorname", null, 40),
             ("Address", "Adresse", null, 60),

Elwig/Models/Dtos/MemberListData.cs

@@ -19,7 +19,7 @@ namespace Elwig.Models.Dtos {
             ("Locality", "Ort", null, 60),
             ("DefaultKg", "Stammgemeinde", null, 60),
             ("Branch", "Zweigstelle", null, 40),
-            ("SharesActive", "GA", null, 10),
+            ("BusinessShares", "GA", null, 10),
             ("BillingName", "Rechnungsname", null, 60),
             ("BillingAddress", "Rechnungsadresse", null, 60),
             ("BillingPlz", "PLZ", null, 10),
@@ -47,11 +47,15 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCom) {
-            var areaComs = await query.Include(m => m.AreaCommitments).ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
+            var areaComs = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
             return new((await query
+                .Include(m => m.DefaultWbKg!.AtKg)
                 .Include(m => m.Branch)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
                 .Include(m => m.TelephoneNumbers)
                 .Include(m => m.EmailAddresses)
+                .AsSplitQuery()
                 .ToListAsync()).Select(m => new MemberListRow(m,
                     areaComs[m.MgNr].Sum(c => c.Area),
                     areaComs[m.MgNr].Where(c => filterAreaCom.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),
@@ -66,10 +70,7 @@ namespace Elwig.Models.Dtos {
         public string? Name2;
         public string? DefaultKg;
         public string? Branch;
-        public int Shares;
+        public int BusinessShares;
-        public int SharesRed;
-        public int SharesWhite;
-        public int SharesActive;
         public string Address;
         public int Plz;
         public string Locality;
@@ -101,10 +102,7 @@ namespace Elwig.Models.Dtos {
             Name2 = m.AdministrativeName2;
             DefaultKg = m.DefaultKg?.Name;
             Branch = m.Branch?.Name;
-            Shares = m.Shares;
+            BusinessShares = m.BusinessShares;
-            SharesRed = m.SharesRed;
-            SharesWhite = m.SharesWhite;
-            SharesActive = Shares + SharesRed + SharesWhite;
             Address = m.Address;
             Plz = m.PostalDest.AtPlz!.Plz;
             Locality = m.PostalDest.AtPlz!.Ort.Name;

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -13,74 +13,35 @@ namespace Elwig.Models.Dtos {
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
-            ("Shares", "GA", null, 10),
+            ("BusinessShares", "GA", null, 10),
             ("DeliveryObligation", "Lieferpflicht", "kg", 22),
             ("DeliveryRight", "Lieferrecht", "kg", 22),
-            ("WeightTotal", "Geliefert", "kg", 22),
+            ("Weight", "Geliefert", "kg", 22),
             ("OverUnderDelivery", "Über-/Unterliefert", "kg|%", 34),
         ];
 
-        private static readonly (string, string, string?, int)[] FieldNamesRed = [
-            ("MgNr", "MgNr.", null, 12),
-            ("Name1", "Name", null, 40),
-            ("Name2", "Vorname", null, 40),
-            ("Address", "Adresse", null, 60),
-            ("Plz", "PLZ", null, 10),
-            ("Locality", "Ort", null, 60),
-            ("SharesRed", "GA", null, 10),
-            ("DeliveryObligationRed", "Lieferpflicht", "kg", 22),
-            ("DeliveryRightRed", "Lieferrecht", "kg", 22),
-            ("WeightRed", "Geliefert", "kg", 22),
-            ("OverUnderDeliveryRed", "Über-/Unterliefert", "kg|%", 34),
-        ];
-
-        private static readonly (string, string, string?, int)[] FieldNamesWhite = [
-            ("MgNr", "MgNr.", null, 12),
-            ("Name1", "Name", null, 40),
-            ("Name2", "Vorname", null, 40),
-            ("Address", "Adresse", null, 60),
-            ("Plz", "PLZ", null, 10),
-            ("Locality", "Ort", null, 60),
-            ("SharesWhite", "GA", null, 10),
-            ("DeliveryObligationWhite", "Lieferpflicht", "kg", 22),
-            ("DeliveryRightWhite", "Lieferrecht", "kg", 22),
-            ("WeightWhite", "Geliefert", "kg", 22),
-            ("OverUnderDeliveryWhite", "Über-/Unterliefert", "kg|%", 34),
-        ];
-
         public OverUnderDeliveryData(IEnumerable<OverUnderDeliveryRow> rows, int year) :
             base($"Über-Unterlieferungen", $"Über- und Unterlieferungen laut gezeichneten Geschäftsanteilen {year}", rows, FieldNames) {
         }
 
-        public OverUnderDeliveryData(IEnumerable<OverUnderDeliveryRow> rows, int year, string mode) :
+        public static async Task<OverUnderDeliveryData> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
-            base($"Über-Unterlieferungen-{(mode == "R" ? "rot" : "weiß")}", $"Über- und Unterlieferungen laut gezeichneten Geschäftsanteilen {(mode == "R" ? "rot" : "weiß")} {year}", rows,
-                mode == "R" ? FieldNamesRed : FieldNamesWhite) {
-        }
-
-        public static async Task<(OverUnderDeliveryData Total, OverUnderDeliveryData Red, OverUnderDeliveryData White)> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
             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,
-                       p.plz, o.name AS ort, m.address, h.shares, h.shares_red, h.shares_white,
+                       p.plz, o.name AS ort, m.address, m.business_shares,
-                       h.shares * COALESCE(s.min_kg_per_share, 0) AS min_kg,
+                       m.business_shares * s.min_kg_per_bs AS min_kg,
-                       h.shares * COALESCE(s.max_kg_per_share, 0) AS max_kg,
+                       m.business_shares * s.max_kg_per_bs AS max_kg,
-                       h.shares_red * COALESCE(s.min_kg_per_share_red, s.min_kg_per_share, 0) AS min_kg_red,
+                       COALESCE(SUM(d.weight), 0) AS sum
-                       h.shares_red * COALESCE(s.max_kg_per_share_red, s.max_kg_per_share, 0) AS max_kg_red,
-                       h.shares_white * COALESCE(s.min_kg_per_share_white, s.min_kg_per_share, 0) AS min_kg_white,
-                       h.shares_white * COALESCE(s.max_kg_per_share_white, s.max_kg_per_share, 0) AS max_kg_white,
-                       COALESCE(d.weight_total, 0) AS weight_total,
-                       COALESCE(d.weight_red, 0) AS weight_red,
-                       COALESCE(d.weight_white, 0) AS weight_white
                 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 v_member_history h ON (h.year, h.mgnr) = (s.year, m.mgnr)
+                    LEFT JOIN v_delivery d ON (d.year, d.mgnr) = (s.year, m.mgnr)
-                    LEFT JOIN v_stat_member d ON (d.year, d.mgnr) = (s.year, m.mgnr)
+                WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
-                WHERE s.year = {year} AND (m.active = TRUE OR d.weight_total > 0)
+                GROUP BY s.year, m.mgnr
-                ORDER BY 100.0 * weight_total / (max_kg + max_kg_red + max_kg_white), m.mgnr
+                ORDER BY 100.0 * sum / max_kg, m.mgnr
                 """).ToListAsync();
-            return (new OverUnderDeliveryData(rows, year), new OverUnderDeliveryData(rows, year, "R"), new OverUnderDeliveryData(rows, year, "W"));
+            return new OverUnderDeliveryData(rows, year);
         }
     }
 
@@ -100,41 +61,17 @@ namespace Elwig.Models.Dtos {
         public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
-        [Column("shares")]
+        [Column("business_shares")]
-        public int Shares { get; set; }
+        public int BusinessShares { get; set; }
-        [Column("shares_red")]
-        public int SharesRed { get; set; }
-        [Column("shares_white")]
-        public int SharesWhite { get; set; }
         [Column("min_kg")]
         public int DeliveryObligation { get; set; }
         [Column("max_kg")]
         public int DeliveryRight { get; set; }
+        [Column("sum")]
+        public int Weight { get; set; }
         [NotMapped]
         public (int? Kg, double? Percent) OverUnderDelivery =>
-            WeightTotal < DeliveryObligation ? (WeightTotal - DeliveryObligation, WeightTotal * 100.0 / DeliveryObligation - 100.0) :
+            Weight < DeliveryObligation ? (Weight - DeliveryObligation, Weight * 100.0 / DeliveryObligation - 100.0) :
-            WeightTotal > DeliveryRight ? (WeightTotal - DeliveryRight, WeightTotal * 100.0 / DeliveryRight - 100.0) : (null, null);
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100.0) : (null, null);
-        [Column("min_kg_red")]
-        public int DeliveryObligationRed { get; set; }
-        [Column("max_kg_red")]
-        public int DeliveryRightRed { get; set; }
-        [NotMapped]
-        public (int? Kg, double? Percent) OverUnderDeliveryRed =>
-            WeightRed < DeliveryObligationRed ? (WeightRed - DeliveryObligationRed, WeightRed * 100.0 / DeliveryObligationRed - 100.0) :
-            WeightRed > DeliveryRightRed ? (WeightRed - DeliveryRightRed, WeightRed * 100.0 / DeliveryRightRed - 100.0) : (null, null);
-        [Column("min_kg_white")]
-        public int DeliveryObligationWhite { get; set; }
-        [Column("max_kg_white")]
-        public int DeliveryRightWhite { get; set; }
-        [NotMapped]
-        public (int? Kg, double? Percent) OverUnderDeliveryWhite =>
-            WeightWhite < DeliveryObligationWhite ? (WeightWhite - DeliveryObligationWhite, WeightWhite * 100.0 / DeliveryObligationWhite - 100.0) :
-            WeightWhite > DeliveryRightWhite ? (WeightWhite - DeliveryRightWhite, WeightWhite * 100.0 / DeliveryRightWhite - 100.0) : (null, null);
-        [Column("weight_total")]
-        public int WeightTotal { get; set; }
-        [Column("weight_red")]
-        public int WeightRed { get; set; }
-        [Column("weight_white")]
-        public int WeightWhite { get; set; }
     }
 }

Elwig/Models/Entities/AreaCom.cs

@@ -1,16 +1,15 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
-    [Table("area_commitment"), PrimaryKey("FbNr", "RevNr")]
+    [Table("area_commitment"), PrimaryKey("FbNr")]
     public class AreaCom {
         [Column("fbnr")]
         public int FbNr { get; set; }
 
-        [Column("revnr")]
-        public int RevNr { get; set; }
-
         [Column("mgnr")]
         public int MgNr { get; set; }
 
@@ -23,15 +22,24 @@ namespace Elwig.Models.Entities {
         [Column("area")]
         public int Area { get; set; }
 
+        [Column("kgnr")]
+        public int KgNr { get; set; }
+
         [Column("gstnr")]
         public required string GstNr { get; set; }
 
+        [Column("rdnr")]
+        public int? RdNr { get; set; }
+
         [Column("year_from")]
         public int? YearFrom { get; set; }
 
         [Column("year_to")]
         public int? YearTo { get; set; }
 
+        [Column("comment")]
+        public string? Comment { get; set; }
+
         [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
         public long CTime { get; set; }
         [NotMapped]
@@ -64,9 +72,6 @@ namespace Elwig.Models.Entities {
             set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
         }
 
-        [ForeignKey("FbNr")]
-        public virtual AreaComContract Contract { get; private set; } = null!;
-
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;
 
@@ -75,5 +80,17 @@ namespace Elwig.Models.Entities {
 
         [ForeignKey("CultId")]
         public virtual WineCult? WineCult { get; private set; }
+
+        [ForeignKey("KgNr")]
+        public virtual WbKg Kg { get; private set; } = null!;
+
+        [ForeignKey("KgNr, RdNr")]
+        public virtual WbRd? Rd { get; private set; }
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            return Utils.GetSearchScore([
+                 WineCult?.Name, Kg.AtKg.Name, Rd?.Name, GstNr, Comment,
+            ], keywords);
+        }
     }
 }

Elwig/Models/Entities/AreaComContract.cs

@@ -1,78 +0,0 @@
-using Elwig.Helpers;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-
-namespace Elwig.Models.Entities {
-    [Table("area_commitment_contract"), PrimaryKey("FbNr")]
-    public class AreaComContract {
-        [Column("fbnr")]
-        public int FbNr { get; set; }
-
-        [Column("kgnr")]
-        public int KgNr { get; set; }
-
-        [Column("rdnr")]
-        public int? RdNr { get; set; }
-
-        [Column("comment")]
-        public string? Comment { get; set; }
-
-        [Column("ctime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long CTime { get; set; }
-        [NotMapped]
-        public DateTime CreatedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
-            set => CTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
-
-        [Column("mtime"), DatabaseGenerated(DatabaseGeneratedOption.Computed)]
-        public long MTime { get; set; }
-        [NotMapped]
-        public DateTime ModifiedAt {
-            get => DateTimeOffset.FromUnixTimeSeconds(MTime).LocalDateTime;
-            set => MTime = ((DateTimeOffset)value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
-
-        [Column("xtime")]
-        public long? XTime { get; set; }
-        [NotMapped]
-        public DateTime? ExportedAt {
-            get => XTime == null ? null : DateTimeOffset.FromUnixTimeSeconds(XTime.Value).LocalDateTime;
-            set => XTime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
-
-        [Column("itime")]
-        public long? ITime { get; set; }
-        [NotMapped]
-        public DateTime? ImportedAt {
-            get => ITime == null ? null : DateTimeOffset.FromUnixTimeSeconds(ITime.Value).LocalDateTime;
-            set => ITime = value == null ? null : ((DateTimeOffset)value.Value.ToUniversalTime()).ToUnixTimeSeconds();
-        }
-
-        [ForeignKey("KgNr")]
-        public virtual WbKg Kg { get; private set; } = null!;
-
-        [ForeignKey("KgNr, RdNr")]
-        public virtual WbRd? Rd { get; private set; }
-
-        [InverseProperty(nameof(AreaCom.Contract))]
-        public virtual ICollection<AreaCom> Revisions { get; private set; } = null!;
-
-        [NotMapped]
-        public AreaCom? Latest => Revisions.OrderBy(r => r.RevNr).LastOrDefault();
-
-        [NotMapped]
-        public int? YearFrom => Revisions.Any(r => r.YearFrom == null) ? null : Revisions.Min(r => r.YearFrom);
-        [NotMapped]
-        public int? YearTo => Revisions.Any(r => r.YearTo == null) ? null : Revisions.Max(r => r.YearTo);
-
-        public int SearchScore(IEnumerable<string> keywords) {
-            return Utils.GetSearchScore([
-                 ..Revisions.Select(r => r.WineCult?.Name), Kg.AtKg.Name, Rd?.Name, ..Revisions.Select(r => r.GstNr), Comment,
-            ], keywords);
-        }
-    }
-}

Elwig/Models/Entities/Delivery.cs

@@ -106,21 +106,21 @@ namespace Elwig.Models.Entities {
         [InverseProperty(nameof(DeliveryPart.Delivery))]
         public virtual ICollection<DeliveryPart> Parts { get; private set; } = null!;
         [NotMapped]
-         public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
+        public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
 
         [NotMapped]
         public Predicate<DeliveryPart>? PartFilter { get; set; }
 
-        public int Weight => Parts.Sum(p => p.Weight);
+        public int Weight => Parts.Select(p => p.Weight).Sum();
-        public int FilteredWeight => FilteredParts.Sum(p => p.Weight);
+        public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
 
         public IEnumerable<RawVaribute> Vaributes => Parts
             .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
-            .OrderByDescending(g => g.Sum(p => p.Weight))
+            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
             .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
         public IEnumerable<RawVaribute> FilteredVaributes => FilteredParts
             .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
-            .OrderByDescending(g => g.Sum(p => p.Weight))
+            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
             .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
         public string VaributeString => string.Join(", ", Vaributes);
         public string FilteredVaributeString => string.Join(", ", FilteredVaributes);
@@ -153,7 +153,7 @@ namespace Elwig.Models.Entities {
                 Member.Name, Member.MiddleName, Member.GivenName, Member.BillingAddress?.FullName,
                 Comment
             }.ToList();
-            list.AddRange(FilteredParts.Select(p => p.Comment).Distinct());
+            list.AddRange(Parts.Select(p => p.Comment).Distinct());
             return Utils.GetSearchScore(list, keywords);
         }
     }

Elwig/Models/Entities/Member.cs

@@ -42,8 +42,6 @@ namespace Elwig.Models.Entities {
         [NotMapped]
         public string ShortName => (!string.IsNullOrWhiteSpace(GivenName) ? $"{GivenName} " : "") + Name;
         [NotMapped]
-        public string FullAdministrativeName => $"{AdministrativeName} ({MgNr})";
-        [NotMapped]
         public string AdministrativeName => AdministrativeName1 + (!string.IsNullOrWhiteSpace(AdministrativeName2) ? $" {AdministrativeName2}" : "");
         [NotMapped]
         public string AdministrativeName1 => IsJuridicalPerson ? Name : Name.Replace('ß', 'ẞ').ToUpper();
@@ -69,20 +67,8 @@ namespace Elwig.Models.Entities {
             set => ExitDateString = value?.ToString("yyyy-MM-dd");
         }
 
-        [Column("shares")]
+        [Column("business_shares")]
-        public int Shares { get; set; }
+        public int BusinessShares { get; set; }
-
-        [Column("shares_red")]
-        public int SharesRed { get; set; }
-
-        [Column("shares_white")]
-        public int SharesWhite { get; set; }
-
-        [Column("shares_dormant")]
-        public int SharesDormant { get; set; }
-
-        [NotMapped]
-        public int SharesActive => Shares + SharesRed + SharesWhite;
 
         [Column("accounting_nr")]
         public string? AccountingNr { get; set; }
@@ -203,14 +189,9 @@ namespace Elwig.Models.Entities {
         [InverseProperty(nameof(BillingAddr.Member))]
         public virtual BillingAddr? BillingAddress { get; private set; }
 
-        [InverseProperty(nameof(DeliveryAncmt.Member))]
+        [InverseProperty(nameof(Delivery.Member))]
         public virtual ICollection<DeliveryAncmt> Announcements { get; private set; } = null!;
 
-        [InverseProperty(nameof(MemberHistory.FromMember))]
-        public virtual ICollection<MemberHistory> HistoryFrom { get; private set; } = null!;
-        [InverseProperty(nameof(MemberHistory.ToMember))]
-        public virtual ICollection<MemberHistory> HistoryTo { get; private set; } = null!;
-
         [InverseProperty(nameof(Delivery.Member))]
         public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 

Elwig/Models/Entities/MemberHistory.cs

@@ -1,127 +1,31 @@
-using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models.Entities {
-    [Table("member_history"), PrimaryKey("HistNr")]
+    [Table("member_history"), PrimaryKey("MgNr", "DateString", "Type")]
     public class MemberHistory {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
 
-        public const string REASON_PURCHASE     = "purchase";      // Kauf
+        [Column("date")]
-        public const string REASON_CONVERT      = "convert";       // Änderung
+        public required string DateString { get; set; }
-        public const string REASON_TRANSFER     = "transfer";      // Übertragung
-        public const string REASON_PRESCRIPTION = "prescription";  // Vorschreibung
-        public const string REASON_EXCLUSION    = "exclusion";     // Ausschluss
-        public const string REASON_DECEASED     = "deceased";      // Tod
-        public const string REASON_RETIREMENT   = "retirement";    // Kündigung/stilllegen
-        public const string REASON_PAYOUT       = "payout";        // Auszahlung
-
-        [Column("histnr")]
-        public int HistNr { get; set; }
-
-        [Column("from_mgnr")]
-        public int? FromMgNr { get; set; }
-        [Column("from_type")]
-        public int? FromTypeValue { get; set; }
         [NotMapped]
-        public BusinessShareType? FromType {
+        public DateOnly Date {
-            get => (BusinessShareType?)FromTypeValue;
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
-            set => FromTypeValue = (int?)value;
-        }
-
-        [Column("to_mgnr")]
-        public int? ToMgNr { get; set; }
-        [Column("to_type")]
-        public int? ToTypeValue { get; set; }
-        [NotMapped]
-        public BusinessShareType? ToType {
-            get => (BusinessShareType?)ToTypeValue;
-            set => ToTypeValue = (int?)value;
-        }
-
-        [Column("date_notice")]
-        public required string DateNoticeString { get; set; }
-        [NotMapped]
-        public DateOnly DateNotice {
-            get => DateOnly.ParseExact(DateNoticeString, "yyyy-MM-dd");
             set => value.ToString("yyyy-MM-dd");
         }
 
-        [Column("date_effective")]
+        [Column("type")]
-        public required string DateEffectiveString { get; set; }
+        public required string Type { get; set; }
-        [NotMapped]
-        public DateOnly DateEffective {
-            get => DateOnly.ParseExact(DateEffectiveString, "yyyy-MM-dd");
-            set => value.ToString("yyyy-MM-dd");
-        }
 
-        [Column("reason")]
+        [Column("business_shares")]
-        public required string Reason { get; set; }
+        public int BusinessShares { get; set; }
-        [NotMapped]
-        public string ReasonPretty => Reason switch {
-            REASON_PURCHASE     => "Kauf",
-            REASON_CONVERT      => "Änderung",
-            REASON_TRANSFER     => "Übertragung",
-            REASON_PRESCRIPTION => "Vorschreibung",
-            REASON_EXCLUSION    => "Ausschluss",
-            REASON_DECEASED     => "Tod",
-            REASON_RETIREMENT   => "Kündigung",
-            REASON_PAYOUT       => "Auszahlung",
-            _ => Reason,
-        };
-
-        [Column("source")]
-        public required string Source { get; set; }
-
-        [Column("shares")]
-        public int Shares { get; set; }
-
-        [Column("signed")]
-        public bool MemberHasSigned { get; set; }
-
-        [Column("value_per_share")]
-        public long? ValuePerShareValue { get; set; }
-        [NotMapped]
-        public decimal? ValuePerShare {
-            get => ValuePerShareValue != null ? Utils.DecFromDb(ValuePerShareValue.Value, 2) : null;
-            set => ValuePerShareValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
-        }
-
-        [NotMapped]
-        public decimal? TotalValue => Shares * ValuePerShare;
-
-        [Column("currency")]
-        public string? CurrencyCode { get; set; }
-
-        [Column("deduct_year")]
-        public int? DeductYear { get; set; }
 
         [Column("comment")]
         public string? Comment { get; set; }
 
-        public string FormatReasonPhrase(int mgnr) {
+        [ForeignKey("MgNr")]
-            if (Reason == REASON_TRANSFER) {
+        public virtual Member Member { get; private set; } = null!;
-                if (FromMgNr == mgnr) {
-                    return $"{ReasonPretty} an {ToMember?.FullAdministrativeName ?? "Nachfolger"}" + (Comment != null ? $", {Comment}" : "");
-                } else if (ToMgNr == mgnr) {
-                    return $"{ReasonPretty} von {FromMember?.FullAdministrativeName ?? "Vorgänger"}" + (Comment != null ? $", {Comment}" : "");
-                }
-            }
-            return ReasonPretty + (Comment != null ? $", {Comment}" : "");
-        }
-
-        [NotMapped]
-        public int? PoVMgNr { get; set; }
-        [NotMapped]
-        public string PoVReasonPhrase => FormatReasonPhrase(PoVMgNr ?? 0);
-
-        [ForeignKey("FromMgNr")]
-        public virtual Member? FromMember { get; private set; } = null!;
-
-        [ForeignKey("ToMgNr")]
-        public virtual Member? ToMember { get; private set; } = null!;
-
-        [ForeignKey("CurrencyCode")]
-        public virtual Currency Currency { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Season.cs

@@ -25,20 +25,11 @@ namespace Elwig.Models.Entities {
         [Column("vat_flatrate")]
         public double VatFlatrate { get; set; }
 
-        [Column("min_kg_per_share")]
+        [Column("min_kg_per_bs")]
-        public int? MinKgPerShare { get; set; }
+        public int MinKgPerBusinessShare { get; set; }
-        [Column("max_kg_per_share")]
-        public int? MaxKgPerShare { get; set; }
 
-        [Column("min_kg_per_share_red")]
+        [Column("max_kg_per_bs")]
-        public int? MinKgPerShareRed { get; set; }
+        public int MaxKgPerBusinessShare { get; set; }
-        [Column("max_kg_per_share_red")]
-        public int? MaxKgPerShareRed { get; set; }
-
-        [Column("min_kg_per_share_white")]
-        public int? MinKgPerShareWhite { get; set; }
-        [Column("max_kg_per_share_white")]
-        public int? MaxKgPerShareWhite { get; set; }
 
         [Column("penalty_per_kg")]
         public long? PenaltyPerKgValue { get; set; }
@@ -64,23 +55,23 @@ namespace Elwig.Models.Entities {
             set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
         }
 
-        [Column("penalty_per_share_amount")]
+        [Column("penalty_per_bs_amount")]
-        public long? PenaltyPerShareAmountValue { get; set; }
+        public long? PenaltyPerBsAmountValue { get; set; }
         [NotMapped]
-        public decimal? PenaltyPerShareAmount {
+        public decimal? PenaltyPerBsAmount {
-            get => PenaltyPerShareAmountValue != null ? DecFromDb(PenaltyPerShareAmountValue.Value) : null;
+            get => PenaltyPerBsAmountValue != null ? DecFromDb(PenaltyPerBsAmountValue.Value) : null;
-            set => PenaltyPerShareAmountValue = value != null ? DecToDb(value.Value) : null;
+            set => PenaltyPerBsAmountValue = value != null ? DecToDb(value.Value) : null;
         }
 
-        [Column("penalty_per_share_none")]
+        [Column("penalty_per_bs_none")]
-        public long? PenaltyPerShareNoneValue { get; set; }
+        public long? PenaltyPerBsNoneValue { get; set; }
         [NotMapped]
-        public decimal? PenaltyPerShareNone {
+        public decimal? PenaltyPerBsNone {
-            get => PenaltyPerShareNoneValue != null ? DecFromDb(PenaltyPerShareNoneValue.Value) : null;
+            get => PenaltyPerBsNoneValue != null ? DecFromDb(PenaltyPerBsNoneValue.Value) : null;
-            set => PenaltyPerShareNoneValue = value != null ? DecToDb(value.Value) : null;
+            set => PenaltyPerBsNoneValue = value != null ? DecToDb(value.Value) : null;
         }
 
-        [Column("share_value")]
+        [Column("bs_value")]
         public long? BusinessShareValueValue { get; set; }
         [NotMapped]
         public decimal? BusinessShareValue {

Elwig/Models/Entities/WineOrigin.cs

@@ -27,15 +27,13 @@ namespace Elwig.Models.Entities {
         public virtual ICollection<WbGem> Gems { get; private set; } = null!;
 
         [InverseProperty(nameof(Parent))]
-        public virtual ICollection<WineOrigin> RealChildren { get; private set; } = null!;
+        public virtual ICollection<WineOrigin> Children { get; private set; } = null!;
-        [NotMapped]
-        public List<WineOrigin> Children { get; private set; } = [];
 
         public int Level => (Parent?.Level + 1) ?? 0;
 
         public string HkIdLevel => $"{new string(' ', Level * 2)}{HkId}";
 
-        public int TotalChildNum => 1 + Children.Sum(c => c.TotalChildNum);
+        public int TotalChildNum => 1 + Children.Select(c => c.TotalChildNum).Sum();
 
         private int SortKey1 => (Parent?.SortKey1 ?? 0) | (TotalChildNum << ((3 - Level) * 8));
         public int SortKey => SortKey1 | ((Level < 3) ? (-1 >>> (Level * 8 + 8)) : 0);

Elwig/Resources/Sql/37-38.sql

@@ -1,239 +0,0 @@
--- schema version 37 to 38
-
-UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
-
-DROP TRIGGER t_area_commitment_i_ctime;
-DROP TRIGGER t_area_commitment_u_ctime;
-DROP TRIGGER t_area_commitment_i_mtime;
-DROP TRIGGER t_area_commitment_u_mtime;
-
-CREATE TABLE area_commitment_contract (
-    fbnr      INTEGER NOT NULL,
-
-    kgnr      INTEGER NOT NULL,
-    rdnr      INTEGER,
-
-    comment   TEXT             DEFAULT NULL,
-    ctime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
-    mtime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
-    xtime     INTEGER          DEFAULT NULL,
-    itime     INTEGER          DEFAULT NULL,
-
-    CONSTRAINT area_commitment_contract PRIMARY KEY (fbnr),
-    CONSTRAINT fk_area_commitment_contract_wb_kg FOREIGN KEY (kgnr) REFERENCES wb_kg (kgnr)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT fk_area_commitment_contract_wb_rd FOREIGN KEY (kgnr, rdnr) REFERENCES wb_rd (kgnr, rdnr)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT
-) STRICT;
-
-CREATE TABLE area_commitment_new (
-    fbnr      INTEGER NOT NULL,
-    revnr     INTEGER NOT NULL,
-    mgnr      INTEGER NOT NULL,
-
-    vtrgid    TEXT    NOT NULL,
-    cultid    TEXT             DEFAULT NULL,
-    area      INTEGER NOT NULL,
-    gstnr     TEXT    NOT NULL,
-
-    year_from INTEGER CHECK (year_from >= 1000 AND year_from <= 9999) DEFAULT NULL,
-    year_to   INTEGER CHECK (year_to   >= 1000 AND year_to   <= 9999) DEFAULT NULL,
-
-    ctime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
-    mtime     INTEGER NOT NULL DEFAULT (UNIXEPOCH()),
-    xtime     INTEGER          DEFAULT NULL,
-    itime     INTEGER          DEFAULT NULL,
-
-    CONSTRAINT pk_area_commitment PRIMARY KEY (fbnr, revnr),
-    CONSTRAINT fk_area_commitment_area_commitment_contract FOREIGN KEY (fbnr) REFERENCES area_commitment_contract (fbnr)
-        ON UPDATE CASCADE
-        ON DELETE CASCADE,
-    CONSTRAINT fk_area_commitment_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT fk_area_commitment_area_commitment_type FOREIGN KEY (vtrgid) REFERENCES area_commitment_type (vtrgid)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT fk_area_commitment_wine_cultivation FOREIGN KEY (cultid) REFERENCES wine_cultivation (cultid)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT
-) STRICT;
-
-INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr, comment, ctime, mtime, xtime, itime)
-SELECT fbnr, kgnr, rdnr, comment, ctime, mtime, xtime, itime
-FROM area_commitment;
-
-INSERT INTO area_commitment_new (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to, ctime, mtime, xtime, itime)
-SELECT fbnr, 1, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to, ctime, mtime, xtime, itime
-FROM area_commitment;
-
-PRAGMA foreign_keys = OFF;
-PRAGMA writable_schema = ON;
-DROP TABLE area_commitment;
-ALTER TABLE area_commitment_new RENAME TO area_commitment;
-PRAGMA writable_schema = OFF;
-PRAGMA foreign_keys = ON;
-
-CREATE TRIGGER t_area_commitment_contract_i_ctime
-    AFTER INSERT ON area_commitment_contract FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.ctime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment_contract SET ctime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_contract_u_ctime
-    BEFORE UPDATE ON area_commitment_contract FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND OLD.ctime != NEW.ctime
-BEGIN
-    SELECT RAISE(ABORT, 'It is not allowed to change ctime');
-END;
-
-CREATE TRIGGER t_area_commitment_contract_i_mtime
-    AFTER INSERT ON area_commitment_contract FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_contract_u_mtime
-    AFTER UPDATE ON area_commitment_contract FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_i_ctime
-    AFTER INSERT ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.ctime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment SET ctime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
-END;
-
-CREATE TRIGGER t_area_commitment_u_ctime
-    BEFORE UPDATE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND OLD.ctime != NEW.ctime
-BEGIN
-    SELECT RAISE(ABORT, 'It is not allowed to change ctime');
-END;
-
-CREATE TRIGGER t_area_commitment_i_mtime
-    AFTER INSERT ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment SET mtime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
-END;
-
-CREATE TRIGGER t_area_commitment_u_mtime
-    AFTER UPDATE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1 AND NEW.mtime != UNIXEPOCH()
-BEGIN
-    UPDATE area_commitment SET mtime = UNIXEPOCH() WHERE (fbnr, revnr) = (NEW.fbnr, NEW.revnr);
-END;
-
-CREATE TRIGGER t_area_commitment_i_mtime_contract
-    AFTER INSERT ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_u_mtime_contract
-    AFTER UPDATE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = NEW.fbnr OR fbnr = OLD.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_d_mtime_contract
-    AFTER DELETE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE area_commitment_contract SET mtime = UNIXEPOCH() WHERE fbnr = OLD.fbnr;
-END;
-
-CREATE TRIGGER t_area_commitment_i_mtime_member
-    AFTER INSERT ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE member  SET mtime = UNIXEPOCH() WHERE mgnr = NEW.mgnr;
-END;
-
-CREATE TRIGGER t_area_commitment_u_mtime_member
-    AFTER UPDATE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE member SET mtime = UNIXEPOCH() WHERE mgnr = NEW.mgnr OR mgnr = OLD.mgnr;
-END;
-
-CREATE TRIGGER t_area_commitment_d_mtime_member
-    AFTER DELETE ON area_commitment FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_TIME_TRIGGERS') = 1
-BEGIN
-    UPDATE member SET mtime = UNIXEPOCH() WHERE mgnr = OLD.mgnr;
-END;
-
--- fix user fiddling - set actual year_from
-UPDATE area_commitment AS b
-SET fbnr = a.fbnr, revnr = b.fbnr, year_from = a.year_to + 1
-FROM area_commitment AS a
-WHERE a.fbnr < b.fbnr
-  AND COALESCE(a.year_from <= a.year_to, TRUE)
-  AND COALESCE(b.year_from <= b.year_to, TRUE)
-  AND SUBSTR(a.vtrgid, 0, 2) = SUBSTR(b.vtrgid, 0, 2)
-  AND (SELECT c.kgnr = d.kgnr AND COALESCE(c.rdnr = d.rdnr, TRUE) FROM area_commitment_contract c, area_commitment_contract d WHERE c.fbnr = a.fbnr AND d.fbnr = b.fbnr)
-  AND ((IIF(INSTR(a.gstnr, b.gstnr) > 0, 1, 0) + IIF(INSTR(b.gstnr, a.gstnr) > 0, 1, 0) + IIF(a.area = b.area, 2, 0) + (a.mgnr = b.mgnr)) > 1)
-  AND ((a.year_from = b.year_from AND b.year_to IS NULL AND a.year_to IS NOT NULL));
-
--- simple
-UPDATE area_commitment AS b
-SET fbnr = a.fbnr, revnr = b.fbnr
-FROM area_commitment AS a
-WHERE a.fbnr < b.fbnr
-  AND COALESCE(a.year_from <= a.year_to, TRUE)
-  AND COALESCE(b.year_from <= b.year_to, TRUE)
-  AND SUBSTR(a.vtrgid, 0, 2) = SUBSTR(b.vtrgid, 0, 2)
-  AND (SELECT c.kgnr = d.kgnr AND COALESCE(c.rdnr = d.rdnr, TRUE) FROM area_commitment_contract c, area_commitment_contract d WHERE c.fbnr = a.fbnr AND d.fbnr = b.fbnr)
-  AND (a.gstnr = b.gstnr OR a.gstnr IN ('offen', '', '-')) AND a.area = b.area
-  AND a.year_to + 1 = b.year_from;
-
--- copy comments
-UPDATE area_commitment_contract AS b
-SET comment = IIF(b.comment IS NULL, a.comment, CONCAT(b.comment, '; ', a.comment))
-FROM area_commitment_contract AS a
-WHERE a.comment IS NOT NULL AND a.fbnr IN (SELECT revnr FROM area_commitment WHERE revnr > 1 AND fbnr = b.fbnr);
-
--- fix revnr
-UPDATE area_commitment AS b
-SET revnr = a.revnr + 1
-FROM area_commitment AS a
-WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
-UPDATE area_commitment AS b
-SET revnr = a.revnr + 1
-FROM area_commitment AS a
-WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
-UPDATE area_commitment AS b
-SET revnr = a.revnr + 1
-FROM area_commitment AS a
-WHERE a.fbnr = b.fbnr AND a.revnr < b.revnr;
-
--- fix year_from
-UPDATE area_commitment AS b
-SET year_from = a.year_to + 1
-FROM area_commitment AS a
-WHERE a.fbnr = b.fbnr AND a.revnr = b.revnr - 1
-  AND a.year_to = b.year_from;
-UPDATE area_commitment AS b
-SET year_from = a.year_to + 1
-FROM area_commitment AS a
-WHERE a.fbnr = b.fbnr AND a.revnr = b.revnr - 1
-  AND a.year_to = b.year_from;
-
--- delete unreferenced contracts
-DELETE FROM area_commitment_contract
-WHERE fbnr IN (SELECT c.fbnr FROM area_commitment_contract c
-                           LEFT JOIN area_commitment a ON a.fbnr = c.fbnr
-               WHERE a.fbnr IS NULL);
-
-UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';

Elwig/Resources/Sql/38-39.sql

@@ -1,8 +0,0 @@
--- schema version 38 to 39
-
-PRAGMA writable_schema = ON;
-UPDATE sqlite_schema SET sql = REPLACE(sql, '{2,}', '{2,64}')
-WHERE type = 'table' AND name = 'member_email_address';
-PRAGMA writable_schema = OFF;
-
-UPDATE wb_gem SET hkid = 'WLLB' WHERE gkz IN (10710, 10723);

Elwig/Resources/Sql/39-40.sql

@@ -1,326 +0,0 @@
--- schema version 39 to 40
-
-PRAGMA writable_schema = ON;
-
-ALTER TABLE member RENAME COLUMN business_shares TO shares;
-ALTER TABLE member ADD COLUMN shares_red       INTEGER NOT NULL DEFAULT 0 CHECK (shares_red >= 0);
-ALTER TABLE member ADD COLUMN shares_white     INTEGER NOT NULL DEFAULT 0 CHECK (shares_white >= 0);
-ALTER TABLE member ADD COLUMN shares_dormant   INTEGER NOT NULL DEFAULT 0 CHECK (shares_dormant >= 0);
-
-UPDATE sqlite_schema SET sql = REPLACE(sql, 'shares  INTEGER NOT NULL DEFAULT 0', 'shares           INTEGER NOT NULL DEFAULT 0 CHECK (shares >= 0)')
-WHERE type = 'table' AND name = 'member';
-
-UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
-UPDATE member
-SET shares_dormant = shares + shares_red + shares_white,
-    shares = 0, shares_red = 0, shares_white = 0
-WHERE NOT active;
-UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
-
-CREATE TABLE member_history_new (
-    histnr          INTEGER NOT NULL,
-    from_mgnr       INTEGER,
-    from_type       INTEGER,
-    to_mgnr         INTEGER,
-    to_type         INTEGER,
-    date_notice     TEXT    NOT NULL CHECK (date_notice    REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
-    date_effective  TEXT    NOT NULL CHECK (date_effective REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
-    reason          TEXT    NOT NULL CHECK (reason         REGEXP '^[a-z_]+$'),
-    source          TEXT    NOT NULL CHECK (source         REGEXP '^[a-z_]+$'),
-
-    shares          INTEGER NOT NULL CHECK (shares > 0),
-    signed          INTEGER NOT NULL CHECK (signed IN (TRUE, FALSE)) DEFAULT FALSE,
-    value_per_share INTEGER DEFAULT NULL,
-    currency        TEXT    DEFAULT NULL,
-    deduct_year     INTEGER DEFAULT NULL,
-    comment         TEXT    DEFAULT NULL,
-
-    CONSTRAINT pk_member_history PRIMARY KEY (histnr),
-    CONSTRAINT fk_member_history_member_from FOREIGN KEY (from_mgnr) REFERENCES member (mgnr)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT fk_member_history_member_to FOREIGN KEY (to_mgnr) REFERENCES member (mgnr)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT fk_member_history_currency FOREIGN KEY (currency) REFERENCES currency (code)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT,
-    CONSTRAINT c_member_history CHECK ((from_mgnr IS NOT NULL OR to_mgnr IS NOT NULL) AND
-                                       ((from_mgnr IS NULL AND from_type IS NULL) OR (from_mgnr IS NOT NULL AND from_type IS NOT NULL)) AND
-                                       ((to_mgnr IS NULL AND to_type IS NULL) OR (to_mgnr IS NOT NULL AND to_type IS NOT NULL)))
-) STRICT;
-
-INSERT INTO member_history_new (histnr, from_mgnr, from_type, to_mgnr, to_type, date_notice, date_effective, reason, source, shares, value_per_share, currency, deduct_year, comment)
-SELECT ROW_NUMBER() OVER(ORDER BY h.date, h.mgnr), NULL, NULL, h.mgnr, 1, h.date, h.date,
-       IIF(h.type = 'auto', 'prescription', h.type), 'elwig', h.business_shares, s.bs_value / POW(10, s.precision - 2), s.currency,
-       IIF(h.type = 'auto', s.year, NULL), 'automatische Nachzeichnung'
-FROM member_history h
-JOIN season s ON s.year = SUBSTR(h.date, 1, 4);
-
-PRAGMA foreign_keys = OFF;
-DROP TABLE member_history;
-ALTER TABLE member_history_new RENAME TO member_history;
-PRAGMA foreign_keys = ON;
-
-CREATE TRIGGER t_member_history_i_member
-    AFTER INSERT ON member_history FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS') = 1
-BEGIN
-    UPDATE member SET shares         = shares         - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 1;
-    UPDATE member SET shares_red     = shares_red     - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 2;
-    UPDATE member SET shares_white   = shares_white   - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 3;
-    UPDATE member SET shares_dormant = shares_dormant - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 9;
-    UPDATE member SET shares         = shares         + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 1;
-    UPDATE member SET shares_red     = shares_red     + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 2;
-    UPDATE member SET shares_white   = shares_white   + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 3;
-    UPDATE member SET shares_dormant = shares_dormant + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 9;
-END;
-
-CREATE TRIGGER t_member_history_u_member
-    AFTER UPDATE OF from_mgnr, from_type, to_mgnr, to_type, shares ON member_history FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS') = 1
-BEGIN
-    UPDATE member SET shares         = shares         + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 1;
-    UPDATE member SET shares_red     = shares_red     + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 2;
-    UPDATE member SET shares_white   = shares_white   + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 3;
-    UPDATE member SET shares_dormant = shares_dormant + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 9;
-    UPDATE member SET shares         = shares         - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 1;
-    UPDATE member SET shares_red     = shares_red     - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 2;
-    UPDATE member SET shares_white   = shares_white   - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 3;
-    UPDATE member SET shares_dormant = shares_dormant - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 9;
-    UPDATE member SET shares         = shares         - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 1;
-    UPDATE member SET shares_red     = shares_red     - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 2;
-    UPDATE member SET shares_white   = shares_white   - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 3;
-    UPDATE member SET shares_dormant = shares_dormant - NEW.shares WHERE mgnr = NEW.from_mgnr AND NEW.from_type = 9;
-    UPDATE member SET shares         = shares         + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 1;
-    UPDATE member SET shares_red     = shares_red     + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 2;
-    UPDATE member SET shares_white   = shares_white   + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 3;
-    UPDATE member SET shares_dormant = shares_dormant + NEW.shares WHERE mgnr = NEW.to_mgnr   AND NEW.to_type   = 9;
-END;
-
-CREATE TRIGGER t_member_history_d_member
-    AFTER DELETE ON member_history FOR EACH ROW
-    WHEN (SELECT value FROM client_parameter WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS') = 1
-BEGIN
-    UPDATE member SET shares         = shares         + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 1;
-    UPDATE member SET shares_red     = shares_red     + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 2;
-    UPDATE member SET shares_white   = shares_white   + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 3;
-    UPDATE member SET shares_dormant = shares_dormant + OLD.shares WHERE mgnr = OLD.from_mgnr AND OLD.from_type = 9;
-    UPDATE member SET shares         = shares         - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 1;
-    UPDATE member SET shares_red     = shares_red     - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 2;
-    UPDATE member SET shares_white   = shares_white   - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 3;
-    UPDATE member SET shares_dormant = shares_dormant - OLD.shares WHERE mgnr = OLD.to_mgnr   AND OLD.to_type   = 9;
-END;
-
-INSERT INTO client_parameter (param, value) VALUES ('ENABLE_MEMBER_HISTORY_TRIGGERS', '1');
-
-CREATE TABLE season_new (
-    year           INTEGER NOT NULL CHECK (year >= 1000 AND year <= 9999),
-    currency       TEXT    NOT NULL,
-    precision      INTEGER NOT NULL DEFAULT 4,
-
-    max_kg_per_ha  INTEGER NOT NULL DEFAULT 10000,
-    vat_normal     REAL    NOT NULL DEFAULT 0.10,
-    vat_flatrate   REAL    NOT NULL DEFAULT 0.13,
-
-    min_kg_per_share          INTEGER  DEFAULT NULL,
-    max_kg_per_share          INTEGER  DEFAULT NULL,
-    min_kg_per_share_red      INTEGER  DEFAULT NULL,
-    max_kg_per_share_red      INTEGER  DEFAULT NULL,
-    min_kg_per_share_white    INTEGER  DEFAULT NULL,
-    max_kg_per_share_white    INTEGER  DEFAULT NULL,
-    penalty_per_kg            INTEGER  DEFAULT NULL,
-    penalty_amount            INTEGER  DEFAULT NULL,
-    penalty_none              INTEGER  DEFAULT NULL,
-    penalty_per_share_amount  INTEGER  DEFAULT NULL,
-    penalty_per_share_none    INTEGER  DEFAULT NULL,
-    share_value               INTEGER,
-
-    start_date     TEXT CHECK (start_date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$'),
-    end_date       TEXT CHECK (end_date   REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$'),
-    calc_mode      INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT pk_season PRIMARY KEY (year),
-    CONSTRAINT fk_season_currency FOREIGN KEY (currency) REFERENCES currency (code)
-        ON UPDATE CASCADE
-        ON DELETE RESTRICT
-) STRICT;
-
-INSERT INTO season_new (year, currency, precision, max_kg_per_ha, vat_normal, vat_flatrate, min_kg_per_share, max_kg_per_share, penalty_per_kg, penalty_amount, penalty_none, penalty_per_share_amount, penalty_per_share_none, share_value, start_date, end_date, calc_mode)
-SELECT year, currency, precision, max_kg_per_ha, vat_normal, vat_flatrate, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, penalty_per_bs_amount, penalty_per_bs_none, bs_value, start_date, end_date, calc_mode
-FROM season;
-
-PRAGMA foreign_keys = OFF;
-DROP TABLE season;
-ALTER TABLE season_new RENAME TO season;
-PRAGMA foreign_keys = ON;
-
-DROP VIEW v_delivery;
-CREATE VIEW v_delivery AS
-SELECT p.year, p.did, p.dpnr,
-       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
-       m.mgnr, m.name, m.given_name,
-       v.sortid, v.type, a.attrid, p.cultid,
-       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
-       p.hkid, p.kgnr, p.rdnr,
-       p.net_weight, p.gebunden,
-       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
-       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
-       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
-       GROUP_CONCAT(o.modid) AS modifiers,
-       d.comment, p.comment AS part_comment
-FROM delivery_part p
-    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
-    JOIN member m ON m.mgnr = d.mgnr
-    LEFT JOIN wine_variety v ON v.sortid = p.sortid
-    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
-    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
-GROUP BY p.year, p.did, p.dpnr
-ORDER BY p.year, p.did, p.dpnr, o.modid;
-
-DROP VIEW v_stat_season;
-CREATE VIEW v_stat_season AS
-SELECT year,
-       SUM(weight) AS weight_total,
-       SUM(IIF(type = 'R', weight, 0)) AS weight_red,
-       SUM(IIF(type = 'W', weight, 0)) AS weight_white,
-       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-       COUNT(DISTINCT did) AS lieferungen,
-       COUNT(DISTINCT mgnr) AS mitglieder
-FROM v_delivery
-GROUP BY year
-ORDER BY year;
-
-DROP VIEW v_stat_sort;
-CREATE VIEW v_stat_variety AS
-SELECT year, sortid,
-       SUM(weight) AS weight_total,
-       SUM(IIF(type = 'R', weight, 0)) AS weight_red,
-       SUM(IIF(type = 'W', weight, 0)) AS weight_white,
-       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-       COUNT(DISTINCT did) AS lieferungen,
-       COUNT(DISTINCT mgnr) AS mitglieder
-FROM v_delivery
-GROUP BY year, sortid
-ORDER BY year, sortid;
-
-DROP VIEW v_stat_attr;
-CREATE VIEW v_stat_attr AS
-SELECT year, attrid,
-       SUM(weight) AS weight_total,
-       SUM(IIF(type = 'R', weight, 0)) AS weight_red,
-       SUM(IIF(type = 'W', weight, 0)) AS weight_white,
-       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-       COUNT(DISTINCT did) AS lieferungen,
-       COUNT(DISTINCT mgnr) AS mitglieder
-FROM v_delivery
-GROUP BY year, attrid
-ORDER BY year, attrid;
-
-DROP VIEW v_stat_sort_attr;
-CREATE VIEW v_stat_variety_attr AS
-SELECT year, sortid, attrid,
-       SUM(weight) AS weight_total,
-       SUM(IIF(type = 'R', weight, 0)) AS weight_red,
-       SUM(IIF(type = 'W', weight, 0)) AS weight_white,
-       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-       COUNT(DISTINCT did) AS lieferungen,
-       COUNT(DISTINCT mgnr) AS mitglieder
-FROM v_delivery
-GROUP BY year, sortid, attrid
-ORDER BY year, sortid, attrid;
-
-DROP VIEW v_stat_member;
-CREATE VIEW v_stat_member AS
-SELECT year, mgnr,
-       SUM(weight) AS weight_total,
-       SUM(IIF(type = 'R', weight, 0)) AS weight_red,
-       SUM(IIF(type = 'W', weight, 0)) AS weight_white,
-       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
-       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
-       COUNT(DISTINCT did) AS lieferungen
-FROM v_delivery
-GROUP BY year, mgnr
-ORDER BY year, mgnr;
-
-CREATE VIEW v_member_history AS
-SELECT m.mgnr, s.year,
-       m.shares + SUM(IIF(h1.from_type = 1, h1.shares, 0)) - SUM(IIF(h2.to_type = 1, h2.shares, 0)) AS shares,
-       m.shares_red + SUM(IIF(h1.from_type = 2, h1.shares, 0)) - SUM(IIF(h2.to_type = 2, h2.shares, 0)) AS shares_red,
-       m.shares_white + SUM(IIF(h1.from_type = 3, h1.shares, 0)) - SUM(IIF(h2.to_type = 3, h2.shares, 0)) AS shares_white,
-       m.shares_dormant + SUM(IIF(h1.from_type = 9, h1.shares, 0)) - SUM(IIF(h2.to_type = 9, h2.shares, 0)) AS shares_dormant
-FROM member m, v_virtual_season s
-    LEFT JOIN member_history h1 ON (SUBSTR(h1.date_notice, 1, 4) + 0) > s.year AND h1.from_mgnr = m.mgnr
-    LEFT JOIN member_history h2 ON (SUBSTR(h2.date_notice, 1, 4) + 0) > s.year AND h2.to_mgnr = m.mgnr
-GROUP BY m.mgnr, s.year
-ORDER BY m.mgnr, s.year;
-
-DROP VIEW v_total_under_delivery;
-CREATE VIEW v_total_under_delivery AS
-SELECT s.year, m.mgnr,
-       h.shares,
-       h.shares * COALESCE(s.min_kg_per_share, 0) AS min_kg,
-       h.shares * COALESCE(s.max_kg_per_share, 0) AS max_kg,
-       COALESCE(d.weight_total, 0) AS weight_total,
-       IIF(COALESCE(d.weight_total, 0) < h.shares * COALESCE(s.min_kg_per_share, 0),
-           COALESCE(d.weight_total, 0) - h.shares * COALESCE(s.min_kg_per_share, 0),
-           IIF(COALESCE(d.weight_total, 0) > h.shares * COALESCE(s.max_kg_per_share, 0),
-               COALESCE(d.weight_total, 0) - h.shares * COALESCE(s.max_kg_per_share, 0),
-               0)) AS diff,
-       h.shares_red,
-       h.shares_red * COALESCE(s.min_kg_per_share_red, s.min_kg_per_share, 0) AS min_kg_red,
-       h.shares_red * COALESCE(s.max_kg_per_share_red, s.max_kg_per_share, 0) AS max_kg_red,
-       COALESCE(d.weight_red, 0) AS weight_red,
-       IIF(COALESCE(d.weight_red, 0) < h.shares_red * COALESCE(s.min_kg_per_share_red, s.min_kg_per_share, 0),
-           COALESCE(d.weight_red, 0) - h.shares_red * COALESCE(s.min_kg_per_share_red, s.min_kg_per_share, 0),
-           IIF(COALESCE(d.weight_red, 0) > h.shares_red * COALESCE(s.max_kg_per_share_red, s.max_kg_per_share, 0),
-               COALESCE(d.weight_red, 0) - h.shares_red * COALESCE(s.max_kg_per_share_red, s.max_kg_per_share, 0),
-               0)) AS diff_red,
-       h.shares_white,
-       h.shares_white * COALESCE(s.min_kg_per_share_white, s.min_kg_per_share, 0) AS min_kg_white,
-       h.shares_white * COALESCE(s.max_kg_per_share_white, s.max_kg_per_share, 0) AS max_kg_white,
-       COALESCE(d.weight_white, 0) AS weight_white,
-       IIF(COALESCE(d.weight_white, 0) < h.shares_white * COALESCE(s.min_kg_per_share_white, s.min_kg_per_share, 0),
-           COALESCE(d.weight_white, 0) - h.shares_white * COALESCE(s.min_kg_per_share_white, s.min_kg_per_share, 0),
-           IIF(COALESCE(d.weight_white, 0) > h.shares_white * COALESCE(s.max_kg_per_share_white, s.max_kg_per_share, 0),
-               COALESCE(d.weight_white, 0) - h.shares_white * COALESCE(s.max_kg_per_share_white, s.max_kg_per_share, 0),
-               0)) AS diff_white
-FROM member m, season s
-    LEFT JOIN v_member_history h ON (h.year, h.mgnr) = (s.year, m.mgnr)
-    LEFT JOIN v_stat_member d ON (d.year, d.mgnr) = (s.year, m.mgnr)
-ORDER BY s.year, m.mgnr;
-
-DROP VIEW v_penalty_business_shares;
-CREATE VIEW v_penalty_business_shares AS
-SELECT u.year, u.mgnr,
-       SUM(IIF(u.weight_total = 0, COALESCE(-s.penalty_none, 0) + COALESCE(-(u.shares + u.shares_red + u.shares_white) * s.penalty_per_share_none, 0), 0) +
-           IIF(u.diff < 0 OR u.diff_red < 0 OR u.diff_white < 0, COALESCE(-s.penalty_amount, 0), 0) +
-           COALESCE((u.diff + u.diff_red + u.diff_white) * s.penalty_per_kg, 0) +
-           COALESCE(CEIL(CAST(u.diff AS REAL) / s.min_kg_per_share) * s.penalty_per_share_amount, 0) +
-           COALESCE(CEIL(CAST(u.diff_red AS REAL) / s.min_kg_per_share_red) * s.penalty_per_share_amount, 0) +
-           COALESCE(CEIL(CAST(u.diff_white AS REAL) / s.min_kg_per_share_white) * s.penalty_per_share_amount, 0)
-       ) AS total_penalty
-FROM v_total_under_delivery u
-    JOIN season s ON u.year = s.year
-    JOIN member m ON m.mgnr = u.mgnr
-WHERE m.active
-GROUP BY u.year, u.mgnr
-HAVING total_penalty < 0
-ORDER BY u.year, u.mgnr;
-
-DROP VIEW v_auto_business_shares;
-CREATE VIEW v_auto_business_shares AS
-SELECT (SUBSTR(h.date_notice, 1, 4) + 0) AS year,
-       h.to_mgnr AS mgnr,
-       SUM(h.shares) AS shares,
-       SUM(h.shares * COALESCE(h.value_per_share, 0)) AS total_amount
-FROM member_history h
-WHERE h.reason = 'prescription' AND h.source = 'elwig'
-GROUP BY year, h.to_mgnr
-ORDER BY year, h.to_mgnr;
-
-PRAGMA writable_schema = OFF;

Elwig/Services/AreaComService.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using System.Windows;
 
 namespace Elwig.Services {
     public static class AreaComService {
@@ -19,45 +20,41 @@ namespace Elwig.Services {
         }
 
         public static void ClearInputs(this AreaComAdminViewModel vm) {
-            vm.Period = null;
-        }
-
-        public static void FillInputs(this AreaComAdminViewModel vm, AreaComContract c) {
-            vm.FbNr = c.FbNr;
-            vm.Period = c.YearTo == null ? $"ab {c.YearFrom}" : $"{c.YearFrom}\u2013{c.YearTo}";
-            vm.Comment = c.Comment;
-            vm.Kg = ControlUtils.GetItemFromSourceWithPk(vm.KgSource, c.KgNr) as AT_Kg;
-            vm.Rd = ControlUtils.GetItemFromSourceWithPk(vm.RdSource, c.KgNr, c.RdNr) as WbRd;
         }
 
         public static void FillInputs(this AreaComAdminViewModel vm, AreaCom a) {
+            vm.FbNr = a.FbNr;
             vm.MgNr = a.MgNr;
             vm.YearFrom = a.YearFrom;
             vm.YearTo = a.YearTo;
             vm.AreaComType = ControlUtils.GetItemFromSourceWithPk(vm.AreaComTypeSource, a.VtrgId) as AreaComType;
             vm.WineCult = ControlUtils.GetItemFromSourceWithPk(vm.WineCultSource, a.CultId) as WineCult;
+            vm.Comment = a.Comment;
+            vm.Kg = ControlUtils.GetItemFromSourceWithPk(vm.KgSource, a.KgNr) as AT_Kg;
+            vm.Rd = ControlUtils.GetItemFromSourceWithPk(vm.RdSource, a.KgNr, a.RdNr) as WbRd;
             vm.GstNr = a.GstNr;
             vm.Area = a.Area;
         }
 
-        public static async Task<(List<string>, IQueryable<AreaComContract>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
+        public static async Task<(List<string>, IQueryable<AreaCom>, List<string>)> GetFilters(this AreaComAdminViewModel vm, AppDbContext ctx) {
             List<string> filterNames = [];
             IQueryable<AreaCom> areaComQuery = ctx.AreaCommitments.Where(a => a.MgNr == vm.FilterMember.MgNr).OrderBy(a => a.FbNr);
-            if (vm.FilterSeason is int season) {
+            if (vm.ShowOnlyActiveAreaComs) {
-                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, season);
+                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery, Utils.CurrentLastSeason);
-                filterNames.Add($"laufend {season}");
+                filterNames.Add($"laufend {Utils.CurrentLastSeason}");
             }
 
             var filterVar = new List<string>();
             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) {
-                var var = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var attrId = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.AttrId, a => a);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
-                var attr = attrId.Values.ToDictionary(a => a.Name.ToLower().Split(" ")[0], a => a);
+                var attrId = await ctx.WineAttributes.ToDictionaryAsync(a => a.AttrId, a => a);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -91,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}");
                     }
                 }
 
@@ -98,50 +99,38 @@ 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);
             }
 
-            IQueryable<AreaComContract> contracts = areaComQuery
+            return (filterNames, areaComQuery, filter);
-                .Select(c => c.Contract).Distinct()
-                .OrderBy(c => c.FbNr);
-
-            return (filterNames, contracts, areaComQuery, filter);
         }
 
-        public static async Task<(int FbNr, int RevNr)> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr, int? revNr) {
+        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
             int newFbNr = vm.FbNr!.Value;
 
             return await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var c = new AreaComContract {
-                    FbNr = oldFbNr ?? newFbNr,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
-                    KgNr = vm.Kg!.KgNr,
-                    RdNr = vm.Rd?.RdNr,
-                };
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
-                    RevNr = revNr ?? await ctx.NextRevNr(oldFbNr ?? newFbNr),
                     MgNr = vm.MgNr!.Value,
                     YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
                     VtrgId = vm.AreaComType!.VtrgId,
                     CultId = vm.WineCult?.CultId,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    KgNr = vm.Kg!.KgNr,
+                    RdNr = vm.Rd?.RdNr,
                     GstNr = vm.GstNr?.Trim() ?? "-",
                     Area = vm.Area!.Value,
                 };
 
                 if (vm.Rd?.RdNr == 0) {
-                    vm.Rd.RdNr = await ctx.NextRdNr(c.KgNr);
+                    vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
-                    c.RdNr = vm.Rd.RdNr;
+                    a.RdNr = vm.Rd.RdNr;
                     ctx.Add(vm.Rd);
                 }
 
                 if (oldFbNr != null) {
-                    ctx.Update(c);
-                } else {
-                    ctx.Add(c);
-                }
-                if (revNr != null) {
                     ctx.Update(a);
                 } else {
                     ctx.Add(a);
@@ -150,20 +139,32 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
 
                 if (newFbNr != a.FbNr) {
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_contract SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                 }
 
-                return (newFbNr, a.RevNr);
+                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) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int area, int? min, int? max) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, bold: bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{area:N0} m²", row, 2, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{area:N0} m²", row, 2, 1, bold, true);
-            grid.AddToolTipCell(min == null ? "" : $"{min:N0} kg", row, 3, bold: bold, alignRight: true);
+            AddToolTipCell(grid, min == null ? "" : $"{min:N0} kg", row, 3, 1, bold, true);
-            grid.AddToolTipCell(max == null ? "" : $"{max:N0} kg", row, 4, bold: bold, alignRight: true);
+            AddToolTipCell(grid, max == null ? "" : $"{max:N0} kg", row, 4, 1, bold, true);
         }
 
         public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
@@ -242,8 +243,8 @@ namespace Elwig.Services {
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.AddToolTipCell("Lieferpflicht", 0, 3, alignCenter: true);
+            AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
-            grid.AddToolTipCell("Lieferrecht", 0, 4, 1, alignCenter: true);
+            AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
             int rowNum = 1;
             foreach (var row in data) {
                 if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
@@ -255,16 +256,7 @@ namespace Elwig.Services {
         public static async Task DeleteAreaCom(int fbnr) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var l = (await ctx.AreaCommitmentContracts.FindAsync(fbnr))!;
+                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
-                ctx.Remove(l);
-                await ctx.SaveChangesAsync();
-            });
-        }
-
-        public static async Task DeleteAreaComRevision(int fbnr, int revnr) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var l = (await ctx.AreaCommitments.FindAsync(fbnr, revnr))!;
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
             });

Elwig/Services/DeliveryAncmtService.cs

@@ -8,6 +8,9 @@ using Microsoft.EntityFrameworkCore;
 using Elwig.Documents;
 using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
+using Microsoft.Win32;
+using System.Windows.Input;
+using System.Windows;
 using System;
 using LinqKit;
 using System.Windows.Controls;
@@ -62,11 +65,11 @@ namespace Elwig.Services {
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
-                var var = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var mgnr = await ctx.FetchMembers(includeNotActive: true).ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
-                var zwst = await ctx.FetchBranches().ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
-                var attr = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
-                var cult = await ctx.FetchWineCultivations().ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
+                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -258,41 +261,75 @@ namespace Elwig.Services {
                 .ThenBy(a => a.Member.MgNr);
 
             if (mode == ExportMode.SaveList) {
-                var filename = InteractionService.SaveFile(DeliveryAncmtList.Name, DeliveryAncmtList.Name, "ods");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = $"{DeliveryAncmtList.Name}.ods",
-                    await Utils.RunForeground(async () => {
+                    DefaultExt = "ods",
-                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                        using var ods = new OdsFile(filename);
+                    Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
-                        await ods.AddTable(data);
+                };
+                if (d.ShowDialog() == true) {
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                            using var ods = new OdsFile(d.FileName);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                await Task.Run(async () => {
-                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
+                    try {
-                    await Utils.ExportDocument(doc, mode);
+                        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;
             }
         }
 
+        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,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{weight:N0} kg", row, 2, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
             if (total1 != null && total1 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 3, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
             if (total2 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 4, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
         }
 
-        public static async Task<(string Text, (string?, string?, int, int?, int)[] Grid)> GenerateToolTipData(IQueryable<DeliveryAncmt> deliveryAncmts) {
+        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<DeliveryAncmt> deliveryAncmts) {
-            var grid = new List<(string?, string?, int, int?, int)>();
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
             var text = "-";
 
             var weight = await deliveryAncmts.SumAsync(p => p.Weight);
             text = $"{weight:N0} kg";
-            grid.Add(("Menge", null, weight, null, weight));
+            AddToolTipRow(grid, 0, "Menge", null, weight, null, weight);
 
             if (await deliveryAncmts.AnyAsync()) {
                 var attrGroups = await deliveryAncmts
@@ -333,11 +370,13 @@ namespace Elwig.Services {
                     .ThenBy(g => g.SortId)
                     .ToListAsync();
 
+                int rowNum = 1;
                 foreach (var attrG in attrGroups) {
+                    rowNum++;
                     var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    grid.Add((name, null, attrG.Weight, attrG.Weight, weight));
+                    AddToolTipRow(grid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
                     foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
-                        grid.Add((null, g.SortId, g.Weight, attrG.Weight, weight));
+                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
                     }
                 }
 
@@ -356,22 +395,7 @@ namespace Elwig.Services {
                 }
             }
 
-            return (text, grid.ToArray());
+            return (text, grid);
-        }
-
-        public static Grid GenerateToolTip((string?, string?, int, int?, int)[] data) {
-            var grid = new Grid();
-            grid.ColumnDefinitions.Add(new() { Width = new(10) });
-            grid.ColumnDefinitions.Add(new() { Width = new(60) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.ColumnDefinitions.Add(new() { Width = new(50) });
-            grid.ColumnDefinitions.Add(new() { Width = new(50) });
-            int rowNum = 0;
-            foreach (var row in data) {
-                if (rowNum != 0 && row.Item2 == null) rowNum++;
-                AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
-            }
-            return grid;
         }
     }
 }

Elwig/Services/DeliveryScheduleService.cs

@@ -60,8 +60,8 @@ namespace Elwig.Services {
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
-                var var = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var zwst = await ctx.FetchBranches().ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -174,12 +174,12 @@ namespace Elwig.Services {
                     ctx.Add(s);
                 }
 
-                await ctx.UpdateDeliveryScheduleWineVarieties(s, (await ctx.DeliveryScheduleWineVarieties
+                ctx.UpdateDeliveryScheduleWineVarieties(s, (await ctx.DeliveryScheduleWineVarieties
                     .Where(v => v.Year == s.Year && v.DsNr == s.DsNr)
                     .Select(v => new { v.Variety, v.Priority })
                     .ToListAsync())
-                    .Select(v => (v.Variety.SortId, v.Priority))
+                    .Select(v => (v.Variety, v.Priority))
-                    .ToList(), vm.MainVarieties.Select(v => (v.SortId, 1)).Union(vm.OtherVarieties.Select(v => (v.SortId, 2))).ToList());
+                    .ToList(), vm.MainVarieties.Select(v => (v, 1)).Union(vm.OtherVarieties.Select(v => (v, 2))).ToList());
 
                 await ctx.SaveChangesAsync();
             });

Elwig/Services/DeliveryService.cs

@@ -3,9 +3,12 @@ using Elwig.Helpers.Export;
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using Microsoft.Win32;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows;
 using System;
 using Elwig.ViewModels;
 using LinqKit;
@@ -22,6 +25,18 @@ namespace Elwig.Services {
             FromFilters, FromToday, FromSeason, FromSeasonAndBranch, Selected,
         };
 
+        public static async Task<Member?> GetMemberAsync(int mgnr) {
+            using var ctx = new AppDbContext();
+            return await ctx.Members
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .FirstOrDefaultAsync(m => m.MgNr == mgnr);
+        }
+
+        public static Member? GetMember(int mgnr) {
+            return GetMemberAsync(mgnr).GetAwaiter().GetResult();
+        }
+
         public static void ClearInputs(this DeliveryAdminViewModel vm) {
         }
 
@@ -56,7 +71,7 @@ namespace Elwig.Services {
             vm.IsNetWeight = p.IsNetWeight;
 
             vm.Modifiers.Clear();
-            foreach (var m in p.PartModifiers) {
+            foreach (var m in p.Modifiers) {
                 vm.Modifiers.Add((Modifier)ControlUtils.GetItemFromSourceWithPk(vm.ModifiersSource, m.Year, m.ModId)!);
             }
 
@@ -114,12 +129,12 @@ namespace Elwig.Services {
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
-                var var = await ctx.FetchWineVarieties().ToDictionaryAsync(v => v.SortId, v => v);
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var qual = await ctx.FetchWineQualityLevels(false).ToDictionaryAsync(q => q.QualId, q => q);
+                var qual = await ctx.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
-                var mgnr = await ctx.FetchMembers(includeNotActive: true).ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
-                var zwst = await ctx.FetchBranches().ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
-                var attr = await ctx.FetchWineAttributes().ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
-                var cult = await ctx.FetchWineCultivations().ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
+                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -457,7 +472,6 @@ namespace Elwig.Services {
                 DeliveryPart p;
 
                 using var ctx = new AppDbContext();
-                using var tx = await ctx.Database.BeginTransactionAsync();
                 int year = oldYear ?? Utils.CurrentYear;
                 int did = oldDid ?? await ctx.NextDId(year);
                 int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -476,7 +490,7 @@ namespace Elwig.Services {
                 if (partNew && timeIsDefault) {
                     newTimeString = DateTime.Now.ToString("HH:mm:ss");
                 } else if (partNew || timeHasChanged) {
-                    newTimeString = string.IsNullOrWhiteSpace(vm.Time) ? null : vm.Time + ":00";
+                    newTimeString = string.IsNullOrEmpty(vm.Time) ? null : vm.Time + ":00";
                 }
 
                 var d = new Delivery {
@@ -488,7 +502,7 @@ namespace Elwig.Services {
                     ZwstId = vm.Branch!.ZwstId,
                     LsNr = newLsNr ?? vm.LsNr!,
                     MgNr = vm.MgNr!.Value,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                 };
 
                 p = new DeliveryPart {
@@ -511,7 +525,7 @@ namespace Elwig.Services {
                     Unloading = vm.Unloading,
                     Temperature = vm.Temperature,
                     Acid = vm.Acid,
-                    Comment = string.IsNullOrWhiteSpace(vm.PartComment) ? null : vm.PartComment,
+                    Comment = string.IsNullOrEmpty(vm.PartComment) ? null : vm.PartComment,
 
                     Weight = vm.Weight!.Value,
                     IsManualWeighing = vm.IsManualWeighing,
@@ -534,21 +548,21 @@ namespace Elwig.Services {
                     ctx.Add(p);
                 }
 
-                await ctx.UpdateDeliveryPartModifiers(p, await ctx.DeliveryPartModifiers
+                ctx.UpdateDeliveryPartModifiers(p, await ctx.DeliveryPartModifiers
                     .Where(m => m.Year == p.Year && m.DId == p.DId && m.DPNr == p.DPNr)
-                    .Select(m => m.ModId)
+                    .Select(m => m.Modifier)
-                    .ToListAsync(), vm.Modifiers.Select(m => m.ModId).ToList());
+                    .ToListAsync(), vm.Modifiers);
 
                 if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
                     // update origin (KgNr), if default is selected
-                    var newKgNr = (await ctx.FetchMembers(d.MgNr).SingleOrDefaultAsync())?.DefaultKgNr;
+                    var newKgNr = (await ctx.Members.FindAsync(d.MgNr))?.DefaultKgNr;
-                    await ctx.DeliveryParts
+                    foreach (var part in d.Parts.Where(part => part.DPNr != dpnr && part.KgNr == originalMemberKgNr)) {
-                        .Where(p => p.Year == d.Year && p.DId == d.DId && p.DPNr != dpnr && p.KgNr == originalMemberKgNr)
+                        part.KgNr = newKgNr;
-                        .ExecuteUpdateAsync(u => u.SetProperty(p => p.KgNr, newKgNr));
+                        ctx.Update(part);
+                    }
                 }
 
                 await ctx.SaveChangesAsync();
-                await tx.CommitAsync();
 
                 return p;
             });
@@ -560,10 +574,7 @@ namespace Elwig.Services {
 
                 using var ctx = new AppDbContext();
                 bool anyLeft = false;
-                var d = await ctx.Deliveries
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    .Where(d => d.Year == year && d.DId == did)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                    .SingleAsync();
                 var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
                 n = new Delivery {
                     Year = year,
@@ -590,11 +601,7 @@ namespace Elwig.Services {
                         anyLeft = true;
                         p.Weight -= w;
                         ctx.Update(p);
-                        var s = new DeliveryPart {
+                        var s = ctx.CreateProxy<DeliveryPart>();
-                            SortId = null!,
-                            QualId = null!,
-                            HkId = null!,
-                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(s).CurrentValues.SetValues(values);
                         s.Year = n.Year;
@@ -625,11 +632,8 @@ namespace Elwig.Services {
                 Delivery n;
                 using var ctx = new AppDbContext();
                 var anyLeft = false;
-                n = (await ctx.Deliveries.Where(d => d.LsNr == lsnr).FirstAsync())!;
+                n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
-                var d = await ctx.Deliveries
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    .Where(d => d.Year == year && d.DId == did)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                    .SingleAsync();
                 var dpnr = await ctx.NextDPNr(n.Year, n.DId);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
                     if (w <= 0) {
@@ -641,11 +645,7 @@ namespace Elwig.Services {
                         anyLeft = true;
                         p.Weight -= w;
                         ctx.Update(p);
-                        var s = new DeliveryPart {
+                        var s = ctx.CreateProxy<DeliveryPart>();
-                            SortId = null!,
-                            QualId = null!,
-                            HkId = null!,
-                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(s).CurrentValues.SetValues(values);
                         s.Year = n.Year;
@@ -674,10 +674,7 @@ namespace Elwig.Services {
         public static async Task DepreciateDelivery(int year, int did, int[] weights) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                var d = await ctx.Deliveries
+                var d = (await ctx.Deliveries.FindAsync(year, did))!;
-                    .Where(d => d.Year == year && d.DId == did)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                    .SingleAsync();
                 var dpnr = await ctx.NextDPNr(year, did);
                 foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
                     if (w <= 0) {
@@ -689,11 +686,7 @@ namespace Elwig.Services {
                     } else {
                         p.Weight -= w;
                         ctx.Update(p);
-                        var n = new DeliveryPart {
+                        var n = ctx.CreateProxy<DeliveryPart>();
-                            SortId = null!,
-                            QualId = null!,
-                            HkId = null!,
-                        };
                         var values = ctx.Entry(p).CurrentValues;
                         ctx.Entry(n).CurrentValues.SetValues(values);
                         n.DPNr = dpnr++;
@@ -715,10 +708,18 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            await Utils.RunForeground(async () => {
+            Mouse.OverrideCursor = Cursors.Wait;
-                using var doc = await DeliveryNote.Initialize(year, did);
+            await Task.Run(async () => {
-                await Utils.ExportDocument(doc, mode, doc.Delivery.LsNr, (doc.Member, $"{DeliveryNote.Name} Nr. {doc.Delivery.LsNr}", $"Im Anhang finden Sie den {DeliveryNote.Name} Nr. {doc.Delivery.LsNr}"));
+                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;
         }
 
         public static async Task GenerateDeliveryJournal(this DeliveryAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -755,44 +756,78 @@ namespace Elwig.Services {
                 .ThenBy(p => p.DPNr);
 
             if (mode == ExportMode.SaveList) {
-                var filename = InteractionService.SaveFile(DeliveryJournal.Name, DeliveryJournal.Name, "ods");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = $"{DeliveryJournal.Name}.ods",
-                    await Utils.RunForeground(async () => {
+                    DefaultExt = "ods",
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                        using var ods = new OdsFile(filename);
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
-                        await ods.AddTable(data);
+                };
+                if (d.ShowDialog() == true) {
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                            using var ods = new OdsFile(d.FileName);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
-                var filename = InteractionService.SaveFile(DeliveryJournal.Name, subject == ExportSubject.Selected ? $"Lieferung_{vm.SelectedDelivery?.LsNr}" : $"Lieferungen_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}", "elwig.zip");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = subject == ExportSubject.Selected ? $"Lieferung_{vm.SelectedDelivery?.LsNr}.elwig.zip" : $"Lieferungen_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
-                    if (!filename.EndsWith(".elwig.zip")) filename += ".elwig.zip";
+                    DefaultExt = "elwig.zip",
-                    await Utils.RunForeground(async () => {
+                    Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                        var list = await query
+                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig",
-                            .Select(p => p.Delivery)
+                    AddExtension = false,
-                            .Distinct()
+                };
-                            .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                if (d.ShowDialog() == true) {
-                            .ToListAsync();
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
-                        var wbKgs = list
+                    Mouse.OverrideCursor = Cursors.Wait;
-                            .SelectMany(d => d.Parts)
+                    await Task.Run(async () => {
-                            .Where(p => p.Kg != null)
+                        try {
-                            .Select(p => p.Kg!)
+                            var list = await query
-                            .DistinctBy(k => k.KgNr)
+                                .Select(p => p.Delivery)
-                            .OrderBy(k => k.KgNr)
+                                .Distinct()
-                            .ToList();
+                                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                        await ElwigData.Export(filename, list, wbKgs, filterNames);
+                                .Include(d => d.Parts).ThenInclude(p => p.Rd)
+                                .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
+                                .AsSplitQuery()
+                                .ToListAsync();
+                            var wbKgs = list
+                                .SelectMany(d => d.Parts)
+                                .Where(p => p.Kg != null)
+                                .Select(p => p.Kg!)
+                                .DistinctBy(k => k.KgNr)
+                                .OrderBy(k => k.KgNr)
+                                .ToList();
+                            await ElwigData.Export(d.FileName, list, wbKgs, filterNames);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     await SyncService.Upload(App.Config.SyncUrl, App.Config.SyncUrl, App.Config.SyncPassword, query, filterNames);
                 });
+                Mouse.OverrideCursor = null;
             } else {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                await Task.Run(async () => {
-                    using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
+                    try {
-                    await Utils.ExportDocument(doc, mode);
+                        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;
             }
         }
 
@@ -813,11 +848,17 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            await Utils.RunForeground(async () => {
+            Mouse.OverrideCursor = Cursors.Wait;
-                var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
+            await Task.Run(async () => {
-                using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
+                try {
-                await Utils.ExportDocument(doc, mode);
+                    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) {
@@ -833,13 +874,24 @@ namespace Elwig.Services {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            var filename = InteractionService.SaveFile("Lieferstatistik pro Ort", $"Lieferstatistik-{vm.FilterSeason ?? Utils.CurrentLastSeason}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"Lieferstatistik-{vm.FilterSeason ?? Utils.CurrentLastSeason}.ods",
-                await Utils.RunForeground(async () => {
+                DefaultExt = "ods",
-                    using var ods = new OdsFile(filename);
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                    var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
+                Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
-                    await ods.AddTable(tbl);
+            };
+            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;
             }
         }
 
@@ -870,28 +922,45 @@ namespace Elwig.Services {
             filterNames.Remove("abgewertet");
 
             if (mode == ExportMode.SaveList) {
-                var filename = InteractionService.SaveFile(DeliveryDepreciationList.Name, $"{DeliveryDepreciationList.Name}-{vm.FilterSeason ?? Utils.CurrentLastSeason}", "ods");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = $"{DeliveryDepreciationList.Name}-{vm.FilterSeason ?? Utils.CurrentLastSeason}.ods",
-                    await Utils.RunForeground(async () => {
+                    DefaultExt = "ods",
-                        using var ods = new OdsFile(filename);
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                        var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
+                    Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
-                        tblTotal.FullName = DeliveryDepreciationList.Name;
+                };
-                        tblTotal.Name = "Gesamt";
+                if (d.ShowDialog() == true) {
-                        await ods.AddTable(tblTotal);
+                    Mouse.OverrideCursor = Cursors.Wait;
-                        foreach (var branch in await ctx.FetchBranches().ToListAsync()) {
+                    await Task.Run(async () => {
-                            var tbl = await DeliveryJournalData.FromQuery(query.Where(p => p.Delivery.ZwstId == branch.ZwstId), filterNames);
+                        try {
-                            tbl.FullName = DeliveryDepreciationList.Name;
+                            using var ods = new OdsFile(d.FileName);
-                            tbl.Name = branch.Name;
+                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                            await ods.AddTable(tbl);
+                            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 {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                await Task.Run(async () => {
-                    using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                    try {
-                    await Utils.ExportDocument(doc, mode);
+                        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;
             }
         }
 
@@ -918,36 +987,59 @@ namespace Elwig.Services {
                 .ThenBy(p => p.AttrId)
                 .ThenBy(p => p.CultId);
 
-            var filename = InteractionService.SaveFile("Liefermengen", "Liefermengen", "ods");
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"Liefermengen.ods",
-                await Utils.RunForeground(async () => {
+                DefaultExt = "ods",
-                    using var ods = new OdsFile(filename);
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                    var tblTotal = await MemberDeliveryData.FromQuery(query, filterNames);
+                Title = $"Liefermengen speichern unter - Elwig"
-                    var tbl = await MemberDeliveryPerVarietyData.FromQuery(query, filterNames);
+            };
-                    await ods.AddTable(tblTotal);
+            if (d.ShowDialog() == true) {
-                    await ods.AddTable(tbl);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ods = new OdsFile(d.FileName);
+                        var tblTotal = await MemberDeliveryData.FromQuery(query, filterNames);
+                        var tbl = await MemberDeliveryPerVarietyData.FromQuery(query, filterNames);
+                        await ods.AddTable(tblTotal);
+                        await ods.AddTable(tbl);
+                    } 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,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddWeightToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{weight:N0} kg", row, 2, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
             if (total1 != null && total1 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 3, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
             if (total2 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 4, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
         }
 
         private static void AddGradationToolTipRow(Grid grid, int row, string? h1, string? h2, double min, double avg, double max) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, bold: bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{min:N1}°", row, 2, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{min:N1}°", row, 2, 1, bold, true);
-            grid.AddToolTipCell($"{avg:N1}°", row, 3, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{avg:N1}°", row, 3, 1, bold, true);
-            grid.AddToolTipCell($"{max:N1}°", row, 4, bold: bold, alignRight: true);
+            AddToolTipCell(grid, $"{max:N1}°", row, 4, 1, bold, true);
         }
 
         public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
@@ -956,23 +1048,16 @@ namespace Elwig.Services {
             var gGrid = new List<(string?, string?, double, double, double)>();
             var gText = "-";
 
-            var stat = (await deliveryParts.GroupBy(p => 0)
+            var weight = await deliveryParts.SumAsync(p => p.Weight);
-                .Select(g => new {
+            wText = $"{weight:N0} kg";
-                    Weight = g.Sum(p => p.Weight),
+            wGrid.Add(("Menge", null, weight, null, weight));
-                    Min = g.Select(p => (double?)p.Kmw).DefaultIfEmpty().Min(),
-                    Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
-                    Max = g.Select(p => (double?)p.Kmw).DefaultIfEmpty().Max(),
-                })
-                .ToListAsync())
-                .DefaultIfEmpty(new { Weight = 0, Min = (double?)null, Avg = (double)0, Max = (double?)null })
-                .Single();
 
-            wText = $"{stat.Weight:N0} kg";
+            if (await deliveryParts.AnyAsync()) {
-            wGrid.Add(("Menge", null, stat.Weight, null, stat.Weight));
+                var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
-
+                var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
-            if (stat.Min != null && stat.Max != null) {
+                var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
-                gText = $"{stat.Min:N1}° / {stat.Avg:N1}° / {stat.Max:N1}°";
+                gText = $"{kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
-                gGrid.Add(("Gradation", null, stat.Min.Value, stat.Avg, stat.Max.Value));
+                gGrid.Add(("Gradation", null, kmwMin, kmwAvg, kmwMax));
 
                 var attrGroups = await deliveryParts
                     .GroupBy(p => new { Attr = p.Attribute!.Name, Cult = p.Cultivation!.Name })
@@ -1023,9 +1108,9 @@ namespace Elwig.Services {
 
                 foreach (var attrG in attrGroups) {
                     var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    wGrid.Add((name, null, attrG.Weight, attrG.Weight, stat.Weight));
+                    wGrid.Add((name, null, attrG.Weight, attrG.Weight, weight));
                     foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
-                        wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, stat.Weight));
+                        wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, weight));
                     }
                 }
                 foreach (var attrG in attrGroups) {
@@ -1044,12 +1129,12 @@ namespace Elwig.Services {
                         gText += $" [{name}]";
                     }
                     if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
-                        wText += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / stat.Weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+                        wText += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
                         gText += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
 
                     }
                 } else if (attrGroups.Count <= 4) {
-                    wText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / stat.Weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                    wText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
                     gText += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
                 }
             }
@@ -1076,9 +1161,9 @@ namespace Elwig.Services {
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.AddToolTipCell("Min.", 0, 2, alignCenter: true);
+            AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
-            gGrid.AddToolTipCell("⌀", 0, 3, alignCenter: true);
+            AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
-            gGrid.AddToolTipCell("Max.", 0, 4, alignCenter: true);
+            AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
             rowNum = 1;
             foreach (var row in gradationData) {
                 if (rowNum != 1 && row.Item2 == null) rowNum++;
@@ -1095,95 +1180,5 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
             });
         }
-
-        public static async Task<(int Year, int DId, int DPNr)[]> GetDidsFromFilters(this DeliveryAdminViewModel vm) {
-            using var ctx = new AppDbContext();
-            var (_, _, parts, _, _) = await vm.GetFilters(ctx);
-            return [.. (await parts.Select(p => new { p.Year, p.DId, p.DPNr }).ToListAsync()).Select(p => (p.Year, p.DId, p.DPNr))];
-        }
-
-        public static async Task BulkSetAttribute(this DeliveryAdminViewModel vm, string? attributeName) {
-            try {
-                string attrid;
-                if (attributeName == null) {
-                    attrid = "NULL";
-                } else {
-                    using var ctx = new AppDbContext();
-                    var attr = await ctx.WineAttributes.Where(a => a.Name == attributeName).SingleAsync();
-                    attrid = $"'{attr.AttrId}'";
-                }
-                var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Attribut setzen",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) das Attribut\n'{attributeName}' gesetz werden?"))
-                    return;
-
-                await Utils.RunForeground(async () => {
-                    using (var cnx = await AppDbContext.ConnectAsync()) {
-                        await cnx.ExecuteBatch($"""
-                        UPDATE delivery_part SET attrid = {attrid}
-                        WHERE (year, did, dpnr) IN ({string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr})"))})
-                        """);
-                    }
-                    App.HintContextChange();
-                });
-            } catch (Exception exc) {
-                InteractionService.ShowException(exc);
-            }
-        }
-
-        public static async Task BulkAddModifier(this DeliveryAdminViewModel vm, string modifierName) {
-            try {
-                string modid;
-                using (var ctx = new AppDbContext()) {
-                    var attr = await ctx.Modifiers.Where(a => a.Name == modifierName).FirstAsync();
-                    modid = $"'{attr.ModId}'";
-                }
-
-                var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Zu-/Abschlag hinzufügen",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' hinzugefügt werden?"))
-                    return;
-
-                await Utils.RunForeground(async () => {
-                    using (var cnx = await AppDbContext.ConnectAsync()) {
-                        await cnx.ExecuteBatch($"""
-                        INSERT INTO delivery_part_modifier (year, did, dpnr, modid)
-                        VALUES {string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr},{modid})"))}
-                        ON CONFLICT DO NOTHING
-                        """);
-                    }
-                    App.HintContextChange();
-                });
-            } catch (Exception exc) {
-                InteractionService.ShowException(exc);
-            }
-        }
-
-        public static async Task BulkRemoveModifier(this DeliveryAdminViewModel vm, string modifierName) {
-            try {
-                string modid;
-                using (var ctx = new AppDbContext()) {
-                    var attr = await ctx.Modifiers.Where(a => a.Name == modifierName).FirstAsync();
-                    modid = $"'{attr.ModId}'";
-                }
-
-                var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Zu-/Abschlag entfernen",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' entfernt werden?"))
-                    return;
-
-                await Utils.RunForeground(async () => {
-                    using (var cnx = await AppDbContext.ConnectAsync()) {
-                        await cnx.ExecuteBatch($"""
-                        DELETE FROM delivery_part_modifier
-                        WHERE (year, did, dpnr, modid) IN ({string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr},{modid})"))})
-                        """);
-                    }
-                    App.HintContextChange();
-                });
-            } catch (Exception exc) {
-                InteractionService.ShowException(exc);
-            }
-        }
     }
 }

Elwig/Services/InteractionService.cs

@@ -1,163 +0,0 @@
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Windows;
-
-namespace Elwig.Services {
-    public static class InteractionService {
-
-        public static Func<string, string, string, string?>? Override;
-        public static Action<string, string>? NextInformation;
-        public static Action<string, string>? NextWarning;
-        public static Action<string, string>? NextError;
-        public static Func<string, string, bool>? NextContinue;
-        public static Func<string, string, bool>? NextConfirmation;
-        public static Func<string, string, bool>? NextQuestion;
-        public static Func<string, string, string?>? NextSave;
-
-        public static readonly Dictionary<string, string> ExtensionFilters = new() {
-            ["pdf"] = "PDF-Datei (*.pdf)|*.pdf",
-            ["ods"] = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-            ["vcf"] = "vCard-Datei (*.vcf)|*.vcf",
-            ["xml"] = "EBICS-Datei (*.xml)|*.xml",
-            ["csv"] = "CSV-Datei (*.csv)|*.csv",
-            ["sql.zip"] = "Komprimierte SQL-Datei (*.sql.zip)|*.sql.zip",
-            ["elwig.zip"] = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-        };
-
-        public static void ShowInformation(string title, string text) {
-            if (NextInformation != null) {
-                NextInformation(title, text);
-                NextInformation = null;
-            } else if (Override != null) {
-                Override("information", title, text);
-            } else {
-                MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-        }
-
-        public static bool AskContinue(string title, string text) {
-            if (NextContinue != null) {
-                var r = NextContinue(title, text);
-                NextContinue = null;
-                return r;
-            } else if (Override != null) {
-                return Override("continue", title, text) != null;
-            } else {
-                return MessageBox.Show(text, title, MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel) == MessageBoxResult.OK;
-            }
-        }
-
-        public static bool? AskContinueYesNo(string title, string text) {
-            if (NextContinue != null) {
-                var r = NextContinue(title, text);
-                NextContinue = null;
-                return r;
-            } else if (Override != null) {
-                return Override("continue", title, text) != null;
-            } else {
-                var r = MessageBox.Show(text, title, MessageBoxButton.YesNoCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                return r == MessageBoxResult.Yes ? true : r == MessageBoxResult.No ? false : null;
-            }
-        }
-
-        public static bool AskConfirmation(string title, string text) {
-            if (NextConfirmation != null) {
-                var r = NextConfirmation(title, text);
-                NextConfirmation = null;
-                return r;
-            } else if (Override != null) {
-                return Override("confirm", title, text) != null;
-            } else {
-                return MessageBox.Show(text, title, MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) == MessageBoxResult.Yes;
-            }
-        }
-
-        public static bool AskQuestion(string title, string text, bool defaultResult) {
-            if (NextQuestion != null) {
-                var r = NextQuestion(title, text);
-                NextQuestion = null;
-                return r;
-            } else if (Override != null) {
-                return Override("question", title, text) != null;
-            } else {
-                return MessageBox.Show(text, title, MessageBoxButton.YesNo, MessageBoxImage.Question, defaultResult ? MessageBoxResult.Yes : MessageBoxResult.No) == MessageBoxResult.Yes;
-            }
-        }
-
-        public static void ShowWarning(string title, string text) {
-            if (NextWarning != null) {
-                NextWarning(title, text);
-                NextWarning = null;
-            } else if (Override != null) {
-                Override("warning", title, text);
-            } else {
-                MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Warning);
-            }
-        }
-
-        public static void ShowError(string title, string text) {
-            if (NextError != null) {
-                NextError(title, text);
-                NextError = null;
-            } else if (Override != null) {
-                Override("error", title, text);
-            } else {
-                MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        public static void ShowException(Exception exc, bool showExcType = false, bool isError = true) {
-            ShowException("Fehler", exc, showExcType, isError);
-        }
-
-        public static void ShowException(string title, Exception exc, bool showExcType = false, bool isError = true) {
-            ShowException(title, null, exc, showExcType, isError);
-        }
-
-        public static void ShowException(string title, string? text, Exception exc, bool showExcType = false, bool isError = true) {
-            text = text == null ? "" : text + (text.EndsWith('.') || text.EndsWith('!') || text.EndsWith('?') ? "" : ":") + "\n\n";
-            text += exc.Message + (showExcType ? $" ({exc.GetType().Name})" : "");
-            if (exc.InnerException != null) text += "\n\n" + exc.InnerException.Message;
-            if (isError) {
-                ShowError(title, text);
-            } else {
-                ShowWarning(title, text);
-            }
-        }
-
-        public static void ShowDbException(string title, Exception exc) {
-            ShowException(title, "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!", exc);
-        }
-
-        public static bool AskException(string title, string? text, Exception exc) {
-            text = text == null ? "" : text + (text.EndsWith('.') || text.EndsWith('!') || text.EndsWith('?') ? "" : ":") + "\n\n";
-            text += exc.Message;
-            if (exc.InnerException != null) text += "\n\n" + exc.InnerException.Message;
-            if (Override != null) {
-                return Override("error", title, text) != null;
-            } else {
-                return MessageBox.Show(text, title, MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No) == MessageBoxResult.Yes;
-            }
-        }
-
-        public static string? SaveFile(string title, string defaultFileName, string extension) {
-            if (NextSave != null) {
-                var r = NextSave(title, $"{defaultFileName}.{extension}");
-                NextSave = null;
-                return r;
-            } else if (Override != null) {
-                return Override("save", title, $"{defaultFileName}.{extension}");
-            } else {
-                var d = new SaveFileDialog() {
-                    FileName = $"{defaultFileName}.{extension}",
-                    DefaultExt = extension,
-                    Filter = ExtensionFilters.GetValueOrDefault(extension, ""),
-                    Title = $"{title} speichern unter - Elwig",
-                    AddExtension = !extension.Contains('.'),
-                };
-                return d.ShowDialog() == true ? d.FileName : null;
-            }
-        }
-    }
-}

Elwig/Services/MemberBusinessSharesService.cs

@@ -1,98 +0,0 @@
-using Elwig.Helpers;
-using Elwig.Models;
-using Elwig.Models.Entities;
-using Elwig.ViewModels;
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Elwig.Services {
-    public static class MemberBusinessSharesService {
-
-        public static async Task InitInputs(this MemberBusinessSharesViewModel vm) {
-            using var ctx = new AppDbContext();
-            vm.DateNoticeString = $"{Utils.Today:dd.MM.yyyy}";
-            vm.ValuePerShare = (await ctx.Seasons.OrderBy(s => s.Year).LastOrDefaultAsync())?.BusinessShareValue;
-        }
-
-        public static void ClearInputs(this MemberBusinessSharesViewModel vm) {
-
-        }
-
-        public static void FillInputs(this MemberBusinessSharesViewModel vm, MemberHistory h) {
-            var mgnr = vm.FilterMember.MgNr;
-            vm.DateNotice = h.DateNotice;
-            vm.DateEffective = h.DateEffective;
-            vm.Reason = h.Reason + (h.Reason == MemberHistory.REASON_TRANSFER ? $"_{(h.ToMgNr == mgnr ? "from" : "to")}" : "");
-            vm.Shares = h.Shares;
-            vm.MemberHasSigned = h.MemberHasSigned;
-            vm.ValuePerShare = h.ValuePerShare;
-            vm.OtherMgNr = h.FromMgNr != null && h.FromMgNr != mgnr ? h.FromMgNr : h.ToMgNr != null && h.ToMgNr != mgnr ? h.ToMgNr : null;
-            vm.DeductYear = h.DeductYear ?? h.DateNotice.Year;
-            vm.Deduct = h.DeductYear != null;
-            vm.Comment = h.Comment;
-        }
-
-        public static async Task<int> UpdateMemberHistory(this MemberBusinessSharesViewModel vm, int? oldHistNr, bool enableTriggers) {
-            return await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var tx = await ctx.Database.BeginTransactionAsync();
-                await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = {(enableTriggers ? "1" : "0")} WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-
-                var h = new MemberHistory {
-                    HistNr = oldHistNr ?? await ctx.NextHistNr(),
-                    FromMgNr =
-                        vm.Reason == $"{MemberHistory.REASON_TRANSFER}_from" ? vm.OtherMgNr :
-                        vm.Reason == MemberHistory.REASON_PURCHASE || vm.Reason == MemberHistory.REASON_PRESCRIPTION ? null :
-                        vm.FilterMember.MgNr,
-                    FromType =
-                        vm.Reason == MemberHistory.REASON_PAYOUT ? BusinessShareType.Dormant :
-                        vm.Reason == MemberHistory.REASON_PURCHASE || vm.Reason == MemberHistory.REASON_PRESCRIPTION ? null :
-                        BusinessShareType.Normal,
-                    ToMgNr =
-                        vm.Reason == MemberHistory.REASON_PAYOUT || vm.Reason == MemberHistory.REASON_EXCLUSION ? null :
-                        vm.Reason == $"{MemberHistory.REASON_TRANSFER}_to" ? vm.OtherMgNr :
-                        vm.FilterMember.MgNr,
-                    ToType =
-                        vm.Reason == MemberHistory.REASON_PAYOUT || vm.Reason == MemberHistory.REASON_EXCLUSION ? null :
-                        vm.Reason == MemberHistory.REASON_RETIREMENT || vm.Reason == MemberHistory.REASON_DECEASED ? BusinessShareType.Dormant :
-                        BusinessShareType.Normal,
-                    DateNoticeString = $"{vm.DateNotice:yyyy-MM-dd}",
-                    DateEffectiveString = $"{vm.DateEffective:yyyy-MM-dd}",
-                    Reason = vm.Reason?.Split("_")[0] ?? MemberHistory.REASON_CONVERT,
-                    Source = "manual",
-                    Shares = vm.Shares ?? 0,
-                    MemberHasSigned = vm.MemberHasSigned,
-                    ValuePerShare = vm.ValuePerShare,
-                    CurrencyCode = vm.ValuePerShare != null ? "EUR" : null,
-                    DeductYear = vm.Deduct ? vm.DeductYear : null,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment.Trim(),
-                };
-
-                if (oldHistNr != null) {
-                    ctx.Update(h);
-                } else {
-                    ctx.Add(h);
-                }
-
-                await ctx.SaveChangesAsync();
-                await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-                await tx.CommitAsync();
-
-                return h.HistNr;
-            });
-        }
-
-
-        public static async Task DeleteMemberHistory(int histnr, bool enableTriggers) {
-            await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                var tx = await ctx.Database.BeginTransactionAsync();
-                await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = {(enableTriggers ? "1" : "0")} WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-                await ctx.MemberHistory.Where(h => h.HistNr == histnr).ExecuteDeleteAsync();
-                await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-                await tx.CommitAsync();
-            });
-        }
-    }
-}

Elwig/Services/MemberService.cs

@@ -6,10 +6,13 @@ 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.Linq;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -126,15 +129,7 @@ namespace Elwig.Services {
 
             vm.EntryDate = (m.EntryDateString != null) ? string.Join(".", m.EntryDateString.Split("-").Reverse()) : null;
             vm.ExitDate = (m.ExitDateString != null) ? string.Join(".", m.ExitDateString.Split("-").Reverse()) : null;
-            if (App.Client.HasRedWhite) {
+            vm.BusinessShares = m.BusinessShares;
-                vm.BusinessShares1 = m.SharesRed;
-                vm.BusinessShares2 = m.SharesWhite;
-                vm.BusinessShares3 = m.SharesDormant + m.Shares;
-            } else {
-                vm.BusinessShares1 = m.Shares;
-                vm.BusinessShares2 = m.SharesDormant + m.SharesRed + m.SharesWhite;
-                vm.BusinessShares3 = 0;
-            }
             vm.AccountingNr = m.AccountingNr;
             vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, m.ZwstId);
             vm.DefaultKg = (AT_Kg?)ControlUtils.GetItemFromSourceWithPk(vm.DefaultKgSource, m.DefaultKgNr);
@@ -177,7 +172,7 @@ namespace Elwig.Services {
                 var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason);
                 int maxKgPerHa = 10_000;
                 try {
-                    var s = await ctx.FetchSeasons().FirstOrDefaultAsync();
+                    var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
                     if (s != null) maxKgPerHa = s.MaxKgPerHa;
                 } catch { }
                 var (text, gridData) = await AreaComService.GenerateToolTipData(c, maxKgPerHa);
@@ -230,8 +225,8 @@ namespace Elwig.Services {
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
-                var branches = await ctx.FetchBranches().ToListAsync();
+                var branches = await ctx.Branches.ToListAsync();
-                var mgnr = await ctx.FetchMembers(includeNotActive: true).ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
                 var kgs = await ctx.WbKgs.ToDictionaryAsync(k => k.AtKg.Name.ToLower(), k => k.AtKg);
                 var areaComs = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => $"{t.SortId}{t.AttrId}", t => t);
 
@@ -397,29 +392,58 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            await Utils.RunForeground(async () => {
+            Mouse.OverrideCursor = Cursors.Wait;
-                 using var doc = new MemberDataSheet(m);
+            await Task.Run(async () => {
-                 await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+                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) {
-            await Utils.RunForeground(async () => {
+            Mouse.OverrideCursor = Cursors.Wait;
-                var b = await Billing.Create(year);
+            await Task.Run(async () => {
-                await b.FinishSeason();
+                try {
-                await b.CalculateBuckets();
+                    var b = new Billing(year);
-                App.HintContextChange();
+                    await b.FinishSeason();
+                    await b.CalculateBuckets();
+                    App.HintContextChange();
 
-                using var doc = new DeliveryConfirmation(year, m, null);
+                    using var ctx = new AppDbContext();
-                await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
+                    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) {
-            await Utils.RunForeground(async () => {
+            Mouse.OverrideCursor = Cursors.Wait;
-                using var doc = await CreditNote.Initialize(year, avnr, m.MgNr, null);
+            await Task.Run(async () => {
-                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {doc.Payment.Variant.Name}", $"Im Anhang finden Sie die Traubengutschrift {doc.Payment.Variant.Name}"));
+                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);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateMemberList(this MemberAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -464,72 +488,109 @@ namespace Elwig.Services {
             }
 
             if (mode == ExportMode.SaveList) {
-                var filename = InteractionService.SaveFile(MemberList.Name, MemberList.Name, "ods");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = $"{MemberList.Name}.ods",
-                    await Utils.RunForeground(async () => {
+                    DefaultExt = "ods",
-                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                        using var ods = new OdsFile(filename);
+                    Title = $"{MemberList.Name} speichern unter - Elwig"
-                        await ods.AddTable(data);
+                };
+                if (d.ShowDialog() == true) {
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                            using var ods = new OdsFile(d.FileName);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Vcf) {
-                var filename = InteractionService.SaveFile("Kontakte", "Mitglieder", "vcf");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = "Mitglieder.vcf",
-                    await Utils.RunForeground(async () => {
+                    DefaultExt = "vcf",
-                        var members = await query
+                    Filter = "vCard-Datei (*.vcf)|*.vcf",
-                            .OrderBy(m => m.MgNr)
+                    Title = "Kontakte speichern unter - Elwig"
-                            .Include(m => m.TelephoneNumbers)
+                };
-                            .Include(m => m.EmailAddresses)
+                if (d.ShowDialog() == true) {
-                            .ToListAsync();
+                    Mouse.OverrideCursor = Cursors.Wait;
-                        using var exporter = new VCard(filename);
+                    await Task.Run(async () => {
-                        await exporter.ExportAsync(members);
+                        try {
+                            var members = await query
+                                .OrderBy(m => m.MgNr)
+                                .Include(m => m.BillingAddress)
+                                .Include(m => m.TelephoneNumbers)
+                                .Include(m => m.EmailAddresses)
+                                .AsSplitQuery()
+                                .ToListAsync();
+                            using var exporter = new VCard(d.FileName);
+                            await exporter.ExportAsync(members);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Export) {
-                var filename = InteractionService.SaveFile(MemberList.Name, subject == ExportSubject.Selected ? $"Mitglied_{vm.SelectedMember?.MgNr}" : $"Mitglieder_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}", "elwig.zip");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    FileName = subject == ExportSubject.Selected ? $"Mitglied_{vm.SelectedMember?.MgNr}.elwig.zip" : $"Mitglieder_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip",
-                    if (!filename.EndsWith(".elwig.zip")) filename += ".elwig.zip";
+                    DefaultExt = "elwig.zip",
-                    await Utils.RunForeground(async () => {
+                    Filter = "Elwig-Export-Datei (*.elwig.zip)|*.elwig.zip",
-                        var members = await query
+                    Title = $"{MemberList.Name} speichern unter - Elwig",
-                            .OrderBy(m => m.MgNr)
+                    AddExtension = false,
-                            .Include(m => m.TelephoneNumbers)
+                };
-                            .Include(m => m.EmailAddresses)
+                if (d.ShowDialog() == true) {
-                            .ToListAsync();
+                    if (!d.FileName.EndsWith(".elwig.zip")) d.FileName += ".elwig.zip";
-                        var history1 = await query.IgnoreAutoIncludes()
+                    Mouse.OverrideCursor = Cursors.Wait;
-                            .SelectMany(m => m.HistoryFrom)
+                    await Task.Run(async () => {
-                            .ToListAsync();
+                        try {
-                        var history2 = await query.IgnoreAutoIncludes()
+                            var members = await query
-                            .SelectMany(m => m.HistoryTo)
+                                .OrderBy(m => m.MgNr)
-                            .ToListAsync();
+                                .Include(m => m.BillingAddress)
-                        var history = history1.Union(history2)
+                                .Include(m => m.TelephoneNumbers)
-                            .DistinctBy(h => h.HistNr)
+                                .Include(m => m.EmailAddresses)
-                            .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
+                                .Include(m => m.DefaultWbKg!.Gl)
-                            .ToList();
+                                .AsSplitQuery()
-                        var areaComs = await query
+                                .ToListAsync();
-                            .SelectMany(m => m.AreaCommitments)
+                            var areaComs = await query
-                            .Select(c => c.Contract).Distinct()
+                                .SelectMany(m => m.AreaCommitments)
-                            .Include(c => c.Revisions)
+                                .Include(c => c.Rd)
-                            .ToListAsync();
+                                .Include(c => c.Kg.Gl)
-                        var wbKgs = members
+                                .ToListAsync();
-                            .Where(m => m.DefaultWbKg != null)
+                            var wbKgs = members
-                            .Select(m => m.DefaultWbKg!)
+                                .Where(m => m.DefaultWbKg != null)
-                            .Union(areaComs.Select(c => c.Kg))
+                                .Select(m => m.DefaultWbKg!)
-                            .Distinct()
+                                .Union(areaComs.Select(c => c.Kg))
-                            .OrderBy(k => k.KgNr)
+                                .Distinct()
-                            .ToList();
+                                .OrderBy(k => k.KgNr)
-                        await ElwigData.Export(filename, members, history, areaComs, wbKgs, filterNames);
+                                .ToList();
+                            await ElwigData.Export(d.FileName, members, areaComs, wbKgs, filterNames);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     await SyncService.Upload(App.Config.SyncUrl, App.Config.SyncUrl, App.Config.SyncPassword, query, filterNames);
                 });
+                Mouse.OverrideCursor = null;
             } else {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                await Task.Run(async () => {
-                    using var doc = new MemberList(string.Join(" / ", filterNames), data);
+                    try {
-                    await Utils.ExportDocument(doc, mode);
+                        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;
             }
         }
 
@@ -544,33 +605,30 @@ namespace Elwig.Services {
                 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.IsNullOrWhiteSpace(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                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.IsNullOrWhiteSpace(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrWhiteSpace(vm.Bic) ? null : vm.Bic,
+                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
 
-                UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
+                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
                 IsBuchführend = vm.IsBuchführend,
                 IsOrganic = vm.IsOrganic,
 
-                EntryDateString = string.IsNullOrWhiteSpace(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrWhiteSpace(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                Shares = App.Client.HasRedWhite ? 0 : vm.BusinessShares1 ?? 0,
+                BusinessShares = (int)vm.BusinessShares!,
-                SharesRed = App.Client.HasRedWhite ? vm.BusinessShares1 ?? 0 : 0,
+                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                SharesWhite = App.Client.HasRedWhite ? vm.BusinessShares2 ?? 0 : 0,
-                SharesDormant = App.Client.HasRedWhite ? vm.BusinessShares3 ?? 0 : vm.BusinessShares2 ?? 0,
-                AccountingNr = string.IsNullOrWhiteSpace(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.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                 ContactViaPost = vm.ContactViaPost,
                 ContactViaEmail = vm.ContactViaEmail,
             };
@@ -623,17 +681,19 @@ namespace Elwig.Services {
                         .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
                         .ToListAsync();
 
-                    ctx.AddRange(await Task.WhenAll(areaComs.Select(async (c, i) => new AreaCom {
+                    var fbNr = await ctx.NextFbNr();
-                        FbNr = c.FbNr,
+                    ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
-                        RevNr = await ctx.NextRevNr(c.FbNr),
+                        FbNr = fbNr + i,
                         MgNr = m.MgNr,
                         VtrgId = c.VtrgId,
                         CultId = c.CultId,
                         Area = c.Area,
+                        KgNr = c.KgNr,
                         GstNr = c.GstNr,
-                        YearFrom = year,
+                        RdNr = c.RdNr,
+                        YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
                         YearTo = c.YearTo,
-                    })));
+                    }));
 
                     foreach (var ac in areaComs)
                         ac.YearTo = year - 1;
@@ -665,20 +725,18 @@ namespace Elwig.Services {
         public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
             await Task.Run(async () => {
                 using var ctx = new AppDbContext();
-                using var tx = await ctx.Database.BeginTransactionAsync();
+                var l = (await ctx.Members.FindAsync(mgnr))!;
-                var l = await ctx.FetchMembers(mgnr).SingleAsync();
                 if (deletePaymentData) {
-                    await ctx.Credits.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
+                    ctx.RemoveRange(l.Credits);
                 }
                 if (deleteDeliveries) {
-                    await ctx.Deliveries.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
+                    ctx.RemoveRange(l.Deliveries);
                 }
                 if (deleteAreaComs) {
-                    await ctx.AreaCommitments.Where(c => c.MgNr == mgnr).ExecuteDeleteAsync();
+                    ctx.RemoveRange(l.AreaCommitments);
                 }
                 ctx.Remove(l);
                 await ctx.SaveChangesAsync();
-                await tx.CommitAsync();
             });
         }
     }

Elwig/Services/PaymentVariantService.cs

@@ -6,12 +6,13 @@ 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.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class PaymentVariantService {
@@ -141,7 +142,7 @@ namespace Elwig.Services {
             });
 
             var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
-            if (!(await credits.AnyAsync())) {
+            if (!credits.Any()) {
                 long lastTotalSum = 0;
                 decimal vatSum = 0;
                 var currentPayments = await ctx.MemberPayments
@@ -149,7 +150,8 @@ namespace Elwig.Services {
                         .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)
+                    .OrderByDescending(l => l.TransferDateString ?? l.DateString)
+                    .ThenByDescending(l => l.AvNr)
                     .FirstOrDefaultAsync();
                 if (lastV != null) {
                     var lastPayments = await ctx.MemberPayments
@@ -158,8 +160,8 @@ namespace Elwig.Services {
                     lastTotalSum = lastPayments.Sum(e => e.Value.AmountValue);
                     foreach (int mgnr in currentPayments.Keys) {
                         var c = currentPayments[mgnr];
-                        var l = lastPayments.GetValueOrDefault(mgnr);
+                        var l = lastPayments[mgnr];
-                        vatSum += (c.Amount - (l?.Amount ?? 0)) * (decimal)(c.Member.IsBuchführend ? v.Season.VatNormal : v.Season.VatFlatrate);
+                        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));
@@ -188,58 +190,99 @@ namespace Elwig.Services {
 
         public static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
             if (mode == ExportMode.SaveList) {
-                var filename = InteractionService.SaveFile($"Variantendaten {v.Name}", $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}", "ods");
+                var d = new SaveFileDialog() {
-                if (filename == null)
+                    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;
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    using var ctx = new AppDbContext();
+                await Task.Run(async () => {
-                    var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                    try {
-                    using var ods = new OdsFile(filename);
+                        using var ctx = new AppDbContext();
-                    await ods.AddTable(data);
+                        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 {
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
-                    using var doc = await PaymentVariantSummary.Initialize(v.Year, v.AvNr);
+                await Task.Run(async () => {
-                    await Utils.ExportDocument(doc, mode);
+                    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.Include(v => v.Credits).Where(v => v.Year == year && v.AvNr == avnr).SingleAsync();
+            var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
 
             var withoutIban = v.Credits.Count(c => c.Member.Iban == null);
             if (withoutIban > 0) {
-                if (!InteractionService.AskContinue("Mitglieder ohne IBAN",
+                var r = MessageBox.Show($"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert.",
-                    $"Achtung: Für {withoutIban:N0} Mitglieder ist kein IBAN hinterlegt.\n\nDiese werden NICHT exportiert."))
+                    "Mitglieder ohne IBAN", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    return;
+                if (r != MessageBoxResult.OK) return;
             }
             var withNegAmount = v.Credits.Count(c => c.Amount <= 0);
             if (withNegAmount > 0) {
-                if (!InteractionService.AskContinue("Traubengutschriften mit negativem Betrag",
+                var r = MessageBox.Show($"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert.",
-                    $"Achtung: Es gibt {withNegAmount:N0} Traubengutschriften mit negativem Betrag.\n\nDiese werden NICHT exportiert."))
+                    "Traubengutschriften mit negativem Betrag", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.OK);
-                    return;
+                if (r != MessageBoxResult.OK) return;
             }
 
-            var filename = InteractionService.SaveFile("Überweisungsdaten", $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}", Ebics.FileExtension);
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}.{Ebics.FileExtension}",
-                await Utils.RunForeground(async () => {
+                DefaultExt = Ebics.FileExtension,
-                    using var e = new Ebics(v, filename, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
+                Filter = "EBICS-Datei (*.xml)|*.xml",
-                    await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                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 filename = InteractionService.SaveFile("Buchungsliste", $"{App.Client.NameToken}-Buchungsliste-{year}-{name.Trim().Replace(' ', '-')}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"{App.Client.NameToken}-Buchungsliste-{year}-{name.Trim().Replace(' ', '-')}.ods",
-                await Utils.RunForeground(async () => {
+                DefaultExt = "ods",
-                    using var ctx = new AppDbContext();
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, year, avnr);
+                Title = $"Buchungsliste speichern unter - Elwig"
-                    using var ods = new OdsFile(filename);
+            };
-                    await ods.AddTable(tbl);
+            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;
             }
         }
 
@@ -300,7 +343,7 @@ namespace Elwig.Services {
                     TransferDate = vm.TransferDate,
                     TestVariant = vm.SelectedPaymentVariant?.TestVariant ?? true,
                     CalcTimeUnix = vm.SelectedPaymentVariant?.CalcTimeUnix,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                     Data = JsonSerializer.Serialize(d.Data),
                 };
                 avnr = v.AvNr;
@@ -322,51 +365,21 @@ namespace Elwig.Services {
 
         public static async Task Calculate(int year, int avnr) {
             await Task.Run(async () => {
-                var b = await BillingVariant.Create(year, avnr);
+                var b = new BillingVariant(year, avnr);
                 await b.Calculate();
             });
         }
 
         public static async Task Commit(int year, int avnr) {
-            List<Member> membersLess = [];
-            using (var ctx = new AppDbContext()) {
-                var lastAvNr = await ctx.PaymentVariants
-                    .Where(v => v.Year == year && !v.TestVariant)
-                    .OrderByDescending(v => v.TransferDateString ?? v.DateString).ThenByDescending(v => v.AvNr)
-                    .Select(v => v.AvNr)
-                    .FirstOrDefaultAsync();
-                if (lastAvNr != 0) {
-                    var cur = await ctx.MemberPayments.Include(p => p.Member).Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(p => p.Member.MgNr, p => p);
-                    var last = await ctx.MemberPayments.Include(p => p.Member).Where(p => p.Year == year && p.AvNr == lastAvNr).ToDictionaryAsync(p => p.Member.MgNr, p => p);
-                    membersLess = [.. last.Where(p => (cur.TryGetValue(p.Key, out var c) ? c.Amount : 0) < p.Value.Amount).Select(p => p.Value.Member)];
-                }
-            }
-            if (membersLess.Count > 0) {
-                if (!InteractionService.AskContinue("Kleinerer Gesamtbetrag",
-                    $"Achtung: Bei {membersLess.Count:N0} Mitglied(ern) ist der Soll-Betrag der Auszahlung (\"Gesamtbetrag\") kleiner als bei der letzten Auszahlung. Das sollte nicht vorkommen!\n\n" +
-                    $"{string.Join(", ", membersLess.Select(m => $"{m.AdministrativeName} ({m.MgNr})"))}\n\n" +
-                    "Soll trotzdem forgefahren werden?"))
-                    return;
-            }
-
             await Task.Run(async () => {
-                var b = await BillingVariant.Create(year, avnr);
+                var b = new BillingVariant(year, avnr);
                 await b.Commit();
             });
-
-            List<Member> membersNeg = [];
-            using (var ctx = new AppDbContext()) {
-                membersNeg = await ctx.Credits.Where(c => c.Year == year && c.AvNr == avnr && c.AmountValue < 0).Select(c => c.Member).ToListAsync();
-            }
-            if (membersNeg.Count > 0) {
-                InteractionService.ShowWarning("Negativer Auszahlungsbetrag", $"Achtung: Bei {membersNeg.Count:N0} Mitglied(ern) ist der Auszahlungsbetrag negativ!\n\n" +
-                    $"{string.Join(", ", membersNeg.Select(m => $"{m.AdministrativeName} ({m.MgNr})"))}");
-            }
         }
 
         public static async Task Revert(int year, int avnr) {
             await Task.Run(async () => {
-                var b = await BillingVariant.Create(year, avnr);
+                var b = new BillingVariant(year, avnr);
                 await b.Revert();
             });
         }

Elwig/Services/SyncService.cs

@@ -10,12 +10,12 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Net.Http;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Services {
     public static class SyncService {
 
         public static readonly Expression<Func<Member, bool>> ChangedMembers = (m) => ((m.XTime == null && m.MTime > 1751328000) || m.MTime > m.XTime) && (m.ITime == null || m.MTime > m.ITime);
-        public static readonly Expression<Func<AreaComContract, bool>> ChangedAreaComContracts = (c) => ((c.XTime == null && c.MTime > 1751328000) || c.MTime > c.XTime) && (c.ITime == null || c.MTime > c.ITime);
         public static readonly Expression<Func<Delivery, bool>> ChangedDeliveries = (d) => ((d.XTime == null && d.MTime > 1751328000) || d.MTime > d.XTime) && (d.ITime == null || d.MTime > d.ITime);
 
         public static async Task Upload(string url, string username, string password, IQueryable<Member> query, IEnumerable<string> filterNames) {
@@ -24,24 +24,17 @@ namespace Elwig.Services {
                 var path = Path.Combine(App.TempPath, filename);
                 var members = await query
                     .OrderBy(m => m.MgNr)
+                    .Include(m => m.BillingAddress)
                     .Include(m => m.TelephoneNumbers)
                     .Include(m => m.EmailAddresses)
+                    .Include(m => m.DefaultWbKg!.Gl)
+                    .AsSplitQuery()
                     .ToListAsync();
-                var history1 = await query.IgnoreAutoIncludes()
-                    .SelectMany(m => m.HistoryFrom)
-                    .ToListAsync();
-                var history2 = await query.IgnoreAutoIncludes()
-                    .SelectMany(m => m.HistoryTo)
-                    .ToListAsync();
-                var history = history1.Union(history2)
-                    .DistinctBy(h => h.HistNr)
-                    .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
-                    .ToList();
                 var areaComs = await query
                     .SelectMany(m => m.AreaCommitments)
-                    .Select(c => c.Contract).Distinct()
+                    .OrderBy(c => c.MgNr).ThenBy(c => c.FbNr)
-                    .OrderBy(c => c.FbNr)
+                    .Include(c => c.Rd)
-                    .Include(c => c.Revisions)
+                    .Include(c => c.Kg.Gl)
                     .ToListAsync();
                 var wbKgs = members
                     .Where(m => m.DefaultWbKg != null)
@@ -51,20 +44,22 @@ namespace Elwig.Services {
                     .OrderBy(k => k.KgNr)
                     .ToList();
                 if (members.Count == 0) {
-                    InteractionService.ShowError("Mitglieder hochladen", "Es wurden keine Mitglieder zum Hochladen ausgewählt!");
+                    MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                 } else {
                     var exportedAt = DateTime.Now;
-                    await ElwigData.Export(path, members, history, areaComs, wbKgs, filterNames);
+                    await ElwigData.Export(path, members, areaComs, wbKgs, filterNames);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, areaComs, [], exportedAt);
+                    await UpdateExportedAt(members, [], exportedAt);
-                    InteractionService.ShowInformation("Mitglieder hochgeladen", $"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!");
+                    MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {
-                InteractionService.ShowException("Mitglieder hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (TaskCanceledException exc) {
-                InteractionService.ShowException("Mitglieder hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (Exception exc) {
-                InteractionService.ShowException("Mitglieder hochladen", exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -75,7 +70,10 @@ namespace Elwig.Services {
                 var list = await query
                     .Select(p => p.Delivery)
                     .Distinct()
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                    .Include(d => d.Parts).ThenInclude(p => p.Rd)
+                    .Include(d => d.Parts).ThenInclude(p => p.Kg!.Gl)
+                    .AsSplitQuery()
                     .ToListAsync();
                 var wbKgs = list
                     .SelectMany(d => d.Parts)
@@ -85,20 +83,22 @@ namespace Elwig.Services {
                     .OrderBy(k => k.KgNr)
                     .ToList();
                 if (list.Count == 0) {
-                    InteractionService.ShowError("Lieferungen hochladen", "Es wurden keine Lieferungen zum Hochladen ausgewählt!");
+                    MessageBox.Show("Es wurden keine Lieferungen zum Hochladen ausgewählt!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                 } else {
                     var exportedAt = DateTime.Now;
                     await ElwigData.Export(path, list, wbKgs, filterNames);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt([], [], list, exportedAt);
+                    await UpdateExportedAt([], list, exportedAt);
-                    InteractionService.ShowInformation("Lieferungen hochgeladen", $"Hochladen von {list.Count:N0} Lieferungen erfolgreich!");
+                    MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {
-                InteractionService.ShowException("Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (TaskCanceledException exc) {
-                InteractionService.ShowException("Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (Exception exc) {
-                InteractionService.ShowException("Lieferungen hochladen", exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -106,24 +106,32 @@ namespace Elwig.Services {
             try {
                 var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
                 List<Member> members;
-                List<AreaComContract> areaComs;
+                List<AreaCom> areaComs;
                 List<Delivery> deliveries;
                 using (var ctx = new AppDbContext()) {
                     members = await ctx.Members
                         .Where(ChangedMembers)
+                        .Include(m => m.BillingAddress)
                         .Include(m => m.TelephoneNumbers)
                         .Include(m => m.EmailAddresses)
+                        .Include(m => m.DefaultWbKg!.Gl)
                         .OrderBy(m => m.MgNr)
+                        .AsSplitQuery()
                         .ToListAsync();
-                    areaComs = await ctx.AreaCommitmentContracts
+                    areaComs = await ctx.Members
-                       .Where(ChangedAreaComContracts)
+                       .Where(ChangedMembers)
-                       .Include(c => c.Revisions)
+                       .SelectMany(m => m.AreaCommitments)
-                       .OrderBy(c => c.FbNr)
+                       .Include(c => c.Rd)
+                       .Include(c => c.Kg.Gl)
+                       .OrderBy(c => c.MgNr).ThenBy(c => c.FbNr)
                        .ToListAsync();
                     deliveries = await ctx.Deliveries
                         .Where(ChangedDeliveries)
-                        .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                        .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                        .Include(d => d.Parts).ThenInclude(p => p.Rd)
+                        .Include(d => d.Parts).ThenInclude(p => p.Kg).ThenInclude(k => k!.Gl)
                         .OrderBy(d => d.DateString).ThenBy(d => d.TimeString).ThenBy(d => d.LsNr)
+                        .AsSplitQuery()
                         .ToListAsync();
                 }
                 var wbKgs = members
@@ -137,25 +145,27 @@ namespace Elwig.Services {
                     .OrderBy(k => k.KgNr)
                     .ToList();
                 if (members.Count == 0 && deliveries.Count == 0) {
-                    InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", "Es gibt keine geänderten Mitglieder oder Lieferungen, die hochgeladen werden könnten!");
+                    MessageBox.Show("Es gibt keine geänderten Mitglieder oder Lieferungen, die hochgeladen werden könnten!", "Mitglieder und Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 } else {
                     var exportedAt = DateTime.Now;
                     await (new ElwigData.ElwigExport {
                         Members = (members, ["geändert seit letztem Export"]),
-                        AreaComs = (areaComs, ["geändert seit letztem Export"]),
+                        AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
                         Deliveries = (deliveries, ["geändert seit letzem Export"]),
                         WbKgs = (wbKgs, ["von exportierten Mitgliedern, Flächenbindungen und Lieferungen"]),
                     }).Export(path);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt(members, areaComs, deliveries, exportedAt);
+                    await UpdateExportedAt(members, deliveries, exportedAt);
-                    InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", $"Hochladen von {members.Count:N0} Mitgliedern, {areaComs.Count:N0} Flächenbindungsverträgen, und {deliveries.Count:N0} Lieferungen erfolgreich!");
+                    MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern und {deliveries.Count:N0} Lieferungen erfolgreich!", "Mitglieder und Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {
-                InteractionService.ShowException("Mitglieder und Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder und Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (TaskCanceledException exc) {
-                InteractionService.ShowException("Mitglieder und Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder und Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (Exception exc) {
-                InteractionService.ShowException("Mitglieder und Lieferungen hochladen", exc);
+                MessageBox.Show(exc.Message, "Mitglieder und Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -166,8 +176,11 @@ namespace Elwig.Services {
                 using var ctx = new AppDbContext();
                 var deliveries = await ctx.Deliveries
                     .Where(d => d.Year == year && d.ZwstId == App.ZwstId)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                    .Include(d => d.Parts).ThenInclude(p => p.Rd)
+                    .Include(d => d.Parts).ThenInclude(p => p.Kg).ThenInclude(k => k!.Gl)
                     .OrderBy(d => d.DateString).ThenBy(d => d.TimeString).ThenBy(d => d.LsNr)
+                    .AsSplitQuery()
                     .ToListAsync();
                 var wbKgs = deliveries
                     .SelectMany(d => d.Parts)
@@ -176,20 +189,22 @@ namespace Elwig.Services {
                     .DistinctBy(k => k.KgNr)
                     .ToList();
                 if (deliveries.Count == 0) {
-                    InteractionService.ShowError("Lieferungen hochladen", "Es gibt keine Lieferungen, die hochgeladen werden können!"); 
+                    MessageBox.Show("Es gibt keine Lieferungen, die hochgeladen werden können!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
                 } else {
                     var exportedAt = DateTime.Now;
                     await ElwigData.Export(path, deliveries, wbKgs, [$"{year}", $"Zweigstelle {App.BranchName}"]);
                     await Utils.UploadExportData(path, url, username, password);
-                    await UpdateExportedAt([], [], deliveries, exportedAt);
+                    await UpdateExportedAt([], deliveries, exportedAt);
-                    InteractionService.ShowInformation("Lieferungen hochladen", $"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!");
+                    MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {
-                InteractionService.ShowException("Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (TaskCanceledException exc) {
-                InteractionService.ShowException("Lieferungen hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (Exception exc) {
-                InteractionService.ShowException("Lieferungen hochladen", exc);
+                MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -228,29 +243,27 @@ namespace Elwig.Services {
                 }
                 await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
             } catch (HttpRequestException exc) {
-                InteractionService.ShowException("Daten herunterladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (TaskCanceledException exc) {
-                InteractionService.ShowException("Daten herunterladen", "Eventuell Internetverbindung prüfen!", exc);
+                MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (Exception exc) {
-                InteractionService.ShowException("Daten herunterladen", exc);
+                MessageBox.Show(exc.Message, "Daten herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
-        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<AreaComContract> contracts, IEnumerable<Delivery> deliveries, DateTime dateTime) {
+        private static async Task UpdateExportedAt(IEnumerable<Member> member, IEnumerable<Delivery> deliveries, DateTime dateTime) {
             var timestamp = ((DateTimeOffset)dateTime.ToUniversalTime()).ToUnixTimeSeconds();
             var mgnrs = string.Join(",", member.Select(m => $"{m.MgNr}").Append("0"));
-            var fbnrs = string.Join(",", contracts.Select(c => $"{c.FbNr}").Append("0"));
             var dids = string.Join(",", deliveries.Select(d => $"({d.Year},{d.DId})").Append("(0,0)"));
             using (var cnx = await AppDbContext.ConnectAsync()) {
                 await cnx.ExecuteBatch($"""
                     BEGIN;
-                    UPDATE client_parameter          SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                    UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
-                    UPDATE member                    SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
+                    UPDATE member           SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
-                    UPDATE area_commitment_contract  SET xtime = {timestamp} WHERE fbnr IN ({fbnrs});
+                    UPDATE area_commitment  SET xtime = {timestamp} WHERE mgnr IN ({mgnrs});
-                    UPDATE area_commitment           SET xtime = {timestamp} WHERE fbnr IN ({fbnrs});
+                    UPDATE delivery         SET xtime = {timestamp} WHERE (year, did) IN ({dids});
-                    UPDATE delivery                  SET xtime = {timestamp} WHERE (year, did) IN ({dids});
+                    UPDATE delivery_part    SET xtime = {timestamp} WHERE (year, did) IN ({dids});
-                    UPDATE delivery_part             SET xtime = {timestamp} WHERE (year, did) IN ({dids});
+                    UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
-                    UPDATE client_parameter          SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
                     COMMIT;
                     """);
             }
@@ -259,7 +272,7 @@ namespace Elwig.Services {
 
         public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password) {
             try {
-                return await ctx.Members.Where(ChangedMembers).AnyAsync() || await ctx.AreaCommitmentContracts.Where(ChangedAreaComContracts).AnyAsync() || await ctx.Deliveries.Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
+                return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
             } catch {
                 return false;
             }

Elwig/ViewModels/AreaComAdminViewModel.cs

@@ -20,11 +20,7 @@ namespace Elwig.ViewModels {
         }
 
         [ObservableProperty]
-        private string? _filterSeasonString;
+        private bool _showOnlyActiveAreaComs;
-        public int? FilterSeason {
-            get => int.TryParse(FilterSeasonString, out var year) ? year : null;
-            set => FilterSeasonString = $"{value}";
-        }
 
         [ObservableProperty]
         private string? _fbNrString;
@@ -50,8 +46,6 @@ namespace Elwig.ViewModels {
             get => int.TryParse(YearToString, out var year) ? year : null;
             set => YearToString = $"{value}";
         }
-        [ObservableProperty]
-        private string? _period;
 
         [ObservableProperty]
         private AreaComType? _areaComType;

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -6,12 +6,12 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 
 namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
 
         public int? TransferPredecessorAreaComs = null;
+        public bool MaintainAreaComYearFrom = false;
         public int? CancelAreaComs = null;
 
         public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
@@ -21,7 +21,7 @@ namespace Elwig.ViewModels {
         public List<string> TextFilter => [.. SearchQuery?.ToLower().Split(' ').ToList().FindAll(e => e.Length > 0) ?? []];
 
         [ObservableProperty]
-        private bool _showOnlyActiveMembers = true;
+        private bool _showOnlyActiveMembers;
 
         [ObservableProperty]
         private Member? _selectedMember;
@@ -125,22 +125,10 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _exitDate;
         [ObservableProperty]
-        private string? _businessShares1String;
+        private string? _businessSharesString;
-        public int? BusinessShares1 {
+        public int? BusinessShares {
-            get => int.TryParse(BusinessShares1String, out var shares) ? shares : null;
+            get => int.TryParse(BusinessSharesString, out var bs) ? bs : null;
-            set => BusinessShares1String = $"{value}";
+            set => BusinessSharesString = $"{value}";
-        }
-        [ObservableProperty]
-        private string? _businessShares2String;
-        public int? BusinessShares2 {
-            get => int.TryParse(BusinessShares2String, out var shares) ? shares : null;
-            set => BusinessShares2String = $"{value}";
-        }
-        [ObservableProperty]
-        private string? _businessShares3String;
-        public int? BusinessShares3 {
-            get => int.TryParse(BusinessShares3String, out var shares) ? shares : null;
-            set => BusinessShares3String = $"{value}";
         }
         [ObservableProperty]
         private string? _accountingNr;
@@ -201,7 +189,9 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _statusMembersToolTip;
         [ObservableProperty]
-        private TextBlock? _statusBusinessShares;
+        private string _statusBusinessShares = "-";
+        [ObservableProperty]
+        private string? _statusBusinessSharesToolTip;
         [ObservableProperty]
         private string _statusDeliveriesLastSeason = "-";
         [ObservableProperty]

Elwig/ViewModels/MemberBusinessSharesViewModel.cs

@@ -1,76 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Elwig.Models.Entities;
-using System;
-using System.Collections.Generic;
-using System.Windows;
-
-namespace Elwig.ViewModels {
-    public partial class MemberBusinessSharesViewModel : ObservableObject {
-
-        [ObservableProperty]
-        private string _title = "Geschäftsanteilbewegungen - Elwig";
-
-        public required Member FilterMember { get; set; }
-
-        [ObservableProperty]
-        private MemberHistory? _selectedHistoryEntry;
-        [ObservableProperty]
-        private IEnumerable<MemberHistory> _history = [];
-
-        [ObservableProperty]
-        private string? _dateNoticeString;
-        public DateOnly? DateNotice {
-            get => DateOnly.TryParseExact(DateNoticeString, "dd.MM.yyyy", out var d) ? d : null;
-            set => DateNoticeString = $"{value:dd.MM.yyyy}";
-        }
-        [ObservableProperty]
-        private string? _dateEffectiveString;
-        public DateOnly? DateEffective {
-            get => DateOnly.TryParseExact(DateEffectiveString, "dd.MM.yyyy", out var d) ? d : null;
-            set => DateEffectiveString = $"{value:dd.MM.yyyy}";
-        }
-        [ObservableProperty]
-        private string? _reason;
-        [ObservableProperty]
-        private string? _sharesString;
-        public int? Shares {
-            get => int.TryParse(SharesString, out var shares) ? shares : null;
-            set => SharesString = $"{value}";
-        }
-        [ObservableProperty]
-        private string? _otherMgNrString;
-        public int? OtherMgNr {
-            get => int.TryParse(OtherMgNrString, out var mgnr) ? mgnr : null;
-            set => OtherMgNrString = $"{value}";
-        }
-        [ObservableProperty]
-        private string? _deductYearString;
-        public int? DeductYear {
-            get => int.TryParse(DeductYearString, out var year) ? year : null;
-            set => DeductYearString = $"{value}";
-        }
-        [ObservableProperty]
-        private bool _deduct;
-        [ObservableProperty]
-        private bool _memberHasSigned;
-        [ObservableProperty]
-        private string? _valuePerShareString;
-        public decimal? ValuePerShare {
-            get => decimal.TryParse(ValuePerShareString, out var v) ? v : null;
-            set => ValuePerShareString = $"{value:0.00}";
-        }
-        [ObservableProperty]
-        private string? _totalAmount;
-        [ObservableProperty]
-        private string? _comment;
-
-        [ObservableProperty]
-        private Visibility _controlButtonsVisibility = Visibility.Visible;
-        [ObservableProperty]
-        private Visibility _editingButtonsVisibility = Visibility.Hidden;
-        [ObservableProperty]
-        private Visibility _personalNameVisibility = Visibility.Visible;
-        [ObservableProperty]
-        private Visibility _juridicalNameVisibility = Visibility.Hidden;
-    }
-}

Elwig/Windows/AboutWindow.xaml

@@ -15,14 +15,14 @@
             <Bold>Website:</Bold> <Hyperlink NavigateUri="https://elwig.at/" RequestNavigate="Hyperlink_RequestNavigate">https://elwig.at/</Hyperlink><LineBreak/>
             <Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
             <Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
-            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="C:\Program Files\Elwig\src" RequestNavigate="Hyperlink_RequestNavigate_Explorer">C:\Program Files\Elwig\src</Hyperlink>, <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
+            <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
-            <Bold>Entwicklungszeitraum:</Bold> 2022–2026<LineBreak/>
+            <Bold>Entwicklungszeitraum:</Bold> 2022–2025<LineBreak/>
             <LineBreak/>
             <Bold>Verwendete Technologien:</Bold><LineBreak/>
             Programmiersprache: C#<LineBreak/>
             Framework: Windows Presentation Framework (WPF)<LineBreak/>
             Datenbank: <Hyperlink NavigateUri="https://sqlite.org/" RequestNavigate="Hyperlink_RequestNavigate">SQLite</Hyperlink><LineBreak/>
-            PDF-Erstellung: <Hyperlink NavigateUri="https://itextpdf.com/" RequestNavigate="Hyperlink_RequestNavigate">iText</Hyperlink>, <Hyperlink NavigateUri="https://github.com/bblanchon/pdfium-binaries" RequestNavigate="Hyperlink_RequestNavigate">Pdfium</Hyperlink><LineBreak/>
+            PDF-Erstellung: <Hyperlink NavigateUri="https://itextpdf.com/" RequestNavigate="Hyperlink_RequestNavigate">iText</Hyperlink>, <Hyperlink NavigateUri="https://github.com/toddams/RazorLight" RequestNavigate="Hyperlink_RequestNavigate">RazorLight</Hyperlink>, <Hyperlink NavigateUri="https://github.com/bblanchon/pdfium-binaries" RequestNavigate="Hyperlink_RequestNavigate">Pdfium</Hyperlink><LineBreak/>
             Paketierung: <Hyperlink NavigateUri="https://www.firegiant.com/wixtoolset/" RequestNavigate="Hyperlink_RequestNavigate">WiX Toolset</Hyperlink>
         </TextBlock>
 

Elwig/Windows/AboutWindow.xaml.cs

@@ -11,15 +11,7 @@ namespace Elwig.Windows {
         }
 
         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
-            try {
+            Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
-                Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
-            } catch { }
-        }
-
-        private void Hyperlink_RequestNavigate_Explorer(object sender, RequestNavigateEventArgs e) {
-            try {
-                Process.Start("explorer.exe", e.Uri.AbsoluteUri);
-            } catch { }
         }
     }
 }

Elwig/Windows/AdministrationWindow.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Elwig.Services;
 
 namespace Elwig.Windows {
     public abstract class AdministrationWindow : ContextWindow {
@@ -105,12 +104,13 @@ namespace Elwig.Windows {
                 cb.SelectionChanged += ComboBox_SelectionChanged;
             foreach (var lb in ListBoxInputs)
                 lb.SelectionChanged += ComboBox_SelectionChanged;
-            LockInputs();
         }
 
         private void OnClosing(object? sender, CancelEventArgs evt) {
             if ((IsCreating || IsEditing) && HasChanged) {
-                if (!InteractionService.AskConfirmation("Schließen bestätigen", "Soll das Fenster wirklich geschlossen werden?")) {
+                var r = MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schließen bestätigen",
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) {
                     evt.Cancel = true;
                     return;
                 }
@@ -164,10 +164,10 @@ namespace Elwig.Windows {
                 } else if (input is TextBox tb && tb.Text.Length == 0) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
-                } else if (input is ComboBox cb && cb.SelectedItem == null && cb.HasItems) {
+                } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
-                } else if (input is ListBox lb && lb.SelectedItem == null && lb.HasItems) {
+                } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
                 } else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) {
@@ -285,13 +285,8 @@ namespace Elwig.Windows {
                 var binding = cb.GetBindingExpression(ComboBox.SelectedItemProperty);
                 binding?.UpdateSource();
             }
-            foreach (var lb in ListBoxInputs) {
+            foreach (var lb in ListBoxInputs)
-                if (lb.SelectionMode == SelectionMode.Single) {
+                lb.SelectedItems.Clear();
-                    lb.SelectedItem = null;
-                } else {
-                    lb.SelectedItems.Clear();
-                }
-            }
             foreach (var cb in CheckBoxInputs) {
                 cb.IsChecked = cb.IsThreeState ? null : false;
                 var binding = cb.GetBindingExpression(CheckBox.IsCheckedProperty);
@@ -354,6 +349,7 @@ namespace Elwig.Windows {
                 using var ctx = new AppDbContext();
                 list = await ctx.PlzDestinations
                    .Where(p => p.Plz == plz)
+                   .Include(p => p.Ort)
                    .ToListAsync();
             }
 
@@ -394,7 +390,7 @@ namespace Elwig.Windows {
 
         protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
             if (DoShowWarningWindows && !res.IsValid && !IsClosing && (IsEditing || IsCreating))
-                InteractionService.ShowWarning(msg ?? res.ErrorContent?.ToString() ?? "", res.ErrorContent?.ToString() ?? "");
+                MessageBox.Show(res.ErrorContent?.ToString(), msg ?? res.ErrorContent?.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
             return res.IsValid;
         }
 

Elwig/Windows/AreaComAdminWindow.xaml

@@ -7,7 +7,8 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="{Binding Title}" Height="600" MinHeight="550" Width="1000" MinWidth="860">
+        Title="{Binding Title}" Height="600" MinHeight="450" Width="1000" MinWidth="860"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
     </Window.DataContext>
@@ -56,7 +57,7 @@
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" MinWidth="500"/>
+            <ColumnDefinition Width="3*" MinWidth="500"/>
             <ColumnDefinition Width="5"/>
             <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
@@ -77,7 +78,7 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                     Grid.ColumnSpan="3" Margin="5,5,66,0" IsReadOnly="False"
+                     Grid.ColumnSpan="3" Margin="5,5,190,0" IsReadOnly="False"
                      TextChanged="SearchInput_TextChanged">
                 <TextBox.ToolTip>
                     <TextBlock>
@@ -93,10 +94,9 @@
                     </TextBlock>
                 </TextBox.ToolTip>
             </TextBox>
-            <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            <CheckBox x:Name="ActiveAreaCommitmentInput" Content="Nur laufende anzeigen (2020)" IsChecked="{Binding ShowOnlyActiveAreaComs}"
-                                Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
+                      Checked="ActiveAreaCommitmentInput_Changed" Unchecked="ActiveAreaCommitmentInput_Changed"
-                                Margin="0,5,5,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                      HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-                                TextChanged="SeasonInput_TextChanged"/>
 
             <DataGrid x:Name="AreaCommitmentList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
@@ -110,24 +110,25 @@
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Katastralgemeinde" Binding="{Binding Kg.AtKg.Name}" Width="130"/>
-                    <DataGridTextColumn Header="Sorte" Binding="{Binding Latest.AreaComType.VtrgId}" Width="50">
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding AreaComType.WineVar.SortId}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
-                                <Setter Property="TextBlock.Foreground" Value="{Binding Latest.AreaComType.WineVar.Color}"/>
+                                <Setter Property="TextBlock.Foreground" Value="{Binding AreaComType.WineVar.Color}"/>
                                 <Setter Property="TextBlock.TextAlignment" Value="Center"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Fläche" Binding="{Binding Latest.Area, StringFormat='{}{0:N0} m² '}" Width="80">
+                    <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 Latest.GstNr}"         Width="130"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="130"/>
-                    <DataGridTextColumn Header="Bewirt."            Binding="{Binding Latest.WineCult.Name}" Width="60"/>
+                    <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>
@@ -176,119 +177,91 @@
 
         <Grid Grid.Column="2" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
+                <RowDefinition Height="1.125*"/>
-                <RowDefinition Height="230"/>
+                <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <GroupBox Header="Vertrag" Grid.Row="0" Margin="5,5,5,5">
+            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="48"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="FB-Nr.:" 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,0,0" Width="56" HorizontalAlignment="Left" 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="Laufzeit:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <Label Content="Zeitraum:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBlock x:Name="Period" Text="{Binding Period}"
-                               Margin="0,14,10,0" Grid.Column="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
-
-                    <Label Content="KG:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="KgInput" SelectedItem="{Binding Kg, Mode=TwoWay}" ItemsSource="{Binding KgSource, Mode=TwoWay}"
-                              ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                              HorizontalAlignment="Stretch" Margin="0,40,40,10" Grid.Column="1" Grid.ColumnSpan="3"
-                              SelectionChanged="KgInput_SelectionChanged"/>
-                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
-                            Click="KgDetailsButton_Click"
-                            Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,40,10,10"/>
-
-                    <Label Content="Ried:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="RdInput" SelectedItem="{Binding RdObj, Mode=TwoWay}" ItemsSource="{Binding RdSource, Mode=TwoWay}"
-                              DisplayMemberPath="Name" TextSearch.TextPath="Name" IsEditable="True"
-                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"
-                              SelectionChanged="RdInput_SelectionChanged"/>
-                    <Button x:Name="RdAddButton" Content="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0,0,0,0" IsEnabled="False"
-                            Click="RdAddButton_Click"
-                            Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
-
-                    <Label Content="Anmerkung:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                    <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             TextChanged="TextBox_TextChanged"
-                             HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-
-                    <ListBox x:Name="RevisionList" Grid.ColumnSpan="4" Margin="5,135,5,5"
-                             SelectionChanged="RevisionList_SelectionChanged">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding YearFrom}" Width="28" TextAlignment="Right" Margin="0,0,0,0"/>
-                                    <TextBlock Text="&#x2013;" TextAlignment="Center" Margin="0,0,0,0"/>
-                                    <TextBlock Text="{Binding YearTo}" Width="28" TextAlignment="Left" Margin="0,0,0,0"/>
-                                    <TextBlock Text="{Binding VtrgId}" Width="40" TextAlignment="Center" Foreground="{Binding AreaComType.WineVar.Color}"/>
-                                    <TextBlock Text="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding Member.AdministrativeName}"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-                </Grid>
-            </GroupBox>
-
-            <GroupBox Header="Revision" Grid.Row="1" Margin="5,5,5,10">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="MgNrInput" Text="{Binding MgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
-                    <ComboBox x:Name="MemberInput"
-                              Grid.Column="1" Margin="53,10,40,10" IsEditable="True"
-                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                              SelectionChanged="MemberInput_SelectionChanged"/>
-                    <Button x:Name="MemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0,0,0,0"
-                            Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
-                            Click="MemberReferenceButton_Click"/>
-
-                    <Label Content="Laufzeit:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="YearFromInput" Text="{Binding YearFromString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" TextAlignment="Right"
+                             Margin="0,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
-                    <Label Content="&#x2013;" Grid.Column="1" Margin="45,40,0,0"/>
+                    <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="60,40,10,0" Width="40" HorizontalAlignment="Left" Grid.Column="1" 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"/>
+                    <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="AreaComTypeInput" SelectedItem="{Binding AreaComType, Mode=TwoWay}" ItemsSource="{Binding AreaComTypeSource, Mode=TwoWay}"
                               ItemTemplate="{StaticResource AreaCommitmentTypeTemplate}" TextSearch.TextPath="DisplayName"
-                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1"/>
+                              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"
                             Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
 
-                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="WineCultivationInput" SelectedItem="{Binding WineCultObj, Mode=TwoWay}" ItemsSource="{Binding WineCultSource, Mode=TwoWay}"
                               DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1"/>
+                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
 
-                    <Label Content="Fläche:" Margin="10,130,0,0" Grid.Column="0"/>
+                    <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             TextChanged="TextBox_TextChanged"
+                             HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="KgInput" SelectedItem="{Binding Kg, Mode=TwoWay}" ItemsSource="{Binding KgSource, Mode=TwoWay}"
+                              ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,10,40,10" Grid.Column="1"
+                              SelectionChanged="KgInput_SelectionChanged"/>
+                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="KgDetailsButton_Click"
+                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,10,10,10"/>
+
+                    <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="RdInput" SelectedItem="{Binding RdObj, Mode=TwoWay}" ItemsSource="{Binding RdSource, Mode=TwoWay}"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name" IsEditable="True"
+                              HorizontalAlignment="Stretch" Margin="0,40,40,10" Grid.Column="1"
+                              SelectionChanged="RdInput_SelectionChanged"/>
+                    <Button x:Name="RdAddButton" Content="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0,0,0,0" IsEnabled="False"
+                            Click="RdAddButton_Click"
+                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,40,10,10"/>
+
+                    <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GstNrInput" Text="{Binding GstNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" Text="{Binding AreaString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                       TextChanged="IntegerInput_TextChanged"
-                                      Grid.Column="1" Width="70" Margin="0,130,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                      Grid.Column="1" Width="70" Margin="0,100,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-
-                    <Label Content="Parzelle(n):" Margin="10,160,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="GstNrInput" Text="{Binding GstNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,160,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
-                             TextChanged="TextBox_TextChanged"/>
                 </Grid>
             </GroupBox>
         </Grid>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -25,18 +25,23 @@ namespace Elwig.Windows {
             ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ExemptInputs = [
-                AreaCommitmentList, RevisionList,
+                MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
-                NewAreaCommitmentButton, EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
+                EditAreaCommitmentButton, DeleteAreaCommitmentButton, SaveButton,
-                ResetButton, CancelButton, SearchInput, SeasonInput
+                ResetButton, CancelButton, SearchInput, ActiveAreaCommitmentInput
             ];
             RequiredInputs = [
-                FbNrInput, MgNrInput, MemberInput, YearFromInput, KgInput, RdInput,
+                FbNrInput, YearFromInput, KgInput, RdInput,
                 GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
             ];
 
             ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
-            ViewModel.FilterSeason = Utils.CurrentYear;
+            ActiveAreaCommitmentInput.Content = ((string)ActiveAreaCommitmentInput.Content).Replace("2020", $"{Utils.CurrentLastSeason}");
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e) {
+            ActiveAreaCommitmentInput.IsChecked = true;
+            LockInputs();
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -47,49 +52,40 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, areaComQuery, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var areaComs = await areaComQuery
-            var query = (vm.SearchQuery, vm.FilterSeason);
+                .Include(a => a.Kg.AtKg)
-            var (filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
+                .Include(a => a.Rd!.Kg.AtKg)
-                using var ctx = new AppDbContext();
+                .Include(a => a.WineCult)
-                var (_, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
+                .Include(a => a.AreaComType.WineAttr)
-                var contracts = await contractQuery
+                .Include(a => a.AreaComType.WineVar)
-                    .Include(c => c.Revisions).ThenInclude(a => a.Member)
+                .ToListAsync();
-                    .ToListAsync();
-                var areaComs = await areaComQuery.ToListAsync();
 
-                if (filter.Count > 0 && contracts.Count > 0) {
+            if (filter.Count > 0 && areaComs.Count > 0) {
-                    var dict = contracts.AsParallel()
+                var dict = areaComs.AsParallel()
-                        .ToDictionary(d => d, d => d.SearchScore(vm.TextFilter))
+                    .ToDictionary(d => d, d => d.SearchScore(ViewModel.TextFilter))
-                        .OrderByDescending(c => c.Value);
+                    .OrderByDescending(c => c.Value);
-                    var threshold = dict.Max(a => a.Value) * 3 / 4;
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
-                    contracts = [.. dict
+                areaComs = dict
                     .Where(a => a.Value > threshold)
-                    .Select(a => a.Key)];
+                    .Select(a => a.Key)
-                }
+                    .ToList();
+            }
 
-                var areaComCount = await areaComQuery.CountAsync();
+            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs,
-                var season = await ctx.FetchSeasons().FirstOrDefaultAsync();
+                AreaCommitmentList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
-                var stat = await AreaComService.GenerateToolTipData(areaComQuery, season?.MaxKgPerHa ?? 10_000);
-
-                return (filter, contracts, areaComs, areaComCount, stat);
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason)) return;
-
-            ControlUtils.RenewItemsSource(AreaCommitmentList, contracts,
-                AreaCommitmentList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             RefreshInputs();
 
             if (filter.Count == 0) {
-                ViewModel.StatusAreaCommitments = $"{areaComCount:N0}";
+                ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
-                var (text, gridData) = stat;
+                var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
+                var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
                 ViewModel.StatusArea = text;
                 ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
             } else {
-                ViewModel.StatusAreaCommitments = $"{contracts.Count:N0}";
+                ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
-                ViewModel.StatusArea = $"{areaComs.Sum(a => a.Area):N0} m²";
+                ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";
                 ViewModel.StatusAreaToolTip = null;
             }
             var groups = areaComs.GroupBy(a => $"{a.AreaComType.SortId}{a.AreaComType.AttrId}").Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
@@ -98,25 +94,12 @@ namespace Elwig.Windows {
                 ViewModel.StatusContracts += $" ({string.Join(", ", groups.Select(g => g.Key))})";
         }
 
-        private async Task RefreshRevisions() {
-            using var ctx = new AppDbContext();
-            if (AreaCommitmentList.SelectedItem is AreaComContract c) {
-                ControlUtils.RenewItemsSource(RevisionList, c.Revisions.OrderByDescending(p => p.RevNr).ToList(), RevisionList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
-            } else {
-                RevisionList.ItemsSource = null;
-            }
-        }
-
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            if (RevisionList.SelectedItem is AreaCom a) {
+            if (AreaCommitmentList.SelectedItem is AreaCom a) {
                 EditAreaCommitmentButton.IsEnabled = true;
                 DeleteAreaCommitmentButton.IsEnabled = true;
                 FillInputs(a);
-            } else if (AreaCommitmentList.SelectedItem is AreaComContract c) {
-                EditAreaCommitmentButton.IsEnabled = true;
-                DeleteAreaCommitmentButton.IsEnabled = true;
-                FillInputs(c);
             } else {
                 EditAreaCommitmentButton.IsEnabled = false;
                 DeleteAreaCommitmentButton.IsEnabled = false;
@@ -128,15 +111,7 @@ namespace Elwig.Windows {
             GC.Collect();
         }
 
-        private void FillInputs(AreaComContract c) {
-            ClearOriginalValues();
-            ClearDefaultValues();
-            ViewModel.FillInputs(c);
-            FinishInputFilling();
-        }
-
         private void FillInputs(AreaCom a) {
-            FillInputs(a.Contract);
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(a);
@@ -151,15 +126,10 @@ namespace Elwig.Windows {
             ValidateRequiredInputs();
         }
 
-        new protected void ClearInputs(bool validate = false) {
-            ViewModel.ClearInputs();
-            base.ClearInputs(validate);
-        }
-
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
 
-            if (await ctx.FetchMembers(ViewModel.FilterMember.MgNr).SingleOrDefaultAsync() is not Member m) {
+            if (await ctx.Members.FindAsync(ViewModel.FilterMember.MgNr) is not Member m) {
                 Close();
                 return;
             }
@@ -176,8 +146,9 @@ namespace Elwig.Windows {
                 .Include(c => c.WineAttr)
                 .OrderBy(v => v.VtrgId)
                 .ToListAsync());
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: true).ToListAsync());
+            var cultList = await ctx.WineCultivations
-            var cultList = await ctx.FetchWineCultivations().Cast<object>().ToListAsync();
+                .OrderBy(c => c.Name)
+                .Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem());
             ControlUtils.RenewItemsSource(WineCultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
             await RefreshList();
@@ -193,7 +164,6 @@ namespace Elwig.Windows {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
-            RevisionList.IsEnabled = false;
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
             UnlockInputs();
@@ -214,7 +184,6 @@ namespace Elwig.Windows {
 
             IsEditing = true;
             AreaCommitmentList.IsEnabled = false;
-            RevisionList.IsEnabled = false;
 
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
@@ -229,10 +198,10 @@ namespace Elwig.Windows {
         }
 
         private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (RevisionList.SelectedItem is not AreaCom a)
+            if (AreaCommitmentList.SelectedItem is not AreaCom a)
                 return;
 
-            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
+            var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, true);
             if (d.ShowDialog() != true)
                 return;
 
@@ -240,13 +209,15 @@ namespace Elwig.Windows {
             try {
                 if (d.YearTo is int yearTo) {
                     ViewModel.YearTo = yearTo;
-                    await ViewModel.UpdateAreaCommitment(a.FbNr, a.RevNr);
+                    await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
                 } else {
                     await AreaComService.DeleteAreaCom(a.FbNr);
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Flächenbindung löschen", 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;
         }
@@ -261,42 +232,48 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
 
             int? yearTo = null;
-            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput) || InputHasChanged(MgNrInput)) {
+            if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput)) {
-                var a = (RevisionList.SelectedItem as AreaCom)!;
+                var a = (AreaCommitmentList.SelectedItem as AreaCom)!;
-                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
+                var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false);
-                if (d.ShowDialog() != true) {
+                if (d.ShowDialog() != true)
-                    SaveButton.IsEnabled = true;
                     return;
-                }
                 yearTo = d.YearTo;
             }
 
-            int fbnr, revnr;
+            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, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, (RevisionList.SelectedItem as AreaCom)?.RevNr);
+                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, revnr) = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaComContract)?.FbNr, null);
+                    fbnr = await ViewModel.UpdateAreaCommitment(null);
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Flächenbindung aktualisieren", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
@@ -305,18 +282,16 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            RevisionList.IsEnabled = true;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             LockInputs();
             UnlockSearchInputs();
             FinishInputFilling();
-            await EnsureContextRenewed();
+            await RefreshList();
+            RefreshInputs();
             Mouse.OverrideCursor = null;
             ViewModel.SearchQuery = "";
-            ViewModel.FilterSeason = ViewModel.YearTo ?? ViewModel.YearFrom ?? ViewModel.FilterSeason;
+            ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
-            ControlUtils.SelectItemWithPk(AreaCommitmentList, fbnr);
-            ControlUtils.SelectItemWithPk(RevisionList, fbnr, revnr);
         }
 
         protected override void ShortcutReset() {
@@ -338,7 +313,6 @@ namespace Elwig.Windows {
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
-            RevisionList.IsEnabled = true;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             RefreshInputs();
@@ -400,65 +374,34 @@ namespace Elwig.Windows {
 
         private void LockSearchInputs() {
             SearchInput.IsEnabled = false;
-            SeasonInput.IsEnabled = false;
+            ActiveAreaCommitmentInput.IsEnabled = false;
         }
 
         private void UnlockSearchInputs() {
             SearchInput.IsEnabled = true;
-            SeasonInput.IsEnabled = true;
+            ActiveAreaCommitmentInput.IsEnabled = true;
         }
 
-        private async void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (AreaCommitmentList.SelectedItem != null)
                 AreaCommitmentList.ScrollIntoView(AreaCommitmentList.SelectedItem);
-            await RefreshRevisions();
-        }
-
-        private void RevisionList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             RefreshInputs();
-            if (RevisionList.SelectedItem is AreaCom c) {
-                EditAreaCommitmentButton.IsEnabled = true;
-            } else {
-                EditAreaCommitmentButton.IsEnabled = false;
-            }
         }
 
-        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void AttributesInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            var valid = InputTextChanged((TextBox)sender, Validator.CheckMgNr);
-            var text = MgNrInput.Text;
-            var caret = MgNrInput.CaretIndex;
-            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
-            MgNrInput.Text = text;
-            MgNrInput.CaretIndex = caret;
-        }
 
-        private void MgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
-            var valid = InputLostFocus((TextBox)sender, Validator.CheckMgNr);
-            ControlUtils.SelectItemWithPk(MemberInput, valid ? ViewModel.MgNr : null);
-        }
-
-        private void MemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
-            var m = MemberInput.SelectedItem as Member;
-            ViewModel.MgNr = m?.MgNr;
         }
 
         private async void ActiveAreaCommitmentInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList();
         }
 
         private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
             binding?.UpdateSource();
             await RefreshList(true);
         }
 
-        private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded || ViewModel.FilterSeason == null) return;
-            await RefreshList();
-        }
-
         private void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (KgInput.SelectedItem is AT_Kg kg) {
                 var rdList = kg.WbKg!.Rds.OrderBy(r => r.Name).Cast<object>().ToList();
@@ -496,12 +439,12 @@ namespace Elwig.Windows {
             RdInput.SelectedIndex = s.Count();
         }
 
-        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker) {
+        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker) {
-            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem));
+            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem));
         }
 
-        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaComContract?, ValidationResult> checker, string? msg = null) {
+        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker, string? msg = null) {
-            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaComContract)AreaCommitmentList.SelectedItem), msg);
+            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem), msg);
         }
 
         private void FbNrInput_TextChanged(object sender, RoutedEventArgs evt) {
@@ -511,10 +454,5 @@ namespace Elwig.Windows {
         private void FbNrInput_LostFocus(object sender, RoutedEventArgs evt) {
             InputLostFocus((TextBox)sender, Validator.CheckFbNr);
         }
-
-        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
-            if (MemberInput.SelectedItem is not Member m) return;
-            App.FocusMember(m.MgNr);
-        }
     }
 }

Elwig/Windows/BaseDataWindow.xaml

@@ -8,7 +8,8 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
-        Title="Stammdaten - Elwig" Height="520" MinHeight="400" Width="860" MinWidth="810">
+        Title="Stammdaten - Elwig" Height="520" MinHeight="400" Width="860" MinWidth="810"
+        Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
             <Setter Property="HorizontalAlignment" Value="Left"/>
@@ -453,13 +454,13 @@
                                  HorizontalAlignment="Left"/>
 
                         <Label Content="Lieferpflicht/-recht:" Margin="10,10,0,10" Grid.Column="2"/>
-                        <ctrl:UnitTextBox x:Name="SeasonMinKgPerShareInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                        <ctrl:UnitTextBox x:Name="SeasonMinKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
                                           Grid.Column="3" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerShareInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
                                           Grid.Column="3" Width="80" Margin="85,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                         <Label Content="GA-Wert (Nachz.):" Margin="10,40,0,10" Grid.Column="2"/>
-                        <ctrl:UnitTextBox x:Name="SeasonShareValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
+                        <ctrl:UnitTextBox x:Name="SeasonBsValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
                                           Grid.Column="3" Width="85" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                         <GroupBox Header="Strafen bei Unterlieferung lt. GA" Grid.Column="2" Grid.ColumnSpan="2" Margin="0,70,10,0">
@@ -468,13 +469,13 @@
                                                   Width="80" Margin="65,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                                 <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                                   Width="68" Margin="150,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerShareInput" Unit="€/GA" TextChanged="SeasonPenaltyPerShareInput_TextChanged"
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
                                                   Width="100" Margin="222,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                                 <Label Content="Zzgl. bei Nicht-Lieferung:" Margin="10,40,0,10"/>
                                 <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                                   Width="68" Margin="150,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerShareNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerShareInput_TextChanged"
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
                                                   Width="100" Margin="222,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                             </Grid>
                         </GroupBox>
@@ -541,21 +542,6 @@
             </TabItem>
             <TabItem Header="Parameter">
                 <StackPanel>
-                    <GroupBox x:Name="ParameterBusinessShare" Header="Geschäftsanteile" Margin="10,10,10,0" VerticalAlignment="Top">
-                        <Grid>
-                            <Label Content="Modus:" Margin="10,10,10,10"/>
-                            <ComboBox x:Name="ParameterBusinessShareModeInput" Margin="160,10,10,10" Width="100"
-                                      HorizontalAlignment="Left">
-                                <ComboBoxItem IsSelected="True">Normal</ComboBoxItem>
-                                <ComboBoxItem>Rot/weiß</ComboBoxItem>
-                            </ComboBox>
-
-                            <Label Content="Mitgliederbewegungen:" Margin="10,40,10,10"/>
-                            <CheckBox x:Name="ParameterBusinessShareHistoryInput"  Content="Mit Elwig erfassen" Margin="160,45,10,15"
-                                      HorizontalAlignment="Left"
-                                      Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-                        </Grid>
-                    </GroupBox>
                     <GroupBox x:Name="ParameterAreaComGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,0" VerticalAlignment="Top">
                         <Grid>
                             <CheckBox x:Name="ParameterAllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -21,6 +21,8 @@ namespace Elwig.Windows {
         private async Task AreaCommitmentTypesInitEditing(AppDbContext ctx) {
             _actList = new(await ctx.AreaCommitmentTypes
                 .OrderBy(v => v.VtrgId)
+                .Include(t => t.WineVar)
+                .Include(t => t.WineAttr)
                 .ToListAsync());
             _acts = _actList.ToDictionary(v => v.VtrgId, v => (string?)v.VtrgId);
             _actIds = _actList.ToDictionary(v => v, v => v.VtrgId);

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -19,7 +19,10 @@ namespace Elwig.Windows {
         private bool _branchUpdate = false;
 
         private async Task BranchesInitEditing(AppDbContext ctx) {
-            _branchList = new(await ctx.FetchBranches().ToListAsync());
+            _branchList = new(await ctx.Branches
+                .OrderBy(b => b.Name)
+                .Include(b => b.PostalDest!.AtPlz)
+                .ToListAsync());
             _branches = _branchList.ToDictionary(b => b.ZwstId, b => (string?)b.ZwstId);
             _branchIds = _branchList.ToDictionary(b => b, b => b.ZwstId);
             ControlUtils.RenewItemsSource(BranchList, _branchList);
@@ -27,7 +30,10 @@ namespace Elwig.Windows {
         }
 
         private async Task BranchesFinishEditing(AppDbContext ctx) {
-            ControlUtils.RenewItemsSource(BranchList, await ctx.FetchBranches().ToListAsync());
+            ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
+                .OrderBy(b => b.Name)
+                .Include(b => b.PostalDest!.AtPlz)
+                .ToListAsync());
             _branchList = null;
             _branches = null;
             _branchIds = null;
@@ -41,9 +47,9 @@ namespace Elwig.Windows {
             if (!_branchChanged || _branchList == null || _branches == null || _branchIds == null)
                 return;
 
-            var deleteZwstIds = _branches.Where(b => b.Value == null).Select(b => b.Key).ToList();
+            foreach (var (zwstid, _) in _branches.Where(b => b.Value == null)) {
-            await ctx.Branches.Where(b => deleteZwstIds.Contains(b.ZwstId)).ExecuteDeleteAsync();
+                ctx.Remove(ctx.Branches.Find(zwstid)!);
-
+            }
             foreach (var (branch, old) in _branchIds) {
                 branch.ZwstId = old;
             }
@@ -55,6 +61,7 @@ namespace Elwig.Windows {
             foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE branch SET zwstid = {zwstid} WHERE zwstid = {old}");
             }
+            await ctx.SaveChangesAsync();
 
             foreach (var branch in _branchList.Where(b => !_branchIds.ContainsKey(b))) {
                 if (branch.ZwstId == null) continue;

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -22,7 +22,10 @@ namespace Elwig.Windows {
         private async Task ModifiersInitEditing(AppDbContext ctx) {
             SeasonList.IsEnabled = false;
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            _modList = new(await ctx.FetchModifiers(year ?? 0).ToListAsync());
+            _modList = new(await ctx.Modifiers
+                .Where(m => m.Year == year)
+                .OrderBy(m => m.Ordering)
+                .ToListAsync());
             _mods = _modList.ToDictionary(m => m.ModId, m => (string?)m.ModId);
             _modIds = _modList.ToDictionary(m => m, m => m.ModId);
             ControlUtils.RenewItemsSource(SeasonModifierList, _modList);
@@ -31,7 +34,10 @@ namespace Elwig.Windows {
 
         private async Task ModifiersFinishEditing(AppDbContext ctx) {
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.FetchModifiers(year ?? 0).ToListAsync());
+            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.Modifiers
+                .Where(m => m.Year == year)
+                .OrderBy(m => m.Ordering)
+                .ToListAsync());
             _modList = null;
             _mods = null;
             _modIds = null;

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -1,7 +1,6 @@
 using Elwig.Dialogs;
 using Elwig.Helpers;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -20,14 +19,22 @@ namespace Elwig.Windows {
         private async Task SeasonsInitEditing(AppDbContext ctx) {
             SeasonAddButton.IsEnabled = false;
             SeasonRemoveButton.IsEnabled = false;
-            ControlUtils.RenewItemsSource(SeasonList, await ctx.FetchSeasons(includeModifiers: true).ToListAsync());
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
+                .OrderByDescending(s => s.Year)
+                .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
+                .ToListAsync());
             SeasonList_SelectionChanged(null, null);
         }
 
         private async Task SeasonsFinishEditing(AppDbContext ctx) {
             SeasonAddButton.IsEnabled = true;
             SeasonRemoveButton.IsEnabled = true;
-            ControlUtils.RenewItemsSource(SeasonList, await ctx.FetchSeasons(includeModifiers: true).ToListAsync());
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
+                .OrderByDescending(s => s.Year)
+                .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
+                .ToListAsync());
             _seasonChanged = false;
         }
 
@@ -47,23 +54,23 @@ namespace Elwig.Windows {
                 SeasonVatFlatrateInput.Text = (s.VatFlatrate * 100).ToString();
                 SeasonStartInput.Text = $"{s.StartDate:dd.MM.yyyy}";
                 SeasonEndInput.Text = $"{s.EndDate:dd.MM.yyyy}";
-                SeasonMinKgPerShareInput.Text = s.MinKgPerShare?.ToString() ?? s.MinKgPerShareRed?.ToString() ?? s.MinKgPerShareWhite?.ToString() ?? "0";
+                SeasonMinKgPerBsInput.Text = s.MinKgPerBusinessShare.ToString();
-                SeasonMaxKgPerShareInput.Text = s.MaxKgPerShare?.ToString() ?? s.MaxKgPerShareRed?.ToString() ?? s.MaxKgPerShareWhite?.ToString() ?? "0";
+                SeasonMaxKgPerBsInput.Text = s.MaxKgPerBusinessShare.ToString();
                 SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
                 SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
                 SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
-                SeasonPenaltyPerShareInput.Text = s.PenaltyPerShareAmount?.ToString() ?? "";
+                SeasonPenaltyPerBsInput.Text = s.PenaltyPerBsAmount?.ToString() ?? "";
-                SeasonPenaltyPerShareNoneInput.Text = s.PenaltyPerShareNone?.ToString() ?? "";
+                SeasonPenaltyPerBsNoneInput.Text = s.PenaltyPerBsNone?.ToString() ?? "";
-                SeasonShareValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
+                SeasonBsValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
 
                 var sym = s.Currency.Symbol ?? s.Currency.Code;
                 SeasonModifierAbsInput.Unit = $"{sym}/kg";
                 SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
                 SeasonPenaltyInput.Unit = sym;
                 SeasonPenaltyNoneInput.Unit = sym;
-                SeasonPenaltyPerShareInput.Unit = $"{sym}/GA";
+                SeasonPenaltyPerBsInput.Unit = $"{sym}/GA";
-                SeasonPenaltyPerShareNoneInput.Unit = $"{sym}/GA";
+                SeasonPenaltyPerBsNoneInput.Unit = $"{sym}/GA";
-                SeasonShareValueInput.Unit = $"{sym}/GA";
+                SeasonBsValueInput.Unit = $"{sym}/GA";
                 AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
                 AreaCommitmentTypePenaltyInput.Unit = sym;
                 AreaCommitmentTypePenaltyNoneInput.Unit = sym;
@@ -74,14 +81,14 @@ namespace Elwig.Windows {
                 SeasonVatFlatrateInput.Text = "";
                 SeasonStartInput.Text = "";
                 SeasonEndInput.Text = "";
-                SeasonMinKgPerShareInput.Text = "";
+                SeasonMinKgPerBsInput.Text = "";
-                SeasonMaxKgPerShareInput.Text = "";
+                SeasonMaxKgPerBsInput.Text = "";
                 SeasonPenaltyPerKgInput.Text = "";
                 SeasonPenaltyInput.Text = "";
                 SeasonPenaltyNoneInput.Text = "";
-                SeasonPenaltyPerShareInput.Text = "";
+                SeasonPenaltyPerBsInput.Text = "";
-                SeasonPenaltyPerShareNoneInput.Text = "";
+                SeasonPenaltyPerBsNoneInput.Text = "";
-                SeasonShareValueInput.Text = "";
+                SeasonBsValueInput.Text = "";
             }
             _seasonUpdate = false;
         }
@@ -96,28 +103,16 @@ namespace Elwig.Windows {
                 s.VatNormal = double.Parse(SeasonVatNormalInput.Text) / 100;
             if (SeasonVatFlatrateInput.Text.Length > 0)
                 s.VatFlatrate = double.Parse(SeasonVatFlatrateInput.Text) / 100;
-            if (ParameterBusinessShareModeInput.SelectedIndex == 0) {
+            if (SeasonMinKgPerBsInput.Text.Length > 0)
-                s.MinKgPerShare = (SeasonMinKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMinKgPerShareInput.Text) : null;
+                s.MinKgPerBusinessShare = int.Parse(SeasonMinKgPerBsInput.Text);
-                s.MaxKgPerShare = (SeasonMaxKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMaxKgPerShareInput.Text) : null;
+            if (SeasonMaxKgPerBsInput.Text.Length > 0)
-                s.MinKgPerShareRed = null;
+                s.MaxKgPerBusinessShare = int.Parse(SeasonMaxKgPerBsInput.Text);
-                s.MaxKgPerShareRed = null;
-                s.MinKgPerShareWhite = null;
-                s.MaxKgPerShareWhite = null;
-            } else {
-                s.MinKgPerShare = null;
-                s.MaxKgPerShare = null;
-                s.MinKgPerShareRed = (SeasonMinKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMinKgPerShareInput.Text) : null;
-                s.MaxKgPerShareRed = (SeasonMaxKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMaxKgPerShareInput.Text) : null;
-                s.MinKgPerShareWhite = s.MinKgPerShareRed;
-                s.MaxKgPerShareWhite = s.MaxKgPerShareRed;
-            }
-
             s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
             s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
             s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
-            s.PenaltyPerShareAmount = (SeasonPenaltyPerShareInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerShareInput.Text) : null;
+            s.PenaltyPerBsAmount = (SeasonPenaltyPerBsInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsInput.Text) : null;
-            s.PenaltyPerShareNone = (SeasonPenaltyPerShareNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerShareNoneInput.Text) : null;
+            s.PenaltyPerBsNone = (SeasonPenaltyPerBsNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsNoneInput.Text) : null;
-            s.BusinessShareValue = (SeasonShareValueInput.Text.Length > 0) ? decimal.Parse(SeasonShareValueInput.Text) : null;
+            s.BusinessShareValue = (SeasonBsValueInput.Text.Length > 0) ? decimal.Parse(SeasonBsValueInput.Text) : null;
 
             UpdateButtons();
         }
@@ -143,7 +138,7 @@ namespace Elwig.Windows {
             Season_Changed(sender, evt);
         }
 
-        private void SeasonPenaltyPerShareInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void SeasonPenaltyPerBsInput_TextChanged(object sender, TextChangedEventArgs evt) {
             if (SeasonList.SelectedItem is not Season s) return;
             InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, s.Precision));
             Season_Changed(sender, evt);
@@ -172,13 +167,13 @@ namespace Elwig.Windows {
                         MaxKgPerHa = s?.MaxKgPerHa ?? 10000,
                         VatNormal = s?.VatNormal ?? 0.10,
                         VatFlatrate = s?.VatFlatrate ?? 0.13,
-                        MinKgPerShare = s?.MinKgPerShare,
+                        MinKgPerBusinessShare = s?.MinKgPerBusinessShare ?? 500,
-                        MaxKgPerShare = s?.MaxKgPerShare,
+                        MaxKgPerBusinessShare = s?.MaxKgPerBusinessShare ?? 1000,
                         PenaltyPerKgValue = s?.PenaltyPerKgValue,
                         PenaltyAmoutValue = s?.PenaltyAmoutValue,
                         PenaltyNoneValue = s?.PenaltyNoneValue,
-                        PenaltyPerShareAmountValue = s?.PenaltyPerShareAmountValue,
+                        PenaltyPerBsAmountValue = s?.PenaltyPerBsAmountValue,
-                        PenaltyPerShareNoneValue = s?.PenaltyPerShareNoneValue,
+                        PenaltyPerBsNoneValue = s?.PenaltyPerBsNoneValue,
                         BusinessShareValueValue = s?.BusinessShareValueValue,
                         CalcMode = s?.CalcMode ?? 0,
                     });
@@ -193,12 +188,13 @@ namespace Elwig.Windows {
                             AbsValue = m.AbsValue * mult / div,
                             RelValue = m.RelValue,
                             IsActive = m.IsActive,
-                            IsRedacted = m.IsRedacted,
                         }));
                     }
                     await ctx.SaveChangesAsync();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Saison anlegen", 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, "Saison anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 App.HintContextChange();
                 Mouse.OverrideCursor = null;
@@ -209,14 +205,19 @@ namespace Elwig.Windows {
         private async void SeasonRemoveButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonList.SelectedItem is not Season s)
                 return;
-            if (InteractionService.AskContinue("Saison löschen", $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?")) {
+            var r = MessageBox.Show(
+                $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
+                "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     using var ctx = new AppDbContext();
                     ctx.Remove(s);
                     await ctx.SaveChangesAsync();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Saison löschen", 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, "Saison löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 App.HintContextChange();
                 Mouse.OverrideCursor = null;

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -19,7 +19,9 @@ namespace Elwig.Windows {
         private bool _attrUpdate = false;
 
         private async Task WineAttributesInitEditing(AppDbContext ctx) {
-            _attrList = new(await ctx.FetchWineAttributes().ToListAsync());
+            _attrList = new(await ctx.WineAttributes
+                .OrderBy(a => a.Name)
+                .ToListAsync());
             _attrs = _attrList.ToDictionary(a => a.AttrId, a => (string?)a.AttrId);
             _attrIds = _attrList.ToDictionary(a => a, a => a.AttrId);
             ControlUtils.RenewItemsSource(WineAttributeList, _attrList);
@@ -27,7 +29,9 @@ namespace Elwig.Windows {
         }
 
         private async Task WineAttributesFinishEditing(AppDbContext ctx) {
-            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.FetchWineAttributes().ToListAsync());
+            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.WineAttributes
+                .OrderBy(a => a.Name)
+                .ToListAsync());
             _attrList = null;
             _attrs = null;
             _attrIds = null;
@@ -41,8 +45,9 @@ namespace Elwig.Windows {
             if (!_attrChanged || _attrList == null || _attrs == null || _attrIds == null)
                 return;
 
-            var deleteAttrIds = _attrs.Where(a => a.Value == null).Select(a => a.Key).ToList();
+            foreach (var (attrid, _) in _attrs.Where(a => a.Value == null)) {
-            await ctx.WineAttributes.Where(a => deleteAttrIds.Contains(a.AttrId)).ExecuteDeleteAsync();
+                ctx.Remove(ctx.WineAttributes.Find(attrid)!);
+            }
             foreach (var (attr, old) in _attrIds) {
                 attr.AttrId = old;
             }
@@ -56,6 +61,7 @@ namespace Elwig.Windows {
                 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();
 
             foreach (var attr in _attrList.Where(a => !_attrIds.ContainsKey(a))) {
                 if (attr.AttrId == null) continue;

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -19,7 +19,9 @@ namespace Elwig.Windows {
         private bool _cultUpdate = false;
 
         private async Task WineCultivationsInitEditing(AppDbContext ctx) {
-            _cultList = new(await ctx.FetchWineCultivations().ToListAsync());
+            _cultList = new(await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .ToListAsync());
             _cults = _cultList.ToDictionary(c => c.CultId, c => (string?)c.CultId);
             _cultIds = _cultList.ToDictionary(c => c, c => c.CultId);
             ControlUtils.RenewItemsSource(WineCultivationList, _cultList);
@@ -27,7 +29,9 @@ namespace Elwig.Windows {
         }
 
         private async Task WineCultivationsFinishEditing(AppDbContext ctx) {
-            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.FetchWineCultivations().ToListAsync());
+            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .ToListAsync());
             _cultList = null;
             _cults = null;
             _cultIds = null;
@@ -41,8 +45,9 @@ namespace Elwig.Windows {
             if (!_cultChanged || _cultList == null || _cults == null || _cultIds == null)
                 return;
 
-            var deleteCultIds = _cults.Where(c => c.Value == null).Select(c => c.Key).ToList();
+            foreach (var (cultid, _) in _cults.Where(c => c.Value == null)) {
-            await ctx.WineCultivations.Where(c => deleteCultIds.Contains(c.CultId)).ExecuteDeleteAsync();
+                ctx.Remove(ctx.WineCultivations.Find(cultid)!);
+            }
             foreach (var (cult, old) in _cultIds) {
                 cult.CultId = old;
             }
@@ -55,6 +60,7 @@ namespace Elwig.Windows {
                 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();
 
             foreach (var cult in _cultList.Where(c => !_cultIds.ContainsKey(c))) {
                 if (cult.CultId == null) continue;

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -1,6 +1,5 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
@@ -32,15 +31,14 @@ namespace Elwig.Windows {
                 AreaCommitmentTypeMinKgPerHaInput, AreaCommitmentTypePenaltyPerKgInput,
                 AreaCommitmentTypePenaltyInput, AreaCommitmentTypePenaltyNoneInput,
                 SeasonMaxKgPerHaInput, SeasonVatNormalInput, SeasonVatFlatrateInput, SeasonStartInput, SeasonEndInput,
-                SeasonMinKgPerShareInput, SeasonMaxKgPerShareInput, SeasonShareValueInput,
+                SeasonMinKgPerBsInput, SeasonMaxKgPerBsInput, SeasonBsValueInput,
                 SeasonPenaltyPerKgInput, SeasonPenaltyInput, SeasonPenaltyNoneInput,
-                SeasonPenaltyPerShareInput, SeasonPenaltyPerShareNoneInput,
+                SeasonPenaltyPerBsInput, SeasonPenaltyPerBsNoneInput,
                 SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput, SeasonModifierAbsInput,
             ];
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
             WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
             ParameterAreaComGroup.Header = ParameterAreaComGroup.Header.ToString()!.Split('(')[0] + $"({Utils.CurrentLastSeason})";
-            LockInputs();
         }
 
         protected override void ShortcutNew() { }
@@ -80,19 +78,25 @@ namespace Elwig.Windows {
             SeasonMaxKgPerHaInput.IsReadOnly = true;
             SeasonVatNormalInput.IsReadOnly = true;
             SeasonVatFlatrateInput.IsReadOnly = true;
-            SeasonMinKgPerShareInput.IsReadOnly = true;
+            SeasonMinKgPerBsInput.IsReadOnly = true;
-            SeasonMaxKgPerShareInput.IsReadOnly = true;
+            SeasonMaxKgPerBsInput.IsReadOnly = true;
             SeasonPenaltyPerKgInput.IsReadOnly = true;
             SeasonPenaltyInput.IsReadOnly = true;
             SeasonPenaltyNoneInput.IsReadOnly = true;
-            SeasonPenaltyPerShareInput.IsReadOnly = true;
+            SeasonPenaltyPerBsInput.IsReadOnly = true;
-            SeasonPenaltyPerShareNoneInput.IsReadOnly = true;
+            SeasonPenaltyPerBsNoneInput.IsReadOnly = true;
-            SeasonShareValueInput.IsReadOnly = true;
+            SeasonBsValueInput.IsReadOnly = true;
 
             SeasonModifierIdInput.IsReadOnly = true;
             SeasonModifierNameInput.IsReadOnly = true;
             SeasonModifierRelInput.IsReadOnly = true;
             SeasonModifierAbsInput.IsReadOnly = true;
+
+            ParameterAllowAttrIntoLowerInput.IsEnabled = false;
+            ParameterAvoidUnderDeliveriesInput.IsEnabled = false;
+            ParameterHonorGebundenInput.IsEnabled = false;
+            ParameterExportEbicsVersion.IsEnabled = false;
+            ParameterExportEbicsAddress.IsEnabled = false;
         }
 
         new protected void UnlockInputs() {
@@ -128,37 +132,65 @@ namespace Elwig.Windows {
             SeasonMaxKgPerHaInput.IsReadOnly = false;
             SeasonVatNormalInput.IsReadOnly = false;
             SeasonVatFlatrateInput.IsReadOnly = false;
-            SeasonMinKgPerShareInput.IsReadOnly = false;
+            SeasonMinKgPerBsInput.IsReadOnly = false;
-            SeasonMaxKgPerShareInput.IsReadOnly = false;
+            SeasonMaxKgPerBsInput.IsReadOnly = false;
             SeasonPenaltyPerKgInput.IsReadOnly = false;
             SeasonPenaltyInput.IsReadOnly = false;
             SeasonPenaltyNoneInput.IsReadOnly = false;
-            SeasonPenaltyPerShareInput.IsReadOnly = false;
+            SeasonPenaltyPerBsInput.IsReadOnly = false;
-            SeasonPenaltyPerShareNoneInput.IsReadOnly = false;
+            SeasonPenaltyPerBsNoneInput.IsReadOnly = false;
-            SeasonShareValueInput.IsReadOnly = false;
+            SeasonBsValueInput.IsReadOnly = false;
 
             SeasonModifierIdInput.IsReadOnly = false;
             SeasonModifierNameInput.IsReadOnly = false;
             SeasonModifierRelInput.IsReadOnly = false;
             SeasonModifierAbsInput.IsReadOnly = false;
+
+            ParameterAllowAttrIntoLowerInput.IsEnabled = true;
+            ParameterAvoidUnderDeliveriesInput.IsEnabled = true;
+            ParameterHonorGebundenInput.IsEnabled = true;
+            ParameterExportEbicsVersion.IsEnabled = true;
+            ParameterExportEbicsAddress.IsEnabled = true;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            LockInputs();
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
-            FillInputs(App.Client, await ctx.FetchSeasons(Utils.CurrentLastSeason).SingleOrDefaultAsync());
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
-            ControlUtils.RenewItemsSource(SeasonList, await ctx.FetchSeasons(includeModifiers: true).ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
+                .OrderByDescending(s => s.Year)
+                .Include(s => s.Modifiers)
+                .Include(s => s.Currency)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            ControlUtils.RenewItemsSource(BranchList, await ctx.FetchBranches().ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
-            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.FetchWineAttributes().ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+                .OrderBy(b => b.Name)
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineVariantInput, await ctx.FetchWineVarieties().ToListAsync());
+                .Include(b => b.PostalDest!.AtPlz)
-            var attrList = await ctx.FetchWineAttributes().Cast<object>().ToListAsync();
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.WineAttributes
+                .OrderBy(a => a.Name)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineVariantInput, await ctx.WineVarieties
+                .OrderBy(s => s.Name)
+                .ToListAsync());
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(AreaCommitmentTypeWineAttributeInput, attrList);
             ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await ctx.AreaCommitmentTypes
                 .OrderBy(t => t.VtrgId)
+                .Include(t => t.WineVar)
+                .Include(t => t.WineAttr)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.Modifiers
+                .Where(m => m.Year == year)
+                .OrderBy(m => m.Ordering)
                 .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.FetchWineCultivations().ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.FetchModifiers(year ?? 0).ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
         }
 
         protected override void UpdateButtons() {
@@ -254,7 +286,7 @@ namespace Elwig.Windows {
 
             using var ctx = new AppDbContext();
             ClearInputStates();
-            FillInputs(App.Client, await ctx.FetchSeasons(Utils.CurrentLastSeason).SingleOrDefaultAsync());
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
             LockInputs();
         }
 
@@ -274,7 +306,7 @@ namespace Elwig.Windows {
 
             using var ctx = new AppDbContext();
             ClearInputStates();
-            FillInputs(App.Client, await ctx.FetchSeasons(Utils.CurrentLastSeason).SingleOrDefaultAsync());
+            FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
             UpdateButtons();
         }
 
@@ -290,7 +322,9 @@ namespace Elwig.Windows {
             try {
                 await Save();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Stammdaten aktualisieren", 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, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
@@ -308,7 +342,7 @@ namespace Elwig.Windows {
 
             using (var ctx = new AppDbContext()) {
                 ClearInputStates();
-                FillInputs(App.Client, await ctx.FetchSeasons(Utils.CurrentLastSeason).SingleOrDefaultAsync());
+                FillInputs(App.Client, await ctx.Seasons.FindAsync(Utils.CurrentLastSeason));
                 LockInputs();
             }
 
@@ -348,8 +382,6 @@ namespace Elwig.Windows {
             TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
             TextElementCreditNote.Text = p.TextCreditNote;
 
-            ParameterBusinessShareModeInput.SelectedIndex = p.ModeBusinessShares;
-            ParameterBusinessShareHistoryInput.IsChecked = p.EnableMemberHistory;
             ParameterAllowAttrIntoLowerInput.IsChecked = s?.Billing_AllowAttrsIntoLower ?? false;
             ParameterAvoidUnderDeliveriesInput.IsChecked = s?.Billing_AvoidUnderDeliveries ?? false;
             ParameterHonorGebundenInput.IsChecked = s?.Billing_HonorGebunden ?? false;
@@ -361,29 +393,27 @@ namespace Elwig.Windows {
 
         private async Task UpdateClientParameters(ClientParameters p) {
             p.Name = ClientNameInput.Text;
-            p.NameSuffix = string.IsNullOrWhiteSpace(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
+            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 = string.IsNullOrWhiteSpace(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
+            p.Iban = string.IsNullOrEmpty(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
-            p.Bic = string.IsNullOrWhiteSpace(ClientBicInput.Text) ? null : ClientBicInput.Text;
+            p.Bic = string.IsNullOrEmpty(ClientBicInput.Text) ? null : ClientBicInput.Text;
-            p.UstIdNr = string.IsNullOrWhiteSpace(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
+            p.UstIdNr = string.IsNullOrEmpty(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
-            p.LfbisNr = string.IsNullOrWhiteSpace(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
+            p.LfbisNr = string.IsNullOrEmpty(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
-            p.OrganicAuthority = string.IsNullOrWhiteSpace(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
+            p.OrganicAuthority = string.IsNullOrEmpty(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
-            p.PhoneNr = string.IsNullOrWhiteSpace(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
+            p.PhoneNr = string.IsNullOrEmpty(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
-            p.FaxNr = string.IsNullOrWhiteSpace(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
+            p.FaxNr = string.IsNullOrEmpty(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
-            p.EmailAddress = string.IsNullOrWhiteSpace(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
+            p.EmailAddress = string.IsNullOrEmpty(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
-            p.Website = string.IsNullOrWhiteSpace(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
+            p.Website = string.IsNullOrEmpty(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
 
-            p.ModeBusinessShares = ParameterBusinessShareModeInput.SelectedIndex;
+            p.TextDeliveryNote = string.IsNullOrEmpty(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
-            p.EnableMemberHistory = ParameterBusinessShareHistoryInput.IsChecked ?? false;
-            p.TextDeliveryNote = string.IsNullOrWhiteSpace(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 = string.IsNullOrWhiteSpace(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
+            p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
-            p.TextCreditNote = string.IsNullOrWhiteSpace(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
+            p.TextCreditNote = string.IsNullOrEmpty(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
 
             p.ExportEbicsVersion = ParameterExportEbicsVersion.SelectedIndex + 3;
             p.ExportEbicsAddress = ParameterExportEbicsAddress.SelectedIndex;
@@ -400,7 +430,7 @@ namespace Elwig.Windows {
         private async Task UpdateParameters(int year) {
             try {
                 using var ctx = new AppDbContext();
-                if (await ctx.FetchSeasons(year).SingleOrDefaultAsync() is not Season s)
+                if (await ctx.Seasons.FindAsync(year) is not Season s)
                     return;
 
                 s.Billing_AllowAttrsIntoLower = ParameterAllowAttrIntoLowerInput.IsChecked ?? false;

Elwig/Windows/ChartWindow.xaml

@@ -9,6 +9,7 @@
         xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF"
         mc:Ignorable="d"
         Title="Auszahlung - Elwig" Height="700" Width="1500" MinWidth="1000" MinHeight="500"
+        Loaded="Window_Loaded"
         Closing="Window_Closing">
 
     <Window.Resources>

Elwig/Windows/ChartWindow.xaml.cs

@@ -10,7 +10,6 @@ using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
 using ScottPlot.Plottables;
 using ScottPlot;
-using Elwig.Services;
 
 namespace Elwig.Windows {
     public partial class ChartWindow : ContextWindow {
@@ -26,12 +25,12 @@ namespace Elwig.Windows {
         private bool HasChanged = false;
         private bool Updating = false;
 
-        private Scatter? DataPlot;
+        private Scatter DataPlot;
         private Scatter? GebundenPlot;
-        private Marker? HighlightedPointPlot;
+        private Marker HighlightedPointPlot;
-        private Marker? PrimaryMarkedPointPlot;
+        private Marker PrimaryMarkedPointPlot;
-        private Marker? SecondaryMarkedPointPlot;
+        private Marker SecondaryMarkedPointPlot;
-        private Text? TooltipPlot;
+        private Text TooltipPlot;
 
         private static readonly LegendItem
             UngebundenLegend = new() {
@@ -77,13 +76,18 @@ namespace Elwig.Windows {
             PriceInput.Unit = $"{CurrencySymbol}/kg";
             GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
             PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
-            Title = $"{PaymentVar.Name} - Lese {year} - Elwig";
+            Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
             LockContext = true;
         }
 
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+        }
+
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
             if (HasChanged) {
-                if (!InteractionService.AskConfirmation("Schließen bestätigen", "Soll das Fenster wirklich geschlossen werden? Nicht gespeicherte Änderungen werden NICHT übernommen!")) {
+                var r = MessageBox.Show("Soll das Fenster wirklich geschlossen werden? Nicht gespeicherte Änderungen werden NICHT übernommen!", "Schließen bestätigen",
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) {
                     e.Cancel = true;
                     return;
                 }
@@ -97,31 +101,32 @@ namespace Elwig.Windows {
 
         private async Task RefreshGraphList(AppDbContext ctx) {
             PaymentVar = await ctx.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
-            Season = await ctx.FetchSeasons(Year).SingleOrDefaultAsync() ?? throw new ArgumentException("Season not found");
+            Season = await ctx.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
             CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
             PriceInput.Unit = $"{CurrencySymbol}/kg";
             GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
 
             try {
-                var data = EditBillingData.FromJson(PaymentVar.Data, await Utils.GetVaributes(ctx, Year));
+                var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetVaributes(ctx, Year));
-                var paymentEntries = (await data.GetPaymentGraphEntries(ctx, Season)).ToList();
+                var paymentEntries = data.GetPaymentGraphEntries(ctx, Season);
                 GraphEntries = [
                     ..paymentEntries,
-                    ..await data.GetQualityGraphEntries(ctx, Season, paymentEntries.Count != 0 ? paymentEntries.Max(e => e.Id) : 0)
+                    ..data.GetQualityGraphEntries(ctx, Season, paymentEntries.Any() ? paymentEntries.Max(e => e.Id) : 0)
                 ];
-            } catch (KeyNotFoundException exc) {
+            } catch (KeyNotFoundException ex) {
-                var key = exc.Message.Split('\'')[1].Split('\'')[0];
+                var key = ex.Message.Split('\'')[1].Split('\'')[0];
-                InteractionService.ShowError("Fehler",
+                MessageBox.Show($"Fehler beim Laden der Auszahlungsvariante:\n\n" +
-                    $"Fehler beim Laden der Auszahlungsvariante:\n\n" +
+                    $"Mit unbekanntem Attribut '{key}' kann nicht umgegangen werden.", "Fehler",
-                    $"Mit unbekanntem Attribut '{key}' kann nicht umgegangen werden.");
+                    MessageBoxButton.OK, MessageBoxImage.Error);
             } catch (ArgumentException) {
-                InteractionService.ShowError("Fehler",
+                MessageBox.Show($"Fehler beim Laden der Auszahlungsvariante:\n\n" +
-                    $"Fehler beim Laden der Auszahlungsvariante:\n\n" +
+                    $"Die Daten der Auszahlungsvariante entsprechen nicht dem benötigtem Format.", "Fehler",
-                    $"Die Daten der Auszahlungsvariante entsprechen nicht dem benötigtem Format.");
+                    MessageBoxButton.OK, MessageBoxImage.Error);
-            } catch (Exception exc) {
+            } catch (Exception ex) {
-                InteractionService.ShowException("Fehler", "Fehler beim Laden der Auszahlungsvariante", exc);
+                MessageBox.Show("Fehler beim Laden der Auszahlungsvariante:\n\n" + ex.Message, "Fehler",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            Vaributes = await Utils.GetVaributeList(ctx, Year);
+            Vaributes = Utils.GetVaributeList(ctx, Year);
             GraphEntries.ForEach(e => {
                 e.Vaributes.ForEach(v => {
                     var found = Vaributes.Find(a => a.Variety?.SortId == v.Variety?.SortId && a.Attribute?.AttrId == v.Attribute?.AttrId && a.Cultivation?.CultId == v.Cultivation?.CultId);
@@ -215,12 +220,10 @@ namespace Elwig.Windows {
                 GebundenPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorGebunden);
             }
 
-            if (SelectedGraphEntry != null) {
+            DataPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry!.DataGraph.DataX, SelectedGraphEntry!.DataGraph.DataY);
-                DataPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry.DataGraph.DataX, SelectedGraphEntry.DataGraph.DataY);
+            DataPlot.LineStyle.Color = ColorUngebunden;
-                DataPlot.LineStyle.Color = ColorUngebunden;
+            DataPlot.Color = ColorUngebunden;
-                DataPlot.Color = ColorUngebunden;
+            DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
-                DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
-            }
 
             OechslePricePlot.Plot.Axes.SetLimits(Math.Min(GraphEntry.MinX, GraphEntry.MinXGeb) - 1, GraphEntry.MaxX + 1, -0.1, 1.5);
 
@@ -246,10 +249,7 @@ namespace Elwig.Windows {
             SecondaryMarkedPoint = -1;
             ChangeActiveGraph(null);
             HideGradationLines();
-            if (DataPlot != null) {
+            OechslePricePlot.Plot.Remove(DataPlot);
-                OechslePricePlot.Plot.Remove(DataPlot);
-                DataPlot = null;
-            }
             if (GebundenPlot != null) {
                 OechslePricePlot.Plot.Remove(GebundenPlot);
                 GebundenPlot = null;
@@ -259,9 +259,9 @@ namespace Elwig.Windows {
             OechslePricePlot.Refresh();
         }
 
-        private static void ChangeMarker(Marker? point, bool visible, double x = 0, double y = 0) {
+        private void ChangeMarker(Marker point, bool visible, double x = 0, double y = 0) {
-            point?.Location = new Coordinates(x, y);
+            point.Location = new Coordinates(x, y);
-            point?.IsVisible = visible;
+            point.IsVisible = visible;
         }
 
         private void EnableActionButtons() {
@@ -421,7 +421,7 @@ namespace Elwig.Windows {
                 var res = Validator.CheckDecimal(PriceInput, true, 2, Season.Precision);
                 if (res.IsValid && double.TryParse(PriceInput.Text, out double price)) {
                     ActiveGraph.SetPriceAt(PrimaryMarkedPoint, price);
-                    PrimaryMarkedPointPlot?.Location = new Coordinates(PrimaryMarkedPointPlot.Location.X, price);
+                    PrimaryMarkedPointPlot.Location = new Coordinates(PrimaryMarkedPointPlot.Location.X, price);
                     SetHasChanged();
                     OechslePricePlot.Refresh();
                     CheckGebundenTypeFixed();
@@ -497,19 +497,17 @@ namespace Elwig.Windows {
 
                 ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
 
-                if (Highlighted.Graph != null) {
+                Updating = true;
-                    Updating = true;
+                OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
-                    OechsleInput.Text = Highlighted.Graph.GetOechsleAt(Highlighted.Index).ToString();
+                GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
-                    GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
+                PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
-                    PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
+                Updating = false;
-                    Updating = false;
-                }
 
                 EnableActionButtons();
             } else {
                 PrimaryMarkedPoint = -1;
                 SecondaryMarkedPoint = -1;
-                if (SelectedGraphEntry?.GebundenGraph != null) {
+                if (SelectedGraphEntry!.GebundenGraph != null) {
                     ChangeActiveGraph(null);
                 }
                 ChangeMarker(PrimaryMarkedPointPlot, false);
@@ -555,26 +553,21 @@ namespace Elwig.Windows {
 
             if (mouseOnData != null) {
                 ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.X, mouseOnData.Value.Y);
-                HighlightedPointPlot?.IsVisible = true;
+                HighlightedPointPlot.IsVisible = true;
                 HoverChanged = true ^ HoverActive;
                 HoverActive = true;
-                if (SelectedGraphEntry?.DataGraph is Graph g)
+                HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
-                    HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
             } else if (mouseOnGebunden != null) {
                 ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y);
-                HighlightedPointPlot?.IsVisible = true;
+                HighlightedPointPlot.IsVisible = true;
                 HoverChanged = true ^ HoverActive;
                 HoverActive = true;
-                if (SelectedGraphEntry?.GebundenGraph is Graph g)
+                HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
-                    HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
             } else {
                 ChangeMarker(HighlightedPointPlot, false);
                 HoverChanged = false ^ HoverActive;
                 HoverActive = false;
-                if (TooltipPlot != null) {
+                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    TooltipPlot = null;
-                }
                 OechslePricePlot.Refresh();
             }
         }
@@ -589,10 +582,7 @@ namespace Elwig.Windows {
 
         private void HandleTooltip(double pointX, double pointY, int pointIndex, Graph g, Point p, bool force) {
             if (force || LastHighlighted != Highlighted || HoverChanged) {
-                if (TooltipPlot != null) {
+                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    TooltipPlot = null;
-                }
                 if (TooltipInput.IsChecked == true) {
                     Coordinates mouseLocation = GetMouseCoordinates(new(p.X, p.Y - 30));
                     TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)} {CurrencySymbol}/kg", mouseLocation.X, mouseLocation.Y);
@@ -635,7 +625,11 @@ namespace Elwig.Windows {
         private void DeleteButton_Click(object sender, RoutedEventArgs e) {
             if (SelectedGraphEntry == null) return;
 
-            if (InteractionService.AskConfirmation("Kurve löschen", $"Soll die Kurve {SelectedGraphEntry.Id} (verwendet in folgenden Verträgen: {SelectedGraphEntry.VaributeStringSimple}) wirklich gelöscht werden?")) {
+            var r = MessageBox.Show(
+                $"Soll die Kurve {SelectedGraphEntry.Id} (verwendet in folgenden Verträgen: {SelectedGraphEntry.VaributeStringSimple}) wirklich gelöscht werden?",
+                "Kurve löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+
+            if (r == MessageBoxResult.Yes) {
                 GraphEntries.Remove(SelectedGraphEntry);
                 SetHasChanged();
                 GraphList.Items.Refresh();
@@ -651,7 +645,7 @@ namespace Elwig.Windows {
                 await Task.Run(async () => {
                     using var ctx = new AppDbContext();
                     var origData = BillingData.FromJson(PaymentVar.Data);
-                    var data = BillingData.FromGraphEntries(GraphEntries, origData, await Utils.GetVaributes(ctx, Year),
+                    var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
                         AllVaributesAssigned, AllVaributesAssignedAbgew);
 
                     PaymentVar.Data = data.ToJsonString();
@@ -660,20 +654,22 @@ namespace Elwig.Windows {
                 });
             } catch (Exception exc) {
                 Mouse.OverrideCursor = null;
-                InteractionService.ShowDbException("Auszahlungsvariante speichern", exc);
+                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;
             }
 
             try {
                 await Task.Run(async () => {
-                    var b = await BillingVariant.Create(PaymentVar.Year, PaymentVar.AvNr);
+                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
                     await b.Calculate(false);
                 });
             } catch (KeyNotFoundException exc) {
-                InteractionService.ShowInformation("Noch nicht alle Preise festgelegt", exc.Message);
+                MessageBox.Show(exc.Message, "Noch nicht alle Preise festgelegt", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                InteractionService.ShowException("Berechnungsfehler", exc);
+                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
 
             LockContext = false;
@@ -691,7 +687,7 @@ namespace Elwig.Windows {
             }
         }
 
-        private static void DisableTextBox(TextBox u) {
+        private void DisableTextBox(TextBox u) {
             u.IsEnabled = false;
             u.IsReadOnly = true;
         }
@@ -722,8 +718,10 @@ namespace Elwig.Windows {
             ActiveGraph = g;
         }
 
-        private static void ChangeLineWidth(Scatter? p, double lineWidth) {
+        private void ChangeLineWidth(Scatter? p, double lineWidth) {
-            p?.LineWidth = (float)lineWidth;
+            if (p != null) {
+                p.LineWidth = (float)lineWidth;
+            }
         }
 
         private void GraphList_SelectionChanged(object sender, SelectionChangedEventArgs e) {
@@ -765,7 +763,7 @@ namespace Elwig.Windows {
                 }
             }
 
-            SelectedGraphEntry?.Vaributes = [.. VaributeInput.SelectedItems.Cast<Varibute>()];
+            SelectedGraphEntry!.Vaributes = VaributeInput.SelectedItems.Cast<Varibute>().ToList();
             SetHasChanged();
             GraphList.Items.Refresh();
             VaributeInput.Items.Refresh();
@@ -778,7 +776,9 @@ namespace Elwig.Windows {
                 if (ge != SelectedGraphEntry && ge.Abgewertet == SelectedGraphEntry?.Abgewertet) {
                     var toRemove = ge.Vaributes.Where(c => c.Listing.Equals(varibute)).ToList();
                     if (toRemove.Count == 0) continue;
-                    if (!InteractionService.AskConfirmation("Entfernen bestätigen", $"Achtung: {string.Join(", ", toRemove)} ist bereits in Kurve {ge.Id} in Verwendung!\nSoll die Zuweisung dort entfernt werden?")) {
+                    var r = MessageBox.Show($"Achtung: {string.Join(", ", toRemove)} ist bereits in Kurve {ge.Id} in Verwendung!\nSoll die Zuweisung dort entfernt werden?", "Entfernen bestätigen",
+                        MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                    if (r != MessageBoxResult.Yes) {
                         return false;
                     }
                     ge.Vaributes.RemoveAll(c => c.Listing.Equals(varibute));

Elwig/Windows/ContextWindow.cs

@@ -13,13 +13,11 @@ namespace Elwig.Windows {
             set {
                 _lockContext = value;
                 if (!_lockContext && _renewPending) {
-                    Dispatcher.BeginInvoke(async () => await EnsureContextRenewed());
+                    Dispatcher.BeginInvoke(async () => await RenewContext());
                 }
             }
         }
 
-        protected bool HasContextLoaded { get; private set; }
-
         private bool _renewPending = false;
 
         private readonly RoutedCommand CtrlR = new("CtrlR", typeof(ContextWindow), [new KeyGesture(Key.R, ModifierKeys.Control)]);
@@ -32,41 +30,27 @@ namespace Elwig.Windows {
         }
 
         public async void ForceContextReload(object sender, EventArgs evt) {
-            await ForceContextReload();
+            await HintContextChange();
         }
 
-        public async Task ForceContextReload() {
+        public async Task HintContextChange() {
-            HintContextChange();
-            await TryContextReload();
-        }
-
-        public void HintContextChange() {
             _renewPending = true;
-        }
-
-        public async Task TryContextReload() {
             if (LockContext) return;
-            await EnsureContextRenewed();
+            await RenewContext();
         }
 
         protected async void OnLoaded(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
             using var ctx = new AppDbContext();
             await OnRenewContext(ctx);
-            HasContextLoaded = true;
-            await OnInit(ctx);
-            Mouse.OverrideCursor = null;
         }
 
-        protected async Task EnsureContextRenewed() {
+        protected async Task RenewContext() {
             if (!_renewPending) return;
-            _renewPending = false;
             using var ctx = new AppDbContext();
             await OnRenewContext(ctx);
+            _renewPending = false;
         }
 
-        virtual protected async Task OnInit(AppDbContext ctx) { }
-
         abstract protected Task OnRenewContext(AppDbContext ctx);
     }
 }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="{Binding Title}" Height="720" Width="1150" MinHeight="720" MinWidth="1000">
+        Title="{Binding Title}" Height="720" Width="1150" MinHeight="720" MinWidth="1000"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryAdminViewModel/>
     </Window.DataContext>
@@ -130,11 +131,7 @@
             </MenuItem>
             <MenuItem Header="Liefermengen" x:Name="Menu_DeliveryDataList">
                 <MenuItem x:Name="Menu_DeliveryDataList_SaveFilters" Header="...aus Filtern speichern... (Excel)"
-                          Click="Menu_DeliveryDataList_SaveFilters_Click">
+                          Click="Menu_DeliveryDataList_SaveFilters_Click"/>
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
             </MenuItem>
             <MenuItem Header="Statistik" x:Name="Menu_Statistics">
                 <MenuItem Header="Qualitätsstatistik..." x:Name="Menu_Statistics_WineQuality">
@@ -165,11 +162,7 @@
                 </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">
+                              Click="Menu_Statistic_Locality_SaveFilters_Click"/>
-                        <MenuItem.Icon>
-                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
-                        </MenuItem.Icon>
-                    </MenuItem>
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="BKI">
@@ -191,23 +184,6 @@
                 <MenuItem x:Name="Menu_Export_UploadSeason" Header="...von Saison/Zweigstelle hochladen"
                           Click="Menu_Export_UploadSeason_Click"/>
             </MenuItem>
-            <MenuItem Header="Massenaktion">
-                <MenuItem x:Name="Menu_BulkAction_SetAttribute" Header="Attribut auf Lieferungen aus Filtern setzen...">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE932;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem x:Name="Menu_BulkAction_AddModifier" Header="Zu-/Abschlag auf Lieferungen aus Filtern hinzufügen...">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xECC8;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem x:Name="Menu_BulkAction_RemoveModifier" Header="Zu-/Abschlag auf Lieferungen aus Filtern entfernen...">
-                    <MenuItem.Icon>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xECC9;"/>
-                    </MenuItem.Icon>
-                </MenuItem>
-            </MenuItem>
             <MenuItem Header="Einstellungen">
                 <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
                           IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/>
@@ -529,12 +505,12 @@
                     </Grid.ColumnDefinitions>
                     <Label Content="Gradation:" Margin="10,10,10,10"/>
                     <ctrl:UnitTextBox x:Name="GradationOeInput" Unit="°Oe" Text="{Binding GradationOeString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"
+                                      TextChanged="GradationOeInput_TextChanged" KeyUp="Input_KeyUp"
                                       Grid.Column="1" Width="54" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
                     <ctrl:UnitTextBox x:Name="GradationKmwInput" Unit="°KMW" Text="{Binding GradationKmwString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"
+                                      TextChanged="GradationKmwInput_TextChanged" KeyUp="Input_KeyUp"
                                       Grid.Column="1" Width="68" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -6,6 +6,7 @@ using Elwig.Models.Entities;
 using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,7 +14,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Threading;
 
 namespace Elwig.Windows {
@@ -36,7 +36,6 @@ namespace Elwig.Windows {
         private readonly Button[] WeighingButtons;
 
         private List<WineQualLevel> WineQualityLevels = [];
-        private Dictionary<int, List<Modifier>> Modifiers = [];
 
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();
@@ -122,24 +121,22 @@ namespace Elwig.Windows {
             Menu_Export_UploadSeason.IsEnabled = App.Config.SyncUrl != null;
         }
 
-        public DeliveryAdminWindow(int mgnr) :
+        public DeliveryAdminWindow(int mgnr) : this() {
-            this() {
+            ViewModel.FilterMember = DeliveryService.GetMember(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
-            using var ctx = new AppDbContext();
-            ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ViewModel.EnableAllSeasons = true;
         }
 
-        protected override async Task OnInit(AppDbContext ctx) {
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
-            await base.OnInit(ctx);
             OnSecondPassed(null, null);
             SecondsTimer.Start();
+            LockInputs();
             if (ViewModel.IsReceipt) {
                 NewDeliveryButton_Click(null, null);
-                if (await ctx.FetchSeasons(Utils.CurrentYear).SingleOrDefaultAsync() == null) {
+                using var ctx = new AppDbContext();
-                    InteractionService.ShowWarning("Saison noch nicht erstellt",
+                if (ctx.Seasons.Find(Utils.CurrentYear) == null) {
-                        "Die Saison für das aktuelle Jahr wurde noch nicht erstellt. Neue Lieferungen können nicht abgespeichert werden.\n\n" +
+                    MessageBox.Show("Die Saison für das aktuelle Jahr wurde noch nicht erstellt. Neue Lieferungen können nicht abgespeichert werden.\n\n(Stammdaten -> Saisons -> Neu anlegen...)",
-                        "(Stammdaten -> Saisons -> Neu anlegen...)");
+                        "Saison noch nicht erstellt", MessageBoxButton.OK, MessageBoxImage.Warning);
                 }
             }
         }
@@ -165,7 +162,9 @@ namespace Elwig.Windows {
         private async void Menu_DeliveryNote_Email_Click(object sender, RoutedEventArgs evt) {
             if (DeliveryList.SelectedItem is not Delivery d)
                 return;
-            if (!InteractionService.AskQuestion("Lieferschein verschicken", "Soll eine E-Mail verschickt werden?", true))
+            var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Lieferschein verschicken",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes);
+            if (res != MessageBoxResult.Yes)
                 return;
             await DeliveryService.GenerateDeliveryNote(d.Year, d.DId, ExportMode.Email);
         }
@@ -173,11 +172,16 @@ namespace Elwig.Windows {
         private async void Menu_Bki_SaveList_Click(object sender, RoutedEventArgs evt) {
             if (sender is not MenuItem m) return;
             var year = int.Parse(m.Header.ToString()?.Split(" ")[^1] ?? Utils.CurrentLastSeason.ToString());
-            var filename = InteractionService.SaveFile("Traubentransportscheinliste (BKI)", $"{App.Client.NameToken}-Traubentransportscheinliste-{year}", Bki.FileExtension);
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"{App.Client.NameToken}-Traubentransportscheinliste-{year}.{Bki.FileExtension}",
+                DefaultExt = Bki.FileExtension,
+                Filter = "CSV-Datei (*.csv)|*.csv",
+                Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 await Task.Run(async () => {
-                    using var file = new Bki(filename);
+                    using var file = new Bki(d.FileName);
                     await file.ExportAsync(year);
                 });
                 Mouse.OverrideCursor = null;
@@ -279,21 +283,6 @@ namespace Elwig.Windows {
         private async void Menu_DeliveryDataList_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateDeliveryDataList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList);
 
-        private async void Menu_BulkAction_SetAttribute_Click(object sender, RoutedEventArgs evt) {
-            if (IsEditing || IsCreating || sender is not MenuItem item) return;
-            await ViewModel.BulkSetAttribute(item.Header as string);
-        }
-
-        private async void Menu_BulkAction_AddModifier_Click(object sender, RoutedEventArgs evt) {
-            if (IsEditing || IsCreating || sender is not MenuItem item || item.Header is not string name) return;
-            await ViewModel.BulkAddModifier(name);
-        }
-
-        private async void Menu_BulkAction_RemoveModifier_Click(object sender, RoutedEventArgs evt) {
-            if (IsEditing || IsCreating || sender is not MenuItem item || item.Header is not string name) return;
-            await ViewModel.BulkRemoveModifier(name);
-        }
-
         private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
             if (IsEditing || IsCreating) {
                 DateInput.IsReadOnly = false;
@@ -415,57 +404,45 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var deliveries = await deliveryQuery
-            var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterAllSeasons, vm.FilterTodayOnly);
+                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
-            var (filter, deliveries, deliveryPartsNum, varieties, members, stat) = await Task.Run(async () => {
+                .Include(d => d.Parts).ThenInclude(p => p.Attribute)
-                using var ctx = new AppDbContext();
+                .Include(d => d.Parts).ThenInclude(p => p.Cultivation)
-                var (_, deliveryQuery, deliveryPartsQuery, predicate, filter) = await vm.GetFilters(ctx);
+                .Include(d => d.Parts).ThenInclude(p => p.Variety)
-                var deliveries = await deliveryQuery
+                .Include(d => d.Member.EmailAddresses)
-                    .Include(d => d.Parts).ThenInclude(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                .AsSplitQuery()
-                    .Include(d => d.Parts).ThenInclude(p => p.Variety)
+                .ToListAsync();
-                    .Include(d => d.Parts).ThenInclude(p => p.Attribute)
+            deliveries.Reverse();
-                    .Include(d => d.Parts).ThenInclude(p => p.Cultivation)
-                    .IgnoreAutoIncludes()
-                    .AsSplitQuery()
-                    .ToListAsync();
-                deliveries.Reverse();
 
-                if (filter.Count > 0 && deliveries.Count > 0) {
+            if (filter.Count > 0 && deliveries.Count > 0) {
-                    var dict = deliveries.AsParallel()
+                var dict = deliveries.AsParallel()
-                        .ToDictionary(d => d, d => d.SearchScore(vm.TextFilter))
+                    .ToDictionary(d => d, d => d.SearchScore(ViewModel.TextFilter))
-                        .OrderByDescending(a => a.Value)
+                    .OrderByDescending(a => a.Value)
-                        .ThenBy(a => a.Key.DateTime);
+                    .ThenBy(a => a.Key.DateTime);
-                    var threshold = dict.Max(a => a.Value) * 3 / 4;
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
-                    deliveries = [.. dict
+                deliveries = dict
-                        .Where(a => a.Value > threshold)
+                    .Where(a => a.Value > threshold)
-                        .Select(a => a.Key)];
+                    .Select(a => a.Key)
-                }
+                    .ToList();
-
+            }
-                deliveries.ForEach(d => { d.PartFilter = predicate; });
-
-                var deliveryPartsNum = await deliveryPartsQuery.CountAsync();
-                var varieties = await deliveryPartsQuery.Select(d => d.SortId).Distinct().ToListAsync();
-                var members = await deliveryQuery.Select(d => d.Member).Distinct().IgnoreAutoIncludes().ToListAsync();
-                var stat = await DeliveryService.GenerateToolTipData(deliveryPartsQuery);
-
-                return (filter, deliveries, deliveryPartsNum, varieties, members, stat);
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterAllSeasons, ViewModel.FilterTodayOnly)) return;
 
+            deliveries.ForEach(d => { d.PartFilter = predicate; });
             ControlUtils.RenewItemsSource(DeliveryList, deliveries,
-                DeliveryList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
+                DeliveryList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             await RefreshDeliveryParts();
 
+            var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
             ViewModel.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
             ViewModel.StatusDeliveries = $"{deliveries.Count:N0}";
 
             if (filter.Count == 0) {
-                ViewModel.StatusDeliveries = $"{deliveries.Count:N0} ({deliveryPartsNum:N0})";
+                var deliveryParts = deliveryPartsQuery;
+                ViewModel.StatusDeliveries = $"{deliveries.Count:N0} ({await deliveryParts.CountAsync():N0})";
+                var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
                 ViewModel.StatusVarieties = $"{varieties.Count:N0}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
-                var (wText, wData, gText, gData) = stat;
+                var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
                 ViewModel.StatusWeight = wText;
                 ViewModel.StatusGradation = gText;
                 (ViewModel.StatusWeightToolTip, ViewModel.StatusGradationToolTip) = DeliveryService.GenerateToolTip(wData, gData);
@@ -483,7 +460,7 @@ namespace Elwig.Windows {
             await base.OnRenewContext(ctx);
 
             if (ViewModel.FilterMember != null) {
-                if (await ctx.FetchMembers(ViewModel.FilterMember.MgNr).SingleOrDefaultAsync() is not Member m) {
+                if (await DeliveryService.GetMemberAsync(ViewModel.FilterMember.MgNr) is not Member m) {
                     Close();
                     return;
                 }
@@ -491,10 +468,8 @@ namespace Elwig.Windows {
                 ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             }
 
-            int year = 0;
             Menu_Bki_SaveList.Items.Clear();
-            foreach (var s in await ctx.FetchSeasons().ToListAsync()) {
+            foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
-                if (s.Year > year) year = s.Year;
                 var i = new MenuItem {
                     Header = $"Saison {s.Year}",
                 };
@@ -502,69 +477,45 @@ namespace Elwig.Windows {
                 Menu_Bki_SaveList.Items.Add(i);
             }
 
-            var attributes = await ctx.FetchWineAttributes(!IsCreating).ToListAsync();
-            Modifiers = await ctx.FetchModifiers(null).GroupBy(m => m.Year).ToDictionaryAsync(g => g.Key, g => g.ToList());
-
-            var font = new FontFamily("Segoe MDL2 Assets");
-            Menu_BulkAction_SetAttribute.Items.Clear();
-            var noAttr = new MenuItem {
-                Header = new TextBlock() { Text = "Kein Attribut", FontStyle = FontStyles.Italic },
-                Icon = new TextBlock() { Text = "\ue75c", FontFamily = font, FontSize = 16 },
-            };
-            noAttr.Click += Menu_BulkAction_SetAttribute_Click;
-            Menu_BulkAction_SetAttribute.Items.Add(noAttr);
-            foreach (var attr in attributes) {
-                var i = new MenuItem {
-                    Header = attr.Name,
-                };
-                i.Click += Menu_BulkAction_SetAttribute_Click;
-                Menu_BulkAction_SetAttribute.Items.Add(i);
-            }
-
-            Menu_BulkAction_AddModifier.Items.Clear();
-            Menu_BulkAction_RemoveModifier.Items.Clear();
-            foreach (var mod in Modifiers.GetValueOrDefault(ViewModel.SelectedDelivery?.Year ?? year, [])) {
-                var i1 = new MenuItem {
-                    Header = mod.Name,
-                };
-                i1.Click += Menu_BulkAction_AddModifier_Click;
-                Menu_BulkAction_AddModifier.Items.Add(i1);
-                var i2 = new MenuItem {
-                    Header = mod.Name,
-                };
-                i2.Click += Menu_BulkAction_RemoveModifier_Click;
-                Menu_BulkAction_RemoveModifier.Items.Add(i2);
-            }
-
             await RefreshList();
-
+            var d = DeliveryList.SelectedItem as Delivery;
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !IsCreating, includeContactInfo: true).ToListAsync());
+            var y = d?.Year ?? ViewModel.FilterSeason;
-            ControlUtils.RenewItemsSource(BranchInput, await ctx.FetchBranches().ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
-            ControlUtils.RenewItemsSource(WineVarietyInput, await ctx.FetchWineVarieties().ToListAsync());
+                .Where(m => m.IsActive || !IsCreating)
-            var attrList = attributes.Cast<object>().ToList();
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
+            ControlUtils.RenewItemsSource(WineVarietyInput, await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync());
+            var attrList = await ctx.WineAttributes.Where(a => !IsCreating || a.IsActive).OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
-            var cultList = await ctx.FetchWineCultivations().Cast<object>().ToListAsync();
+            var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
-            WineQualityLevels = await ctx.FetchWineQualityLevels().ToListAsync();
+            WineQualityLevels = await ctx.WineQualityLevels.ToListAsync();
             ControlUtils.RenewItemsSource(WineQualityLevelInput, WineQualityLevels);
-            ControlUtils.RenewItemsSource(ModifiersInput, Modifiers.GetValueOrDefault(year, []).Where(m => m.IsActive || !IsCreating).ToList());
+            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
-            var origins = await ctx.WineOrigins.ToListAsync();
+                .Where(m => m.Year == y && (!IsCreating || m.IsActive))
-            origins.ForEach(o => { origins.FirstOrDefault(p => p.HkId == o.ParentHkId)?.Children.Add(o); });
+                .OrderBy(m => m.Ordering)
-            origins = [.. origins.OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId)];
+                .Include(m => m.Season.Currency)
-            ControlUtils.RenewItemsSource(WineOriginInput, origins);
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(WineOriginInput, (await ctx.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId));
             var kgList = (await ctx.Katastralgemeinden
                 .Where(k => k.WbKg != null)
                 .Include(k => k.WbKg)
                 .Include(k => k.Gem.WbGem)
                 .OrderBy(k => k.Name)
+                .AsSplitQuery()
                 .ToListAsync()).Cast<object>().ToList();
             kgList.Insert(0, new NullItem());
             ControlUtils.RenewItemsSource(WineKgInput, kgList);
             UpdateRdInput();
             if (IsCreating) await UpdateLsNr();
 
+            await RefreshDeliveryParts();
             RefreshInputs();
         }
 
@@ -576,28 +527,36 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshDeliveryParts() {
+            using var ctx = new AppDbContext();
             if (DeliveryList.SelectedItem is Delivery d) {
-                ControlUtils.RenewItemsSource(ModifiersInput, Modifiers.GetValueOrDefault(d.Year, []).Where(m => m.IsActive || !IsCreating).ToList());
+                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
-                ControlUtils.RenewItemsSource(DeliveryPartList, d.Parts, DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+                    .Where(m => m.Year == d.Year && (!IsCreating || m.IsActive))
+                    .OrderBy(m => m.Ordering)
+                    .Include(m => m.Season.Currency)
+                    .ToListAsync());
+                ControlUtils.RenewItemsSource(DeliveryPartList, d.FilteredParts.OrderBy(p => p.DPNr).ToList(), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
-                ControlUtils.RenewItemsSource(ModifiersInput, Modifiers.GetValueOrDefault(ViewModel.FilterSeason ?? 0, []).Where(m => m.IsActive || !IsCreating).ToList());
+                ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
+                    .Where(m => m.Year == ViewModel.FilterSeason && (!IsCreating || m.IsActive))
+                    .OrderBy(m => m.Ordering)
+                    .Include(m => m.Season.Currency)
+                    .ToListAsync());
                 DeliveryPartList.ItemsSource = null;
             }
         }
 
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            if (DeliveryList.SelectedItem is Delivery d) {
+            if (DeliveryPartList.SelectedItem is DeliveryPart p) {
+                FillInputs(p);
+            } else if (DeliveryList.SelectedItem is Delivery d) {
                 FillInputs(d);
-                if (DeliveryPartList.SelectedItem is DeliveryPart p) {
-                    FillInputs(p);
-                }
             } else {
                 ClearOriginalValues();
                 ClearDefaultValues();
                 ClearInputs(validate);
                 ClearInputStates();
-            }
+            }            
             GC.Collect();
         }
 
@@ -609,6 +568,7 @@ namespace Elwig.Windows {
         }
 
         private void FillInputs(DeliveryPart p) {
+            FillInputs(p.Delivery);
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(p);
@@ -635,10 +595,11 @@ namespace Elwig.Windows {
             try {
                 var res = await s.Weigh();
                 OnWeighingResult(s, res);
-            } catch (Exception exc) {
+            } catch (Exception ex) {
-                ViewModel.LastScaleError = exc.Message.Split(": ")[^1];
+                ViewModel.LastScaleError = ex.Message.Split(": ")[^1];
                 OnWeighingResult(s, new());
-                InteractionService.ShowException("Waagenfehler", "Beim Wiegen ist ein Fehler aufgetreten", exc);
+                MessageBox.Show($"Beim Wiegen ist ein Fehler aufgetreten:\n\n{ex.Message}", "Waagenfehler",
+                       MessageBoxButton.OK, MessageBoxImage.Error);
             }
             ViewModel.ManualWeighingReason = null;
             ManualWeighingInput.IsChecked = false;
@@ -671,19 +632,17 @@ namespace Elwig.Windows {
         }
 
         private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList(true);
         }
 
         private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded || ViewModel.FilterSeason == null || TodayOnlyInput == null || AllSeasonsInput == null) return;
+            if (ViewModel.FilterSeason == null || TodayOnlyInput == null || AllSeasonsInput == null) return;
             TodayOnlyInput.IsChecked = false;
             AllSeasonsInput.IsChecked = false;
             await RefreshList();
         }
 
         private async void TodayOnlyInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             if (TodayOnlyInput.IsChecked == true && AllSeasonsInput.IsChecked == false) {
                 ViewModel.FilterSeason = Utils.Today.Year;
                 ViewModel.FilterTodayOnly = true;
@@ -692,7 +651,6 @@ namespace Elwig.Windows {
         }
 
         private async void AllSeasonsInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             if (AllSeasonsInput.IsChecked == true) {
                 SeasonInput.IsEnabled = false;
                 ViewModel.FilterSeason = null;
@@ -712,7 +670,7 @@ namespace Elwig.Windows {
                 Menu_DeliveryNote_Show.IsEnabled = !IsEditing && !IsCreating;
                 Menu_DeliveryNote_SavePdf.IsEnabled = !IsEditing && !IsCreating;
                 Menu_DeliveryNote_Print.IsEnabled = !IsEditing && !IsCreating;
-                Menu_DeliveryNote_Email.IsEnabled = !IsEditing && !IsCreating && App.Config.Smtp != null && ViewModel.Member?.EmailAddresses.Count > 0;
+                Menu_DeliveryNote_Email.IsEnabled = !IsEditing && !IsCreating && App.Config.Smtp != null && d.Member.EmailAddresses.Count > 0;
                 Menu_Export_ExportSelected.IsEnabled = !IsEditing && !IsCreating;
                 Menu_Export_UploadSelected.IsEnabled = !IsEditing && !IsCreating && App.Config.SyncUrl != null;
             } else {
@@ -794,7 +752,9 @@ namespace Elwig.Windows {
                 );
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Lieferung aktualisieren", 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);
                 FinishButton.IsEnabled = true;
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
@@ -803,12 +763,13 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
-
+            await RefreshList();
-            await EnsureContextRenewed();
+            await RefreshDeliveryParts();
             Mouse.OverrideCursor = null;
-            ControlUtils.SelectItemWithPk(DeliveryList, p?.Year, p?.DId);
+            ControlUtils.SelectItem(DeliveryList, p?.Delivery);
             DeliveryPartList.SelectedItem = null;
-            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().LastOrDefault());
+            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
+            RefreshInputs();
             InitialInputs();
         }
 
@@ -830,7 +791,9 @@ namespace Elwig.Windows {
                 );
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Lieferung aktualisieren", 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);
                 FinishButton.IsEnabled = true;
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
@@ -839,36 +802,48 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
-
+            await RefreshList();
-            Utils.RunBackground("Lieferschein drucken", async () => {
+            await RefreshDeliveryParts();
-                using var doc = await DeliveryNote.Initialize(p.Year, p.DId);
+            if (p?.Delivery != null) {
-                using (var ctx = new AppDbContext()) {
+                try {
-                    await doc.Generate(ctx);
+                    using var ctx = new AppDbContext();
+                    using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
+                    await doc.Generate();
+                    if (App.Config.Debug) {
+                        doc.Show();
+                    } else {
+                        await doc.Print(2);
+                    }
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
-                if (App.Config.Debug) {
+            }
-                    doc.Show();
-                } else {
-                    await doc.Print(2);
-                }
-            });
 
-            await EnsureContextRenewed();
             Mouse.OverrideCursor = null;
             DeliveryList.SelectedItem = null;
+            await RenewContext();
+            RefreshInputs();
             InitInputs();
         }
 
         private async void CancelCreatingButton_Click(object sender, RoutedEventArgs evt) {
             if (IsCreating && HasChanged) {
-                if (!InteractionService.AskConfirmation("Abbrechen bestätigen", "Soll der Vorgang wirklich abgebrochen werden?"))
+                var r = MessageBox.Show("Soll der Vorgang wirklich abgebrochen werden?", "Abbrechen bestätigen",
-                    return;
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) return;
             }
 
             using var ctx = new AppDbContext();
-            var attrList = await ctx.FetchWineAttributes().Cast<object>().ToListAsync();
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !ViewModel.IsReceipt, includeContactInfo: true).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !ViewModel.IsReceipt)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
             if (DeliveryList.SelectedItem is not Delivery d) {
                 // switch away from creating mode
                 IsCreating = false;
@@ -878,7 +853,7 @@ namespace Elwig.Windows {
                 DisableWeighingButtons();
                 HideFinishNewPartDeliveryCancelButtons();
                 ShowNewEditDeleteButtons();
-                await EnsureContextRenewed();
+                await RenewContext();
                 RefreshInputs();
                 ClearInputStates();
                 LockInputs();
@@ -900,11 +875,21 @@ namespace Elwig.Windows {
             ViewModel.FilterTodayOnly = true;
             ViewModel.SearchQuery = "";
             using var ctx = new AppDbContext();
-            var attrList = await ctx.FetchWineAttributes(false).Cast<object>().ToListAsync();
+            var attrList = await ctx.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(ModifiersInput, Modifiers.GetValueOrDefault(ViewModel.FilterSeason ?? 0, []).Where(m => m.IsActive).ToList());
+            ControlUtils.RenewItemsSource(ModifiersInput, await ctx.Modifiers
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !ViewModel.IsReceipt, includeContactInfo: true).ToListAsync());
+                .Where(m => m.Year == ViewModel.FilterSeason && m.IsActive)
+                .OrderBy(m => m.Ordering)
+                .Include(m => m.Season.Currency)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !ViewModel.IsReceipt)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
             IsCreating = true;
             DeliveryList.IsEnabled = false;
             DeliveryPartList.IsEnabled = false;
@@ -942,7 +927,9 @@ namespace Elwig.Windows {
                 }
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Lieferung aktualisieren", 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);
             }
             Mouse.OverrideCursor = null;
         }
@@ -989,13 +976,18 @@ namespace Elwig.Windows {
             if (DeliveryList.SelectedItem is not Delivery d)
                 return;
 
-            if (InteractionService.AskContinue("Lieferung löschen", $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?")) {
+            var r = MessageBox.Show(
+                $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
+                "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await DeliveryService.DeleteDelivery(d.LsNr);
                     App.HintContextChange();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Lieferung löschen", 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);
                 }
                 Mouse.OverrideCursor = null;
             }
@@ -1023,7 +1015,9 @@ namespace Elwig.Windows {
                 );
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Lieferung aktualisieren", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
@@ -1039,7 +1033,9 @@ namespace Elwig.Windows {
             LockInputs();
             UnlockSearchInputs();
             FinishInputFilling();
-            await EnsureContextRenewed();
+            await RefreshList();
+            await RefreshDeliveryParts();
+            RefreshInputs();
 
             Mouse.OverrideCursor = null;
             DepreciateButton.IsEnabled = true;
@@ -1139,9 +1135,6 @@ namespace Elwig.Windows {
             SeasonInput.IsEnabled = false;
             TodayOnlyInput.IsEnabled = false;
             AllSeasonsInput.IsEnabled = false;
-            Menu_BulkAction_SetAttribute.IsEnabled = false;
-            Menu_BulkAction_AddModifier.IsEnabled = false;
-            Menu_BulkAction_RemoveModifier.IsEnabled = false;
         }
 
         private void UnlockSearchInputs() {
@@ -1149,9 +1142,6 @@ namespace Elwig.Windows {
             SeasonInput.IsEnabled = true;
             TodayOnlyInput.IsEnabled = true;
             AllSeasonsInput.IsEnabled = (ViewModel.FilterMember != null);
-            Menu_BulkAction_SetAttribute.IsEnabled = true;
-            Menu_BulkAction_AddModifier.IsEnabled = true;
-            Menu_BulkAction_RemoveModifier.IsEnabled = true;
         }
 
         new protected void UnlockInputs() {
@@ -1201,7 +1191,7 @@ namespace Elwig.Windows {
         }
 
         private async Task UpdateLsNr() {
-            if (string.IsNullOrWhiteSpace(ViewModel.Date) || ViewModel.Branch == null) {
+            if (string.IsNullOrEmpty(ViewModel.Date) || ViewModel.Branch == null) {
                 ViewModel.LsNr = "";
             } else {
                 try {
@@ -1260,7 +1250,8 @@ namespace Elwig.Windows {
             UpdateWineQualityLevels();
             if (!ViewModel.WineVar?.IsQuw ?? false) {
                 App.MainDispatcher.BeginInvoke(() => {
-                    InteractionService.ShowWarning("Kein Qualitätswein", "Die eingegebene Sorte darf nicht als Qualitätswein\nübernommen werden!");
+                    MessageBox.Show("Die eingegebene Sorte darf nicht als Qualitätswein\nübernommen werden!", "Kein Qualitätswein",
+                        MessageBoxButton.OK, MessageBoxImage.Warning);
                 });
             }
         }

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -8,7 +8,8 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400">
+        Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryAncmtAdminViewModel/>
     </Window.DataContext>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -36,7 +36,11 @@ namespace Elwig.Windows {
             ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
             ViewModel.FilterOnlyUpcoming = true;
+            LockInputs();
         }
 
         private void Input_KeyUp(object sender, KeyEventArgs evt) {
@@ -81,6 +85,7 @@ namespace Elwig.Windows {
             using var ctx = new AppDbContext();
             var list = await ctx.DeliverySchedules
                 .Where(s => s.Year == ViewModel.FilterSeason)
+                .Include(s => s.Branch)
                 .OrderBy(s => s.DateString)
                 .ThenBy(s => s.Branch.Name)
                 .ThenBy(s => s.Description)
@@ -98,41 +103,36 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, deliveryAncmtQuery, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var deliveryAncmts = await deliveryAncmtQuery
-            var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterOnlyUpcoming, vm.FilterOnlyUpcoming);
+                .Include(a => a.Member.BillingAddress)
-            var (filter, deliveryAncmts, stat) = await Task.Run(async () => {
+                .Include(a => a.Schedule)
-                using var ctx = new AppDbContext();
+                .Include(a => a.Variety)
-                var (_, deliveryAncmtQuery, filter) = await vm.GetFilters(ctx);
+                .AsSplitQuery()
-                var deliveryAncmts = await deliveryAncmtQuery.ToListAsync();
+                .ToListAsync();
 
-                if (filter.Count > 0 && deliveryAncmts.Count > 0) {
+            if (filter.Count > 0 && deliveryAncmts.Count > 0) {
-                    var dict = deliveryAncmts.AsParallel()
+                var dict = deliveryAncmts.AsParallel()
-                        .ToDictionary(a => a, a => a.SearchScore(filter))
+                    .ToDictionary(a => a, a => a.SearchScore(filter))
-                        .OrderByDescending(a => a.Value)
+                    .OrderByDescending(a => a.Value)
-                        .ThenBy(a => a.Key.Schedule.DateString)
+                    .ThenBy(a => a.Key.Schedule.DateString)
-                        .ThenBy(a => a.Key.Member.Name)
+                    .ThenBy(a => a.Key.Member.Name)
-                        .ThenBy(a => a.Key.Member.GivenName)
+                    .ThenBy(a => a.Key.Member.GivenName)
-                        .ThenBy(a => a.Key.Member.MgNr);
+                    .ThenBy(a => a.Key.Member.MgNr);
-                    var threshold = dict.Max(a => a.Value) * 3 / 4;
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
-                    deliveryAncmts = [.. dict
+                deliveryAncmts = dict
-                        .Where(a => a.Value > threshold)
+                    .Where(a => a.Value > threshold)
-                        .Select(a => a.Key)];
+                    .Select(a => a.Key)
-                } else {
+                    .ToList();
-                    deliveryAncmts = [.. deliveryAncmts
+            } else {
-                        .OrderBy(a => a.Schedule.DateString)
+                deliveryAncmts = deliveryAncmts
-                        .ThenBy(a => a.Member.Name)
+                    .OrderBy(a => a.Schedule.DateString)
-                        .ThenBy(a => a.Member.GivenName)
+                    .ThenBy(a => a.Member.Name)
-                        .ThenBy(a => a.Member.MgNr)];
+                    .ThenBy(a => a.Member.GivenName)
-                }
+                    .ThenBy(a => a.Member.MgNr)
-
+                    .ToList();
-                var stat = await DeliveryAncmtService.GenerateToolTipData(deliveryAncmtQuery);
+            }
-
-                return (filter, deliveryAncmts, stat);
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            if (query != (ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterOnlyUpcoming, ViewModel.FilterOnlyUpcoming)) return;
 
             ControlUtils.RenewItemsSource(DeliveryAncmtList, deliveryAncmts,
                 DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
@@ -141,9 +141,9 @@ namespace Elwig.Windows {
 
             ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
             if (filter.Count == 0) {
-                var (text, data) = stat;
+                var (text, grid) = await DeliveryAncmtService.GenerateToolTip(deliveryAncmtQuery);
                 ViewModel.StatusWeight = text;
-                ViewModel.StatusWeightToolTip = DeliveryAncmtService.GenerateToolTip(data);
+                ViewModel.StatusWeightToolTip = grid;
             } else {
                 ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
                 ViewModel.StatusWeightToolTip = null;
@@ -177,8 +177,15 @@ namespace Elwig.Windows {
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
 
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !IsCreating).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
-            ControlUtils.RenewItemsSource(WineVarietyInput, await ctx.FetchWineVarieties().ToListAsync());
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(WineVarietyInput, await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync());
 
             await RefreshDeliveryScheduleList();
             await RefreshList();
@@ -189,7 +196,6 @@ namespace Elwig.Windows {
         }
 
         private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList();
             if (DeliveryScheduleList.SelectedItem is DeliverySchedule s) {
                 Menu_DeliveryAncmtList_SaveSelected.IsEnabled = !IsEditing && !IsCreating;
@@ -211,13 +217,11 @@ namespace Elwig.Windows {
         }
 
         private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshDeliveryScheduleList();
             await RefreshList(true);
         }
 
         private async void FromAllSchedulesInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             if (ViewModel.FilterFromAllSchedules) {
                 DeliveryScheduleList.SelectedItem = null;
             } else if (DeliveryScheduleList.SelectedItem == null) {
@@ -227,12 +231,11 @@ namespace Elwig.Windows {
         }
 
         private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList(true);
         }
 
         private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded || ViewModel.FilterSeason == null) return;
+            if (ViewModel.FilterSeason == null) return;
             ViewModel.FilterOnlyUpcoming = false;
             await RefreshDeliveryScheduleList();
             await RefreshList();
@@ -271,7 +274,14 @@ namespace Elwig.Windows {
             ViewModel.SelectedDeliveryAncmt = null;
 
             using var ctx = new AppDbContext();
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !IsCreating).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
 
             HideNewEditDeleteButtons();
             ShowSaveResetCancelButtons();
@@ -309,7 +319,10 @@ namespace Elwig.Windows {
         private async void DeleteDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
             if (ViewModel.SelectedDeliveryAncmt is not DeliveryAncmt a)
                 return;
-            if (InteractionService.AskContinue("Anmeldung löschen", "Soll die Anmeldung wirklich unwiderruflich gelöscht werden?")) {
+            var r = MessageBox.Show(
+                $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
+                "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await Task.Run(async () => {
@@ -319,7 +332,9 @@ namespace Elwig.Windows {
                     });
                     App.HintContextChange();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Anmeldung löschen", 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, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 Mouse.OverrideCursor = null;
             }
@@ -342,7 +357,9 @@ namespace Elwig.Windows {
                 (year, dsnr, mgnr, sortid) = await ViewModel.UpdateDeliveryAncmt(s?.Year, s?.DsNr, s?.MgNr, s?.SortId, s?.Type);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Anmeldung aktualisieren", 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, "Anmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 return;
             } finally {
@@ -357,7 +374,8 @@ namespace Elwig.Windows {
             LockInputs();
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
-            await EnsureContextRenewed();
+            await RefreshList();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
             ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
             if (sortid != null)
@@ -386,7 +404,14 @@ namespace Elwig.Windows {
             DeliveryAncmtList.IsEnabled = true;
 
             using var ctx = new AppDbContext();
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: !IsCreating).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive || !IsCreating)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
 
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();

Elwig/Windows/DeliveryScheduleAdminWindow.xaml

@@ -7,7 +7,8 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Leseplanung - Elwig" Height="600" Width="850" MinHeight="450" MinWidth="800">
+        Title="Leseplanung - Elwig" Height="600" Width="850" MinHeight="450" MinWidth="800"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryScheduleAdminViewModel/>
     </Window.DataContext>

Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs

@@ -30,43 +30,41 @@ namespace Elwig.Windows {
             ControlUtils.InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
             ViewModel.FilterSeason = Utils.CurrentLastSeason;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
             ViewModel.FilterOnlyUpcoming = true;
+            LockInputs();
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, deliveryScheduleQuery, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var deliverySchedules = await deliveryScheduleQuery
-            var query = (vm.SearchQuery, vm.FilterSeason, vm.FilterOnlyUpcoming);
+                .Include(s => s.Varieties)
-            var deliverySchedules = await Task.Run(async () => {
+                .Include(s => s.Branch)
-                using var ctx = new AppDbContext();
+                .AsSplitQuery()
-                var (_, deliveryScheduleQuery, filter) = await vm.GetFilters(ctx);
+                .ToListAsync();
-                var deliverySchedules = await deliveryScheduleQuery
-                    .Include(s => s.Varieties)
-                    .ToListAsync();
 
-                if (filter.Count > 0 && deliverySchedules.Count > 0) {
+            if (filter.Count > 0 && deliverySchedules.Count > 0) {
-                    var dict = deliverySchedules.AsParallel()
+                var dict = deliverySchedules.AsParallel()
-                        .ToDictionary(s => s, s => s.SearchScore(filter))
+                    .ToDictionary(s => s, s => s.SearchScore(filter))
-                        .OrderByDescending(a => a.Value)
+                    .OrderByDescending(a => a.Value)
-                        .ThenBy(a => a.Key.DateString)
+                    .ThenBy(a => a.Key.DateString)
-                        .ThenBy(a => a.Key.Branch.Name)
+                    .ThenBy(a => a.Key.Branch.Name)
-                        .ThenBy(a => a.Key.Description);
+                    .ThenBy(a => a.Key.Description);
-                    var threshold = dict.Max(a => a.Value) * 3 / 4;
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
-                    deliverySchedules = [.. dict
+                deliverySchedules = dict
-                        .Where(a => a.Value > threshold)
+                    .Where(a => a.Value > threshold)
-                        .Select(a => a.Key)];
+                    .Select(a => a.Key)
-                } else {
+                    .ToList();
-                    deliverySchedules = [.. deliverySchedules
+            } else {
-                        .OrderBy(s => s.DateString)
+                deliverySchedules = deliverySchedules
-                        .ThenBy(s => s.Branch.Name)
+                    .OrderBy(s => s.DateString)
-                        .ThenBy(s => s.Description)];
+                    .ThenBy(s => s.Branch.Name)
-                }
+                    .ThenBy(s => s.Description)
-
+                    .ToList();
-                return deliverySchedules;
+            }
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            if (query != ((ViewModel.SearchQuery, ViewModel.FilterSeason, ViewModel.FilterOnlyUpcoming))) return;
 
             ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules,
                 DeliveryScheduleList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
@@ -101,14 +99,14 @@ namespace Elwig.Windows {
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
 
-            ControlUtils.RenewItemsSource(BranchInput, await ctx.FetchBranches().ToListAsync());
+            ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
-            var varieties = await ctx.FetchWineVarieties().ToListAsync();
+            var varieties = await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync();
             ControlUtils.RenewItemsSource(MainWineVarietiesInput, varieties);
             ControlUtils.RenewItemsSource(OtherWineVarietiesInput, varieties);
-            var attrList = await ctx.FetchWineAttributes().Cast<object>().ToListAsync();
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem("- Keine Angabe -"));
             ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
-            var cultList = await ctx.FetchWineCultivations().Cast<object>().ToListAsync();
+            var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem("- Kein Angabe -"));
             ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
 
@@ -120,17 +118,15 @@ namespace Elwig.Windows {
         }
 
         private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList();
         }
 
         private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList(true);
         }
 
         private async void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (!HasContextLoaded || ViewModel.FilterSeason == null) return;
+            if (ViewModel.FilterSeason == null) return;
             ViewModel.FilterOnlyUpcoming = false;
             await RefreshList();
         }
@@ -177,7 +173,10 @@ namespace Elwig.Windows {
         private async void DeleteDeliveryScheduleButton_Click(object? sender, RoutedEventArgs? evt) {
             if (ViewModel.SelectedDeliverySchedule is not DeliverySchedule s)
                 return;
-            if (InteractionService.AskContinue("Leseplan löschen", $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?")) {
+            var r = MessageBox.Show(
+                $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?",
+                "Leseplan löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 try {
                     await Task.Run(async () => {
@@ -187,7 +186,9 @@ namespace Elwig.Windows {
                     });
                     App.HintContextChange();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Leseplan löschen", 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, "Leseplan löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 Mouse.OverrideCursor = null;
             }
@@ -207,7 +208,9 @@ namespace Elwig.Windows {
                 await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Leseplan aktualisieren", 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, "Leseplan aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 return;
             } finally {
@@ -222,7 +225,8 @@ namespace Elwig.Windows {
             LockInputs();
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
-            await EnsureContextRenewed();
+            await RefreshList();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
         }
 

Elwig/Windows/MailWindow.xaml.cs

@@ -3,7 +3,6 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using MailKit.Net.Smtp;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Win32;
@@ -108,7 +107,7 @@ namespace Elwig.Windows {
         public MailWindow(int? year = null) {
             InitializeComponent();
             using (var ctx = new AppDbContext()) {
-                Year = year ?? ctx.Seasons.OrderByDescending(s => s.Year).FirstOrDefault()?.Year ?? Utils.Today.Year;
+                Year = year ?? ctx.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year ?? Utils.Today.Year;
                 Title = $"Rundschreiben - Lese {Year} - Elwig";
             }
 
@@ -156,7 +155,7 @@ namespace Elwig.Windows {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var season = await ctx.Seasons.Include(s => s.PaymentVariants).Where(s => s.Year == Year).SingleOrDefaultAsync();
+            var season = await ctx.Seasons.FindAsync(Year);
             var l = new List<string> {
                 MemberDataSheet.Name
             };
@@ -166,7 +165,10 @@ namespace Elwig.Windows {
             }
             AvaiableDocumentsList.ItemsSource = l;
 
-            ControlUtils.RenewItemsSource(MemberBranchInput, await ctx.FetchBranches(includeWithoutMembers: false).ToListAsync(), MemberInput_SelectionChanged);
+            ControlUtils.RenewItemsSource(MemberBranchInput, await ctx.Branches
+                .Where(b => b.Members.Count != 0)
+                .OrderBy(b => b.Name)
+                .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberBranchInput.SelectedItems.Count == 0) {
                 MemberBranchInput.SelectionChanged -= MemberInput_SelectionChanged;
                 MemberBranchInput.SelectAll();
@@ -205,8 +207,13 @@ namespace Elwig.Windows {
                 .OrderBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
                 .Include(m => m.Branch)
+                .Include(m => m.DefaultWbKg!.AtKg)
                 .Include(m => m.EmailAddresses)
                 .Include(m => m.TelephoneNumbers)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.PostalDest.AtPlz!.Country)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
                 .ToListAsync(), MemberInput_SelectionChanged);
             if (MemberCustomInput.SelectedItems.Count == 0) {
                 MemberCustomInput.SelectionChanged -= MemberInput_SelectionChanged;
@@ -366,7 +373,7 @@ namespace Elwig.Windows {
                 RecipientsDeliveryMembersInput.IsChecked = true;
             } else if (idx >= 2) {
                 var name = s.Split(" – ")[^1];
-                var pv = await ctx.PaymentVariants.Where(v => v.Year == Year && v.Name == name).SingleAsync();
+                var pv = await ctx.PaymentVariants.SingleAsync(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
                 RecipientsCreditMembersInput.IsChecked = true;
             }
@@ -485,8 +492,13 @@ namespace Elwig.Windows {
                 }
                 Recipients = await query
                     .Include(m => m.Branch)
+                    .Include(m => m.DefaultWbKg!.AtKg)
                     .Include(m => m.EmailAddresses)
                     .Include(m => m.TelephoneNumbers)
+                    .Include(m => m.PostalDest.AtPlz!.Ort)
+                    .Include(m => m.PostalDest.AtPlz!.Country)
+                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
+                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
                     .ToListAsync();
             }
             UpdatePostalEmailRecipients();
@@ -603,16 +615,12 @@ namespace Elwig.Windows {
         }
 
         private void DisposeDocs() {
-            try {
+            PrintDocument?.Dispose();
-                PrintDocument?.Dispose();
+            PrintDocument = null;
-                PrintDocument = null;
-            } catch { }
             if (EmailDocuments != null) {
                 foreach (var (m, docs) in EmailDocuments) {
                     foreach (var d in docs) {
-                        try {
+                        d.Dispose();
-                            d.Dispose();
-                        } catch { }
                     }
                 }
                 EmailDocuments = null;
@@ -691,7 +699,7 @@ namespace Elwig.Windows {
                 PrintButton.IsEnabled = PrintDocument != null && !hasPreviewDocs;
                 EmailButton.IsEnabled = EmailDocuments != null && !hasPreviewDocs && App.Config.Smtp != null;
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.ToString(), "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             } finally {
                 UnlockInputs();
                 GenerateButton.IsEnabled = true;
@@ -713,7 +721,7 @@ namespace Elwig.Windows {
             foreach (var doc in docs) {
                 if (doc.Type == DocType.DeliveryConfirmation) {
                     var year = (int)doc.Details!;
-                    var b = await Billing.Create(year);
+                    var b = new Billing(year);
                     await b.FinishSeason();
                     await b.CalculateBuckets();
                     App.HintContextChange();
@@ -743,13 +751,10 @@ namespace Elwig.Windows {
                 Member = m,
                 Docs = docs.SelectMany<SelectedDoc, GeneratedDoc>(doc => {
                     try {
-                        App.MainDispatcher.Invoke(() => {
-                            ProgressBar.Value = offset + 100.0 * i / 2 / totalNum;
-                        });
                         if (doc.Type == DocType.Custom) {
                             return [new GeneratedDoc((string)doc.Details!)];
                         } else if (doc.Type == DocType.MemberDataSheet) {
-                            return [new GeneratedDoc(new MemberDataSheet(m) { Date = postalDate })];
+                            return [new GeneratedDoc(new MemberDataSheet(m, ctx) { Date = postalDate })];
                         } else if (doc.Type == DocType.DeliveryConfirmation) {
                             var year = (int)doc.Details!;
                             DeliveryConfirmationDeliveryData data;
@@ -760,14 +765,21 @@ namespace Elwig.Windows {
                             } else {
                                 return [];
                             }
-                            return [new GeneratedDoc(new DeliveryConfirmation(year, m, postalDate, data) { Date = postalDate })];
+                            return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data) { Date = postalDate })];
                         } else if (doc.Type == DocType.CreditNote) {
                             var details = ((int, int))doc.Details!;
                             var year = details.Item1;
                             var avnr = details.Item2;
                             var data = cnData[(year, avnr)];
                             try {
-                                return [new GeneratedDoc(new CreditNote(data.Item2[m.MgNr], postalDate, data.Item3, data.Item1[m.MgNr]) { Date = postalDate })];
+                                return [new GeneratedDoc(new CreditNote(
+                                    ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
+                                    data.Item3.ConsiderContractPenalties,
+                                    data.Item3.ConsiderTotalPenalty,
+                                    data.Item3.ConsiderAutoBusinessShares,
+                                    data.Item3.ConsiderCustomModifiers,
+                                    ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
+                                ) { Date = postalDate })];
                             } catch (Exception) {
                                 return [];
                             }
@@ -775,7 +787,7 @@ namespace Elwig.Windows {
                             throw new NotImplementedException("Invalid DocType");
                         }
                     } catch (Exception exc) {
-                        InteractionService.ShowException(exc);
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         return [];
                     } finally {
                         App.MainDispatcher.Invoke(() => {
@@ -788,9 +800,9 @@ namespace Elwig.Windows {
 
             var hasPreviewDocs = memberDocs.Any(m => m.Docs.Any(d => d.Doc.IsPreview));
             if (hasPreviewDocs) {
-                if (!InteractionService.AskContinue("Vorläufige Dokumente",
+                var res = MessageBox.Show("Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\nDies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen oder daran, dass nicht alle Adressaten/Empfänger eine Traubengutschrift erhalten\n(\"Empfänger von Gutschriften\").\n\nSoll mit dem Generieren fortgefahren werden?",
-                    "Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\n" +
+                    "Vorläufige Dokumente", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    "Dies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen oder daran, dass nicht alle Adressaten/Empfänger eine Traubengutschrift erhalten\n(\"Empfänger von Gutschriften\").\n\nSoll mit dem Generieren fortgefahren werden?")) {
+                if (res != MessageBoxResult.OK) {
                     throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                 }
             }
@@ -811,7 +823,7 @@ namespace Elwig.Windows {
             var emailRecipients = email.Select(d => d.Key.MgNr).ToHashSet();
             foreach (var item1 in email.Select((e, i) => new { Index = i, e.Key, e.Value })) {
                 foreach (var item2 in item1.Value.Select((d, i) => new { Index = i, Doc = d })) {
-                    await item2.Doc.Generate(ctx, CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                    await item2.Doc.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
                         ProgressBar.Value = offset + v * (item2.Index + 1) / item1.Value.Count / totalNum + 100.0 * item1.Index / totalNum;
                     })));
                 }
@@ -845,7 +857,7 @@ namespace Elwig.Windows {
 
             if (printDocs.Count > 0) {
                 var print = Document.Merge(printDocs);
-                await print.Generate(ctx, CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                await print.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
                     ProgressBar.Value = offset + v * printNum / totalNum;
                 })));
                 PrintDocument = print;
@@ -893,7 +905,9 @@ namespace Elwig.Windows {
             GenerateButton.IsEnabled = false;
             LockInputs();
 
-            if (InteractionService.AskQuestion("Rundschreiben drucken", $"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?", false)) {
+            var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?",
+                "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
+            if (res == MessageBoxResult.Yes) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 await Task.Run(async () => {
                     if (App.Config.Debug) {
@@ -931,8 +945,11 @@ namespace Elwig.Windows {
                 client = await Task.Run(Utils.GetSmtpClient);
                 Mouse.OverrideCursor = null;
 
-                if (!InteractionService.AskQuestion("Rundschreiben verschicken", $"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?", false))
+                var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
+                    "Rundschreiben verschicken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
+                if (res != MessageBoxResult.Yes) {
                     return;
+                }
 
                 Mouse.OverrideCursor = Cursors.Wait;
                 var subject = EmailSubjectInput.Text;
@@ -961,9 +978,10 @@ namespace Elwig.Windows {
                     }
                 });
 
-                InteractionService.ShowInformation("Rundschreiben verschicken", "Erfolgreich alle E-Mails verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mails in den Posteingängen der Empfänger aufscheinen.");
+                MessageBox.Show("Erfolgreich alle E-Mails verschickt!\n\nEs kann einige Minuten dauern, bis die E-Mails in den Posteingängen der Empfänger aufscheinen.", "Rundschreiben verschicken",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             } finally {
                 if (client != null)
                     await client.DisconnectAsync(true);
@@ -992,7 +1010,7 @@ namespace Elwig.Windows {
                 return;
             var name = s.Split(" – ")[^1];
             using var ctx = new AppDbContext();
-            var pv = ctx.PaymentVariants.Where(v => v.Year == Year && v.Name == name).Single();
+            var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
             SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
             RecipientsCreditMembersInput.IsChecked = true;

Elwig/Windows/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         Title="Elwig" Height="390" Width="520" ResizeMode="CanMinimize"
-        Closing="Window_Closing">
+        Loaded="Window_Loaded" Closing="Window_Closing">
     <Window.Resources>
         <Style TargetType="Button">
             <Setter Property="VerticalAlignment" Value="Top"/>

Elwig/Windows/MainWindow.xaml.cs

@@ -37,11 +37,11 @@ namespace Elwig.Windows {
             SyncButton.Visibility = App.Config.SyncUrl != null ? Visibility.Visible : Visibility.Hidden;
             Menu_Database_Upload.IsEnabled = App.Config.SyncUrl != null;
             Menu_Database_Download.IsEnabled = App.Config.SyncUrl != null;
-            SeasonInput.Value = Utils.CurrentLastSeason;
         }
 
-        protected override async Task OnInit(AppDbContext ctx) {
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
-            await base.OnInit(ctx);
+            SeasonInput.Value = Utils.CurrentLastSeason;
+
             if (Utils.HasInternetConnectivity()) {
                 CheckSync(200);
             }
@@ -59,7 +59,9 @@ namespace Elwig.Windows {
                 }
                 Thread.Sleep(100);
                 if (App.NumWindows > 1 && !App.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
-                    if (!InteractionService.AskConfirmation("Elwig beenden", "Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?")) {
+                    var res = MessageBox.Show("Es sind noch weitere Fenster geöffnet.\nSollen alle Fenster geschlossen werden?",
+                        "Elwig beenden", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                    if (res != MessageBoxResult.Yes) {
                         evt.Cancel = true;
                     } else {
                         Application.Current.Shutdown();
@@ -82,9 +84,9 @@ namespace Elwig.Windows {
             try {
                 using var client = await Utils.GetSmtpClient();
                 await client!.DisconnectAsync(true);
-                InteractionService.ShowInformation("Erfolg", "E -Mail-Einstellungen erfolgreich überprüft!");
+                MessageBox.Show("E-Mail-Einstellungen erfolgreich überprüft!", "Erfolg", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -113,17 +115,17 @@ namespace Elwig.Windows {
 
         private async void Menu_Scale_SetDateTime_Click(object sender, RoutedEventArgs evt) {
             if (App.CommandScales.Count == 0) {
-                InteractionService.ShowError("Datum und Uhrzeit setzen", "Es sind keine geeigneten Waagen verfügbar!");
+                MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
             foreach (var s in App.CommandScales) {
                 try {
                     await s.SetDateAndTime(DateTime.Now);
                 } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
-            InteractionService.ShowInformation("Datum und Uhrzeit setzen", "Datum und Uhrzeit auf entsprechenden Waagen gesetzt!");
+            MessageBox.Show("Datum und Uhrzeit auf entsprechenden Waagen gesetzt!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Information);
         }
 
         private void Menu_Database_Query_Click(object sender, RoutedEventArgs evt) {
@@ -155,23 +157,29 @@ namespace Elwig.Windows {
                     });
                 }
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
 
         private async void Menu_Database_Backup_Click(object sender, RoutedEventArgs evt) {
             try {
-                var filename = InteractionService.SaveFile("Datenbank-Sicherung", $"database_{Utils.Today:yyyy-MM-dd}", "sql.zip");
+                var d = new SaveFileDialog() {
-                if (filename != null) {
+                    Title = "Datenbank sichern - Elwig",
-                    if (!filename.EndsWith(".sql.zip")) filename += ".sql.zip";
+                    FileName = $"database_{Utils.Today:yyyy-MM-dd}.sql.zip",
+                    DefaultExt = "sql.zip",
+                    Filter = "Komprimierte SQL-Datei (*.sql.zip)|*.sql.zip",
+                    AddExtension = false,
+                };
+                if (d.ShowDialog() == true) {
+                    if (!d.FileName.EndsWith(".sql.zip")) d.FileName += ".sql.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
                     await Task.Run(async () => {
-                        await Database.ExportSql(filename, true);
+                        await Database.ExportSql(d.FileName, true);
                     });
                 }
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -184,13 +192,16 @@ namespace Elwig.Windows {
                     Filter = "SQLite-Datenbank (*.sqlite3, *.sqlite3.zip, *.sql, *.sql.zip)|*.sqlite3;*.sqlite3.zip;*.sql;*.sql.zip",
                 };
                 if (d.ShowDialog() == true) {
-                    if (!InteractionService.AskContinue("Datenbank wiederherstellen", "Soll die Datenbank wirklich unwiederruflich durch die wiederhergestellte Version ersetzt werden?"))
+                    var res = MessageBox.Show("Soll die Datenbank wirklich unwiederruflich durch die wiederhergestellte Version ersetzt werden?", "Datenbank wiederherstellen",
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                    if (res != MessageBoxResult.OK)
                         return;
+
                     Mouse.OverrideCursor = Cursors.Wait;
                     await App.ReplaceDatabase(d.FileName);
                 }
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -255,15 +266,15 @@ namespace Elwig.Windows {
                         .ToList();
 
                     if (files.Count == 0) {
-                        InteractionService.ShowError("Datenbank herunterladen", "Die Datenbank wurde noch nicht vom Hauptgerät hochgeladen!");
+                        MessageBox.Show("Die Datenbank wurde noch nicht vom Hauptgerät hochgeladen!", "Datenbank herunterladen",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
                         return;
                     }
                     var file = files[0];
 
-                    if (!InteractionService.AskContinue("Datenbank herunterladen",
+                    var res = MessageBox.Show($"Es wurde eine komprimierte Datenbank (ca. {file.Size / 1024 / 1024} MB) vom {file.Timestamp:dd.MM.yyyy, HH:mm} gefunden.\n\nWollen Sie wirklich die aktuelle Datenbank unwiederruflich\nlöschen und durch die gefundene ersetzen?\n\nDas kann zu Datenverlust führen!", "Datenbank herunterladen",
-                        $"Es wurde eine komprimierte Datenbank (ca. {file.Size / 1024 / 1024} MB) vom {file.Timestamp:dd.MM.yyyy, HH:mm} gefunden.\n\n" +
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                        $"Wollen Sie wirklich die aktuelle Datenbank unwiederruflich\nlöschen und durch die gefundene ersetzen?\n\n" +
+                    if (res != MessageBoxResult.OK)
-                        $"Das kann zu Datenverlust führen!"))
                         return;
 
                     var filename = Path.Combine(App.TempPath, file.Name);
@@ -272,21 +283,20 @@ namespace Elwig.Windows {
                         await client.DownloadAsync(file.Url, stream);
                     }
 
-                    if (!InteractionService.AskContinue("Datenbank herunterladen",
+                    res = MessageBox.Show("Die Datenbank wurde erfolgreich heruntergeladen!\n\nSoll die Datenbank wirklich unwiederruflich ersetzt werden?\n\nWenn Sie unsicher sind sprechen Sie sich mit dem Benutzer des Hauptgerätes ab!", "Datenbank herunterladen",
-                        "Die Datenbank wurde erfolgreich heruntergeladen!\n\n" +
+                        MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                        "Soll die Datenbank wirklich unwiederruflich ersetzt werden?\n\n" +
+                    if (res != MessageBoxResult.OK)
-                        "Wenn Sie unsicher sind sprechen Sie sich mit dem Benutzer des Hauptgerätes ab!"))
                         return;
 
                     await App.MainDispatcher.BeginInvoke(async () => {
                         await App.ReplaceDatabase(filename);
                     });
                 } catch (HttpRequestException exc) {
-                    InteractionService.ShowException("Datenbank herunterladen", "Eventuell Internetverbindung prüfen!", exc);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (TaskCanceledException exc) {
-                    InteractionService.ShowException("Datenbank herunterladen", "Eventuell Internetverbindung prüfen!", exc);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (Exception exc) {
-                    InteractionService.ShowException("Datenbank herunterladen", exc);
+                    MessageBox.Show(exc.Message, "Datenbank herunterladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -296,7 +306,9 @@ namespace Elwig.Windows {
             if (App.Config.SyncUrl == null)
                 return;
 
-            if (!InteractionService.AskContinue("Datenbank hochladen", "Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!"))
+            var res = MessageBox.Show("Sind Sie wirklich sicher, dass Sie die Datenbank dieses\nGerätes hochladen möchten? Das sollte nur vom Hauptgerät aus passieren!", "Datenbank hochladen",
+                MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (res != MessageBoxResult.OK)
                 return;
 
             Mouse.OverrideCursor = Cursors.Wait;
@@ -305,13 +317,14 @@ namespace Elwig.Windows {
                     var path = Path.Combine(App.TempPath, "database.sql.zip");
                     await Database.ExportSql(path, true);
                     await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    InteractionService.ShowInformation("Datenbank hochladen", $"Hochladen der gesamten Datenbank erfolgreich!");
+                    MessageBox.Show($"Hochladen der gesamten Datenbank erfolgreich!", "Datenbank hochladen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 } catch (HttpRequestException exc) {
-                    InteractionService.ShowException("Datenbank hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (TaskCanceledException exc) {
-                    InteractionService.ShowException("Datenbank hochladen", "Eventuell Internetverbindung prüfen!", exc);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 } catch (Exception exc) {
-                    InteractionService.ShowException("Datenbank hochladen", exc);
+                    MessageBox.Show(exc.Message, "Datenbank hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -392,7 +405,7 @@ namespace Elwig.Windows {
         private async void SeasonInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             using var ctx = new AppDbContext();
             var year = SeasonInput.Value;
-            var s0 = await ctx.FetchSeasons(year).SingleOrDefaultAsync();
+            var s0 = await ctx.Seasons.FindAsync(year);
             var valid = (s0 != null);
             DeliveryConfirmationButton.IsEnabled = valid;
             PaymentButton.IsEnabled = valid;
@@ -444,14 +457,19 @@ namespace Elwig.Windows {
         private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            var filename = InteractionService.SaveFile($"Über-/Unterlieferungen {year}", $"Über-Unterlieferungen-{year}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename == null)
+                FileName = $"Über-Unterlieferungen-{year}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Über-/Unterlieferungen {year} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
                 return;
 
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 try {
-                    var b = await Billing.Create(year);
+                    var b = new Billing(year);
                     await b.FinishSeason();
                     await b.CalculateBuckets();
                     App.HintContextChange();
@@ -459,16 +477,11 @@ namespace Elwig.Windows {
                     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(filename);
+                    using var ods = new OdsFile(d.FileName);
-                    if (App.Client.HasRedWhite) {
+                    await ods.AddTable(tbl1);
-                        await ods.AddTable(tbl1.Red);
-                        await ods.AddTable(tbl1.White);
-                    } else {
-                        await ods.AddTable(tbl1.Total);
-                    }
                     await ods.AddTable(tbl2);
                 } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -477,28 +490,33 @@ namespace Elwig.Windows {
         private async void BreakdownButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            var filename = InteractionService.SaveFile($"Sorten-/Qualitätsaufschlüsselung {year}", $"Aufschlüsselung-{year}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename == null)
+                FileName = $"Aufschlüsselung-{year}.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Sorten-/Qualitätsaufschlüsselung {year} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
                 return;
 
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 try {
-                    var b = await Billing.Create(year);
+                    var b = new Billing(year);
                     await b.FinishSeason();
                     await b.CalculateBuckets();
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
-                    using var ods = new OdsFile(filename);
+                    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.FetchBranches().ToListAsync()) {
+                    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) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -507,24 +525,29 @@ namespace Elwig.Windows {
         private async void AreaCommitmentsButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            var filename = InteractionService.SaveFile($"Flächenbindungen {year}", $"Flächenbindungen-{year}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename == null)
+                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 = await Billing.Create(year);
+                    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(filename);
+                    using var ods = new OdsFile(d.FileName);
                     await ods.AddTable(tbl);
                 } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;
@@ -533,24 +556,29 @@ namespace Elwig.Windows {
         private async void BreakdownMemberVarietyButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            var filename = InteractionService.SaveFile($"Liefermengen/Ertrag {year}", $"Liefermengen-Ertrag-{year}", "ods");
+            var d = new SaveFileDialog() {
-            if (filename == null)
+                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 = await Billing.Create(year);
+                    var b = new Billing(year);
                     await b.FinishSeason();
                     await b.CalculateBuckets();
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
                     var tbl = await MemberDeliveryYieldsPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
-                    using var ods = new OdsFile(filename);
+                    using var ods = new OdsFile(d.FileName);
                     await ods.AddTable(tbl);
                 } catch (Exception exc) {
-                    InteractionService.ShowException(exc);
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             });
             Mouse.OverrideCursor = null;

Elwig/Windows/MemberAdminWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150">
+        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:MemberAdminViewModel/>
     </Window.DataContext>
@@ -233,7 +234,7 @@
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Nachname" Binding="{Binding Name}" Width="140"/>
                     <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
-                    <DataGridTextColumn Header="GA" Binding="{Binding SharesActive, StringFormat='{}{0} '}" Width="40">
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -619,26 +620,15 @@
                              Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                    <TextBox x:Name="BusinessSharesInput" Text="{Binding BusinessSharesString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,70,10,0" Width="63" Grid.Column="1" HorizontalAlignment="Left"
+                             Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="TextBox_TextChanged"/>
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                    <Label Content="Geschäftsanteile:" Margin="10,95,0,0" Grid.Column="0"/>
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
-                    <Label x:Name="BusinessSharesLabel" Content="(rot/weiß/ruhend)" Margin="10,108,0,0" Grid.Column="0" FontSize="10"/>
+                    <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    <TextBox x:Name="BusinessShares1Input" Text="{Binding BusinessShares1String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,100,10,0" Grid.Column="1"
-                             Margin="0,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="TextBox_TextChanged"/>
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares2Input" Text="{Binding BusinessShares2String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="37,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares3Input" Text="{Binding BusinessShares3String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="74,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <Button x:Name="BusinessSharesButton" FontFamily="Segoe MDL2 Assets" Content="&#xEB05;" FontSize="16" Padding="0.5,0,0,0" IsEnabled="{Binding IsMemberSelected}"
-                            Margin="111,100,10,0" Width="25" Height="25" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" VerticalAlignment="Top"
-                            ToolTip="Geschäftsanteile bearbeiten"
-                            Click="BusinessSharesButton_Click"/>
 
                     <CheckBox x:Name="ActiveInput" Content="Aktiv" IsChecked="{Binding IsActive, Mode=TwoWay}" IsEnabled="False"
                               Checked="ActiveInput_Changed" Unchecked="ActiveInput_Changed"
@@ -667,7 +657,7 @@
 
                     <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
                     <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2" FontSize="12"
+                             Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="TextBox_TextChanged"
                              VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
@@ -723,7 +713,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="150"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="200"/>
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="Auto"/>
@@ -740,7 +730,11 @@
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
-            <StatusBarItem Grid.Column="2" Content="{Binding StatusBusinessShares}"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock ToolTip="{Binding StatusBusinessSharesToolTip}">
+                    Geschäftsanteile: <Run Text="{Binding StatusBusinessShares}"/>
+                </TextBlock>
+            </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4">
                 <TextBlock ToolTip="{Binding StatusAreaCommitmentToolTip}">

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -1,21 +1,18 @@
-using Elwig.Dialogs;
-using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using Elwig.Services;
-using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Threading.Tasks;
+using Elwig.Documents;
+using System.Diagnostics;
+using Elwig.Dialogs;
+using Elwig.Services;
+using Elwig.ViewModels;
+using System.Windows.Data;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -40,20 +37,13 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlO, Menu_List_ShowActive_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_MemberDataSheet_Print_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftO, Menu_List_PrintActive_Click));
-            List<Control> exempt = [
+            ExemptInputs = [
                 SearchInput, ActiveMemberInput, MemberList,
             ];
-            if (App.Client.EnableMemberHistory) {
-                exempt.AddRange([BusinessShares1Input, BusinessShares2Input, BusinessShares3Input]);
-                BusinessShares1Input.IsReadOnly = true;
-                BusinessShares2Input.IsReadOnly = true;
-                BusinessShares3Input.IsReadOnly = true;
-            }
-            ExemptInputs = [.. exempt];
             RequiredInputs = [
                 MgNrInput, GivenNameInput, NameInput,
                 AddressInput, PlzInput, OrtInput, BillingOrtInput,
-                BusinessShares1Input, BusinessShares2Input, BusinessShares3Input, BranchInput, DefaultKgInput
+                BusinessSharesInput, BranchInput, DefaultKgInput
             ];
             EmailAddressInputs = [
                 (EmailAddress1Label, EmailAddress1Input),
@@ -92,32 +82,12 @@ namespace Elwig.Windows {
 
             Menu_Export_UploadFilters.IsEnabled = App.Config.SyncUrl != null;
             Menu_Export_UploadAll.IsEnabled = App.Config.SyncUrl != null;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
             ViewModel.ShowOnlyActiveMembers = true;
-
-            if (App.Client.HasRedWhite) {
-                BusinessSharesLabel.Content = "(rot/weiß/ruhend)";
-                //BusinessShares1Input.Background = Brushes.MistyRose;
-                BusinessShares1Input.Foreground = Brushes.DarkRed;
-                BusinessShares1Input.ToolTip = "Geschäftsanteile (rot)";
-                //BusinessShares2Input.Background = Brushes.MintCream;
-                BusinessShares2Input.Foreground = Brushes.DarkGreen;
-                BusinessShares2Input.ToolTip = "Geschäftsanteile (weiß)";
-                BusinessShares3Input.Background = Brushes.WhiteSmoke;
-                BusinessShares3Input.ToolTip = "Geschäftsanteile (ruhend)";
-            } else {
-                BusinessSharesLabel.Content = "(normal/ruhend)";
-                BusinessShares1Input.ToolTip = "Geschäftsanteile (normal)";
-                BusinessShares2Input.Background = Brushes.WhiteSmoke;
-                BusinessShares2Input.ToolTip = "Geschäftsanteile (ruhend)";
-                BusinessShares3Input.Visibility = Visibility.Hidden;
-                BusinessSharesButton.Margin = new(74, 100, 10, 0);
-            }
-
-            if (!App.Client.EnableMemberHistory) {
-                BusinessSharesButton.Visibility = Visibility.Hidden;
-            }
-
             UpdateContactInfoVisibility();
+            LockInputs();
         }
 
         public void FocusMember(int mgnr) {
@@ -143,88 +113,46 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, memberQuery, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var members = await memberQuery
-            var query = (vm.SearchQuery, vm.ShowOnlyActiveMembers);
+                .Include(m => m.Branch)
-            var (members, stat) = await Task.Run(async () => {
+                .Include(m => m.DefaultWbKg!.AtKg)
-                using var ctx = new AppDbContext();
+                .Include(m => m.EmailAddresses)
-                var (_, memberQuery, filter) = await vm.GetFilters(ctx);
+                .Include(m => m.TelephoneNumbers)
-                var members = await memberQuery
+                .Include(m => m.PostalDest.AtPlz!.Ort)
-                    .Include(m => m.EmailAddresses)
+                .Include(m => m.PostalDest.AtPlz!.Country)
-                    .Include(m => m.TelephoneNumbers)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
-                    .AsSplitQuery()
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
-                    .ToListAsync();
+                .ToListAsync();
 
-                if (filter.Count > 0 && members.Count > 0) {
+            if (filter.Count > 0 && members.Count > 0) {
-                    var dict = members.AsParallel()
+                var dict = members.AsParallel()
-                        .ToDictionary(m => m, m => m.SearchScore(filter))
+                    .ToDictionary(m => m, m => m.SearchScore(filter))
-                        .OrderByDescending(a => a.Value)
+                    .OrderByDescending(a => a.Value)
-                        .ThenBy(a => a.Key.Name)
+                    .ThenBy(a => a.Key.Name)
-                        .ThenBy(a => a.Key.GivenName)
+                    .ThenBy(a => a.Key.GivenName)
-                        .ThenBy(a => a.Key.MgNr);
+                    .ThenBy(a => a.Key.MgNr);
-                    var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
-                    members = [.. dict
+                members = dict
-                        .Where(a => a.Value > threshold)
+                    .Where(a => a.Value > threshold)
-                        .Select(a => a.Key)];
+                    .Select(a => a.Key)
-                } else {
+                    .ToList();
-                    members = [.. members
+            } else {
-                        .OrderBy(m => m.Name)
+                members = members
-                        .ThenBy(m => m.GivenName)
+                    .OrderBy(m => m.Name)
-                        .ThenBy(m => m.MgNr)];
+                    .ThenBy(m => m.GivenName)
-                }
+                    .ThenBy(m => m.MgNr)
-
+                    .ToList();
-                var stat = (await ctx.Members.GroupBy(m => 1).Select(g => new {
+            }
-                    Count = g.Count(),
-                    Shares = g.Sum(m => m.Shares),
-                    SharesRed = g.Sum(m => m.SharesRed),
-                    SharesWhite = g.Sum(m => m.SharesWhite),
-                    SharesDormant = g.Sum(m => m.SharesDormant),
-                    SharesTotal = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant),
-                    SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
-                }).ToListAsync()).Select(g => (g.Count, g.Shares, g.SharesRed, g.SharesWhite, g.SharesDormant, g.SharesTotal, g.SharesActive)).ToList();
-
-                return (members, stat[0]);
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveMembers)) return;
 
             ControlUtils.RenewItemsSource(MemberList, members,
                 MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             if (updateSort && MemberList.SelectedItem != null)
                 MemberList.ScrollIntoView(MemberList.SelectedItem);
 
-            ViewModel.StatusMembers = $"{members.Count:N0} ({stat.Count:N0})";
+            ViewModel.StatusMembers = $"{members.Count:N0} ({await ctx.Members.CountAsync():N0})";
-
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
-            var sA = members.Sum(m => m.Shares);
-            var rA = members.Sum(m => m.SharesRed);
-            var wA = members.Sum(m => m.SharesWhite);
-            var dA = members.Sum(m => m.SharesDormant);
-            List<(int Count, Brush? Color)> a = [];
-            if (sA > 0) a.Add((sA, null));
-            if (rA > 0) a.Add((rA, Brushes.DarkRed));
-            if (wA > 0) a.Add((wA, Brushes.DarkGreen));
-            if (a.Count == 0) a.Add((0, null));
-
-            List<(int Count, Brush? Color)> b = [];
-            if (stat.Shares > 0) b.Add((stat.Shares, null));
-            if (stat.SharesRed > 0) b.Add((stat.SharesRed, Brushes.DarkRed));
-            if (stat.SharesWhite > 0) b.Add((stat.SharesWhite, Brushes.DarkGreen));
-            if (a.Count == 0) b.Add((0, null));
-
-            Run[] inlines = [
-                new("Geschäftsanteile: "),
-                .. a.Select(i => new Run($"{i.Count:N0}") { Foreground = i.Color ?? Brushes.Black }).Join(() => new("+")),
-                new(" ("),
-                .. b.Select(i => new Run($"{i.Count:N0}") { Foreground = i.Color ?? Brushes.Black }).Join(() => new("+")),
-                new(")")
-            ];
-            if (ViewModel.StatusBusinessShares == null) {
-                ViewModel.StatusBusinessShares = new();
-            } else {
-                ViewModel.StatusBusinessShares.Inlines.Clear();
-            }
-            ViewModel.StatusBusinessShares.Inlines.AddRange(inlines);
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -248,17 +176,6 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
             await ViewModel.InitInputs();
-            if (App.Client.EnableMemberHistory) {
-                BusinessShares1Input.Text = "0";
-                BusinessShares2Input.Text = "0";
-                BusinessShares3Input.Text = "0";
-            } else if (App.Client.HasRedWhite) {
-                BusinessShares3Input.Text = "0";
-                SetDefaultValue(BusinessShares3Input);
-            } else {
-                BusinessShares2Input.Text = "0";
-                SetDefaultValue(BusinessShares2Input);
-            }
             SetDefaultValue(MgNrInput);
             SetDefaultValue(EntryDateInput);
             SetDefaultValue(ActiveInput);
@@ -267,12 +184,12 @@ namespace Elwig.Windows {
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
             await base.OnRenewContext(ctx);
-            ControlUtils.RenewItemsSource(BranchInput, await ctx.FetchBranches().ToListAsync());
+            ControlUtils.RenewItemsSource(BranchInput, await ctx.Branches.OrderBy(b => b.Name).ToListAsync());
             ControlUtils.RenewItemsSource(DefaultKgInput, await ctx.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync());
 
-            var font = new FontFamily("Segoe MDL2 Assets");
+            var font = new System.Windows.Media.FontFamily("Segoe MDL2 Assets");
             MenuItem? temp = null;
-            var seasons = await ctx.Seasons.Include(s => s.PaymentVariants).OrderByDescending(s => s.Year).ToListAsync();
+            var seasons = await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync();
             Menu_DeliveryConfirmation.Items.Clear();
             foreach (var s in seasons) {
                 var i = new MenuItem {
@@ -347,21 +264,10 @@ namespace Elwig.Windows {
 
             await RefreshList();
 
-            var stat = await ctx.Members.GroupBy(m => m.IsActive).Select(g => new {
-                IsActive = g.Key,
-                Count = g.Count(),
-                Shares = g.Sum(m => m.Shares),
-                SharesRed = g.Sum(m => m.SharesRed),
-                SharesWhite = g.Sum(m => m.SharesWhite),
-                SharesDormant = g.Sum(m => m.SharesDormant),
-                SharesTotal = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant),
-                SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
-            }).ToDictionaryAsync(g => g.IsActive);
-
             var (s1, s2) = ('\u2007', '\u202f');
-            var mA = $"{stat.GetValueOrDefault(true)?.Count ?? 0:N0}";
+            var mA = $"{await ctx.Members.CountAsync(m => m.IsActive):N0}";
-            var mI = $"{stat.GetValueOrDefault(false)?.Count ?? 0:N0}";
+            var mI = $"{await ctx.Members.CountAsync(m => !m.IsActive):N0}";
-            var mT = $"{stat.Sum(g => g.Value.Count):N0}";
+            var mT = $"{await ctx.Members.CountAsync():N0}";
             var mM = Math.Max(mA.Length, Math.Max(mI.Length, mT.Length));
             var mS = mM > 3;
             if (mS) mM--;
@@ -370,53 +276,16 @@ namespace Elwig.Windows {
                 $"{new string(s1, Math.Max(0, mM - mI.Length))}{(mS && mI.Length < 4 ? s2 : "")}{mI} nicht aktive Mitglieder\n" +
                 $"{new string(s1, Math.Max(0, mM - mT.Length))}{(mS && mT.Length < 4 ? s2 : "")}{mT} Mitglieder gesamt";
 
-            var grid = new Grid();
+            var bA = $"{await ctx.Members.Where(m => m.IsActive).SumAsync(m => m.BusinessShares):N0}";
-            grid.ColumnDefinitions.Add(new() { Width = new(100) });
+            var bI = $"{await ctx.Members.Where(m => !m.IsActive).SumAsync(m => m.BusinessShares):N0}";
-            grid.AddToolTipCell("Geschäftsanteile:", 0, 0, bold: true);
+            var bT = $"{await ctx.Members.SumAsync(m => m.BusinessShares):N0}";
-            grid.AddToolTipCell("Aktive Mitglieder", 1, 0);
+            var bM = Math.Max(bA.Length, Math.Max(bI.Length, bT.Length));
-            grid.AddToolTipCell("Nicht aktive Mg.", 2, 0);
+            var bS = bM > 3;
-            grid.AddToolTipCell("Alle Mitglieder", 3, 0, bold: true);
+            if (bS) bM--;
-            if (App.Client.HasRedWhite) {
+            ViewModel.StatusBusinessSharesToolTip =
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
+                $"{new string(s1, Math.Max(0, bM - bA.Length))}{(bS && bA.Length < 4 ? s2 : "")}{bA} Geschäftsanteile von aktiven Mitgliedern\n" +
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
+                $"{new string(s1, Math.Max(0, bM - bI.Length))}{(bS && bI.Length < 4 ? s2 : "")}{bI} Geschäftsanteile von nicht aktiven Mitgliedern\n" +
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
+                $"{new string(s1, Math.Max(0, bM - bT.Length))}{(bS && bT.Length < 4 ? s2 : "")}{bT} Geschäftsanteile gesamt";
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.AddToolTipCell("rot", 0, 1, alignRight: true);
-                grid.AddToolTipCell("weiß", 0, 2, alignRight: true);
-                grid.AddToolTipCell("ruhend", 0, 3, alignRight: true);
-                grid.AddToolTipCell("gesamt", 0, 4, alignRight: true);
-
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesRed ?? 0:N0}", 1, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesWhite ?? 0:N0}", 1, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesDormant ?? 0:N0}", 1, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesTotal ?? 0:N0}", 1, 4, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesRed ?? 0:N0}", 2, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesWhite ?? 0:N0}", 2, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesDormant ?? 0:N0}", 2, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesTotal ?? 0:N0}", 2, 4, alignRight: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesRed):N0}", 3, 1, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesWhite):N0}", 3, 2, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesDormant):N0}", 3, 3, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesTotal):N0}", 3, 4, alignRight: true, bold: true);
-            } else {
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.AddToolTipCell("normal", 0, 1, alignRight: true);
-                grid.AddToolTipCell("ruhend", 0, 2, alignRight: true);
-                grid.AddToolTipCell("gesamt", 0, 3, alignRight: true);
-
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.Shares ?? 0:N0}", 1, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesDormant ?? 0:N0}", 1, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesTotal ?? 0:N0}", 1, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.Shares ?? 0:N0}", 2, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesDormant ?? 0:N0}", 2, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesTotal ?? 0:N0}", 2, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.Shares):N0}", 3, 1, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesDormant):N0}", 3, 2, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesTotal):N0}", 3, 3, alignRight: true, bold: true);
-            }
-            ViewModel.StatusBusinessShares?.ToolTip = grid;
         }
 
         private void SetPhoneNrInputVisible(int nr, bool visible, int? position = null) {
@@ -459,7 +328,6 @@ namespace Elwig.Windows {
         }
 
         private async void ActiveMemberInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList();
         }
 
@@ -516,9 +384,10 @@ namespace Elwig.Windows {
 
             int areaComs = 0, deliveries = 0, credits = 0;
             using (var ctx = new AppDbContext()) {
-                areaComs = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
+                var l = (await ctx.Members.FindAsync(m.MgNr))!;
-                deliveries = await ctx.Deliveries.Where(d => d.MgNr == m.MgNr).CountAsync();
+                areaComs = l.AreaCommitments.Count;
-                credits = await ctx.Credits.Where(c => c.MgNr == m.MgNr).CountAsync();
+                deliveries = l.Deliveries.Count;
+                credits = l.Credits.Count;
             }
             var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
             if (d.ShowDialog() == true) {
@@ -527,7 +396,9 @@ namespace Elwig.Windows {
                     await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
                     App.HintContextChange();
                 } catch (Exception exc) {
-                    InteractionService.ShowDbException("Mitglied löschen", exc);
+                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                    MessageBox.Show(str, "Mitglied löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 Mouse.OverrideCursor = null;
             }
@@ -548,7 +419,9 @@ namespace Elwig.Windows {
                 mgnr = await ViewModel.UpdateMember(ViewModel.SelectedMember?.MgNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Mitglied aktualisieren", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                 SaveButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
@@ -563,7 +436,8 @@ namespace Elwig.Windows {
             UpdateContactInfoVisibility();
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
-            await EnsureContextRenewed();
+            await RefreshList();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
             Mouse.OverrideCursor = null;
             if (mgnr is int m)
@@ -602,10 +476,6 @@ namespace Elwig.Windows {
             ViewModel.EnableSearchInputs = true;
         }
 
-        private void BusinessSharesButton_Click(object sender, RoutedEventArgs evt) {
-            App.FocusMemberBusinessSharesWindow(ViewModel.SelectedMember!.MgNr);
-        }
-
         private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
             App.FocusMemberAreaComs(ViewModel.SelectedMember!.MgNr);
         }
@@ -615,7 +485,6 @@ namespace Elwig.Windows {
         }
 
         private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList(true);
         }
 
@@ -630,9 +499,7 @@ namespace Elwig.Windows {
             try {
                 await Task.Run(async () => {
                     using var doc = new Letterhead(m);
-                    using (var ctx = new AppDbContext()) {
+                    await doc.Generate();
-                        await doc.Generate(ctx);
-                    }
                     if (!App.Config.Debug) {
                         await doc.Print();
                     } else {
@@ -640,7 +507,7 @@ namespace Elwig.Windows {
                     }
                 });
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -662,7 +529,9 @@ namespace Elwig.Windows {
 
         private async void Menu_MemberDataSheet_Email_Click(object sender, RoutedEventArgs evt) {
             if (ViewModel.SelectedMember is not Member m) return;
-            if (!InteractionService.AskQuestion("Stammdatenblatt verschicken", "Soll eine E-Mail verschickt werden?", true))
+            var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Stammdatenblatt verschicken",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes);
+            if (res != MessageBoxResult.Yes)
                 return;
             await MemberService.GenerateMemberDataSheet(m, ExportMode.Email);
         }
@@ -692,7 +561,9 @@ namespace Elwig.Windows {
             var year = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
             if (ViewModel.SelectedMember is not Member m || year == null)
                 return;
-            if (!InteractionService.AskQuestion("Anlieferungsbestätigung verschicken", "Soll eine E-Mail verschickt werden?", true))
+            var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Anlieferungsbestätigung verschicken",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes);
+            if (res != MessageBoxResult.Yes)
                 return;
             await MemberService.GenerateDeliveryConfirmation(m, (int)year, ExportMode.Email);
         }
@@ -726,7 +597,9 @@ namespace Elwig.Windows {
             var avnr = (int?)((sender as MenuItem)?.Parent as MenuItem)?.Tag;
             if (ViewModel.SelectedMember is not Member m || year == null || avnr == null)
                 return;
-            if (!InteractionService.AskQuestion("Traubengutschrift verschicken", "Soll eine E-Mail verschickt werden?", true))
+            var res = MessageBox.Show("Soll eine E-Mail verschickt werden?", "Traubengutschrift verschicken",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes);
+            if (res != MessageBoxResult.Yes)
                 return;
             await MemberService.GenerateCreditNote(m, (int)year, (int)avnr, ExportMode.Email);
         }
@@ -848,7 +721,7 @@ namespace Elwig.Windows {
             lastVisible = true;
             for (int i = 0; i < EmailAddressInputs.Length; i++) {
                 var input = EmailAddressInputs[i];
-                var vis = !string.IsNullOrWhiteSpace(input.Address.Text) || (m?.EmailAddresses.Any(a => a.Nr - 1 == i) ?? false);
+                var vis = !string.IsNullOrEmpty(input.Address.Text) || (m?.EmailAddresses.Any(a => a.Nr - 1 == i) ?? false);
                 var cVis = vis || (extra && lastVisible);
                 SetEmailAddressInputVisible(i, cVis, cVis ? num++ : null);
                 lastVisible = vis;
@@ -856,7 +729,7 @@ namespace Elwig.Windows {
             lastVisible = true;
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
                 var input = PhoneNrInputs[i];
-                var vis = !string.IsNullOrWhiteSpace(input.Number.Text) || (m?.TelephoneNumbers.Any(n => n.Nr - 1 == i) ?? false);
+                var vis = !string.IsNullOrEmpty(input.Number.Text) || (m?.TelephoneNumbers.Any(n => n.Nr - 1 == i) ?? false);
                 var cVis = vis || (extra && lastVisible);
                 SetPhoneNrInputVisible(i, cVis, cVis ? num++ : null);
                 lastVisible = vis;
@@ -873,14 +746,6 @@ namespace Elwig.Windows {
 
         new protected void ClearInputs(bool validate = false) {
             ViewModel.ClearInputs();
-            if (App.Client.EnableMemberHistory) {
-                BusinessShares1Input.Text = "";
-                BusinessShares2Input.Text = "";
-                BusinessShares3Input.Text = "";
-                ControlUtils.ClearInputState(BusinessShares1Input);
-                ControlUtils.ClearInputState(BusinessShares2Input);
-                ControlUtils.ClearInputState(BusinessShares3Input);
-            }
             base.ClearInputs(validate);
         }
 
@@ -923,15 +788,16 @@ namespace Elwig.Windows {
                 if (areaComs.Count == 0)
                     return;
 
-                var oldMember = await ctx.FetchMembers(mgnr).SingleAsync();
+                var oldMember = (await ctx.Members.FindAsync(mgnr))!;
                 var newName = $"{ViewModel.Name?.Replace('ß', 'ẞ').ToUpper()} " +
-                    $"{ViewModel.Prefix}{(!string.IsNullOrWhiteSpace(ViewModel.Prefix) ? " " : "")}" +
+                    $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
-                    $"{ViewModel.GivenName}{(!string.IsNullOrWhiteSpace(ViewModel.GivenName) ? " " : "")}" +
+                    $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
-                    $"{ViewModel.Suffix}{(!string.IsNullOrWhiteSpace(ViewModel.Suffix) ? " " : "")}";
+                    $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}";
                 var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
                 if (d.ShowDialog() != true)
                     return;
                 ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
+                ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
                 if (IsEditing)
                     SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                 UpdateButtons();

Elwig/Windows/MemberBusinessSharesAdminWindow.xaml

@@ -1,214 +0,0 @@
-<local:AdministrationWindow
-        x:Class="Elwig.Windows.MemberBusinessSharesAdminWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:local="clr-namespace:Elwig.Windows"
-        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        xmlns:vm="clr-namespace:Elwig.ViewModels"
-        Title="{Binding Title}" Height="450" Width="800" MinHeight="400" MinWidth="700">
-    <Window.DataContext>
-        <vm:MemberBusinessSharesViewModel/>
-    </Window.DataContext>
-    <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="ctrl:UnitTextBox">
-            <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="ComboBox">
-            <Setter Property="Height" Value="25"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="HorizontalAlignment" Value="Stretch"/>
-            <Setter Property="VerticalAlignment" Value="Top"/>
-        </Style>
-        <Style TargetType="Button">
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Padding" Value="9,3"/>
-            <Setter Property="Height" Value="27"/>
-        </Style>
-    </Window.Resources>
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" MinWidth="300"/>
-            <ColumnDefinition Width="5"/>
-            <ColumnDefinition Width="1*" MinWidth="350"/>
-        </Grid.ColumnDefinitions>
-
-        <Grid Margin="5,0,0,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="42"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <ListBox x:Name="MemberHistoryList" Margin="5,10,5,0" Grid.ColumnSpan="3"
-                     ItemsSource="{Binding History, Mode=TwoWay}" SelectedItem="{Binding SelectedHistoryEntry, Mode=TwoWay}"
-                     SelectionChanged="MemberHistoryList_SelectionChanged">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding DateNotice, StringFormat='{}{0:dd.MM.yy}'}" Width="55" TextAlignment="Left" Margin="0,0,0,0"/>
-                            <TextBlock Text="{Binding DateEffective, StringFormat='{}{0:dd.MM.yy}'}" Width="55" TextAlignment="Left" Margin="0,0,0,0"/>
-                            <TextBlock Text="{Binding Shares, StringFormat='{}{0:N0}'}" Width="15" TextAlignment="Right" Margin="0,0,10,0"/>
-                            <TextBlock Text="{Binding PoVReasonPhrase}" TextAlignment="Left" Margin="0,0,0,0"/>
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-
-            <Button x:Name="NewHistoryButton" Content="Neu" Visibility="{Binding ControlButtonsVisibility}"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="NewHistoryButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
-                </Button.ToolTip>
-            </Button>
-            <Button x:Name="EditHistoryButton" Content="Bearbeiten" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="EditHistoryButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
-                </Button.ToolTip>
-            </Button>
-            <Button x:Name="DeleteHistoryButton" Content="Löschen" IsEnabled="False" Visibility="{Binding ControlButtonsVisibility}"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="DeleteHistoryButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
-                </Button.ToolTip>
-            </Button>
-
-            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="SaveButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
-                </Button.ToolTip>
-            </Button>
-            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="ResetButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
-                </Button.ToolTip>
-            </Button>
-            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="{Binding EditingButtonsVisibility}" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelButton_Click">
-                <Button.ToolTip>
-                    <TextBlock FontWeight="Bold">Esc</TextBlock>
-                </Button.ToolTip>
-            </Button>
-        </Grid>
-
-        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-
-        <Grid Grid.Column="2">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="95"/>
-            </Grid.RowDefinitions>
-
-            <GroupBox Header="Geschäftsanteilbewegung" Margin="5,10,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="110"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Grund:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <ComboBox x:Name="ReasonInput" SelectedValue="{Binding Reason, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                              Margin="0,10,10,0" Grid.Column="1"
-                              SelectedValuePath="Tag"
-                              SelectionChanged="ReasonInput_SelectionChanged">
-                        <ComboBoxItem Tag="purchase">Kauf</ComboBoxItem>
-                        <ComboBoxItem Tag="transfer_to">Übertragung an...</ComboBoxItem>
-                        <ComboBoxItem Tag="transfer_from">Übertragung von...</ComboBoxItem>
-                        <ComboBoxItem Tag="prescription">Vorschreibung</ComboBoxItem>
-                        <ComboBoxItem Tag="exclusion">Ausschluss</ComboBoxItem>
-                        <ComboBoxItem Tag="deceased">Tod</ComboBoxItem>
-                        <ComboBoxItem Tag="retirement">Kündigung</ComboBoxItem>
-                        <ComboBoxItem Tag="payout">Auszahlung</ComboBoxItem>
-                    </ComboBox>
-
-                    <Label Content="Anderes Mitgl.:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="OtherMgNrInput" Text="{Binding OtherMgNrString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Width="48" Grid.Column="1" Margin="0,40,0,0" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="OtherMgNrInput_TextChanged" LostFocus="OtherMgNrInput_LostFocus"/>
-                    <ComboBox x:Name="OtherMemberInput"
-                              Grid.Column="1" Margin="53,40,40,10" IsEditable="True"
-                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                              SelectionChanged="OtherMemberInput_SelectionChanged"/>
-                    <Button x:Name="OtherMemberReferenceButton" Grid.Column="1" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0,0,0,0"
-                            Margin="10,40,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen"
-                            Click="OtherMemberReferenceButton_Click"/>
-
-                    <Label Content="Anmerkung:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,70,10,0" Grid.Column="1"/>
-
-                    <Label Content="Meldung:" Margin="10,100,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="DateNoticeInput" Text="{Binding DateNoticeString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,100,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="DateNoticeInput_TextChanged" LostFocus="DateInput_LostFocus"/>
-
-                    <CheckBox x:Name="HasMemberSignedInput" IsChecked="{Binding MemberHasSigned, Mode=TwoWay}" Content="Von Mg. unterfertigt"
-                              Margin="88,105,10,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="TOp"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-
-                    <Label Content="Wirksam:" Margin="10,130,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="DateEffeciveInput" Text="{Binding DateEffectiveString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,130,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
-
-                    <Label Content="Geschäftsanteile:" Margin="10,160,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="SharesInput" Text="{Binding SharesString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,160,10,0" Width="32" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="SharesInput_TextChanged"/>
-
-                    <CheckBox x:Name="DeductInput" IsChecked="{Binding Deduct, Mode=TwoWay}"
-                              Margin="42,165,10,0" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="TOp"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed">
-                        <TextBlock>
-                            bei Auszahlung <Run Text="{Binding DeductYearString}"/> abziehen
-                        </TextBlock>
-                    </CheckBox>
-
-                    <Label Content="Betrag:" Margin="10,190,0,10"/>
-                    <ctrl:UnitTextBox x:Name="ValuePerShareInput" Text="{Binding ValuePerShareString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Unit="€/GA" TextChanged="AmountPerShareInput_TextChanged"
-                                      Grid.Column="1" Width="76" Margin="0,190,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                    <ctrl:UnitTextBox x:Name="TotalAmountInput" Text="{Binding TotalAmount}" Unit="€" IsEnabled="False"
-                                      Grid.Column="1" Width="77" Margin="81,190,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                </Grid>
-            </GroupBox>
-
-            <GroupBox Header="Mitglied" Grid.Row="1" Margin="5,5,5,10">
-                <Grid>
-                    <TextBlock x:Name="MemberInfo" Text="Name (1234)"
-                               FontSize="14" Margin="10,10,10,10"/>
-                </Grid>
-            </GroupBox>
-        </Grid>
-    </Grid>
-</local:AdministrationWindow>

Elwig/Windows/MemberBusinessSharesAdminWindow.xaml.cs

@@ -1,347 +0,0 @@
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using Elwig.Services;
-using Elwig.ViewModels;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Elwig.Windows {
-    public partial class MemberBusinessSharesAdminWindow : AdministrationWindow {
-
-        public MemberBusinessSharesViewModel ViewModel => (MemberBusinessSharesViewModel)DataContext;
-
-        public MemberBusinessSharesAdminWindow(int mgnr) {
-            InitializeComponent();
-            using var ctx = new AppDbContext();
-            ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
-            ViewModel.Title = $"Geschäftsanteilbewegungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
-            ExemptInputs = [
-                MemberHistoryList, TotalAmountInput
-            ];
-            RequiredInputs = [
-                ReasonInput, DateNoticeInput, DateEffeciveInput, SharesInput
-           ];
-        }
-
-        public void FocusMemberHistory(int histnr) {
-            if (IsEditing || IsCreating) return;
-            var item = ViewModel.History.FirstOrDefault(h => h.HistNr == histnr);
-            if (item != null) {
-                ControlUtils.SelectItem(MemberHistoryList, item);
-            }
-        }
-
-        private async Task RefreshList() {
-            var vm = ViewModel;
-            var cursor = Mouse.OverrideCursor != null;
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
-            var history = await Task.Run(async () => {
-                using var ctx = new AppDbContext();
-                return await ctx.MemberHistory
-                    .Where(h => h.FromMgNr == vm.FilterMember.MgNr || h.ToMgNr == vm.FilterMember.MgNr)
-                    .OrderBy(h => h.DateNoticeString).ThenBy(h => h.HistNr)
-                    .ToListAsync();
-            });
-            if (!cursor) Mouse.OverrideCursor = null;
-            history.ForEach(h => h.PoVMgNr = vm.FilterMember.MgNr);
-
-            ControlUtils.RenewItemsSource(MemberHistoryList, history,
-                MemberHistoryList_SelectionChanged, ControlUtils.RenewSourceDefault.None);
-            RefreshInputs();
-        }
-
-
-        private void RefreshInputs(bool validate = false) {
-            ClearInputStates();
-            if (ViewModel.SelectedHistoryEntry is MemberHistory h) {
-                EditHistoryButton.IsEnabled = true;
-                DeleteHistoryButton.IsEnabled = true;
-                FillInputs(h);
-            } else {
-                EditHistoryButton.IsEnabled = false;
-                DeleteHistoryButton.IsEnabled = false;
-                ClearOriginalValues();
-                ClearDefaultValues();
-                ClearInputs(validate);
-                ClearInputStates();
-            }
-            GC.Collect();
-        }
-
-        private void FillInputs(MemberHistory h) {
-            ClearOriginalValues();
-            ClearDefaultValues();
-            ViewModel.FillInputs(h);
-            ReasonInput.SelectedValue = h.Reason + (h.Reason == MemberHistory.REASON_TRANSFER ? $"_{(h.FromMgNr == ViewModel.FilterMember.MgNr ? "to" : "from")}" : "");
-            FinishInputFilling();
-        }
-
-        private async Task InitInputs() {
-            ClearOriginalValues();
-            ClearDefaultValues();
-            await ViewModel.InitInputs();
-            SetDefaultValue(DateNoticeInput);
-            if (ViewModel.ValuePerShare != null)
-                SetDefaultValue(ValuePerShareInput);
-            ValidateRequiredInputs();
-        }
-
-        new protected void ClearInputs(bool validate = false) {
-            ViewModel.ClearInputs();
-            base.ClearInputs(validate);
-        }
-
-        override protected void UpdateButtons() {
-            if (!IsEditing && !IsCreating) return;
-            bool ch = HasChanged, v = IsValid;
-            ResetButton.IsEnabled = ch;
-            SaveButton.IsEnabled = v && ch;
-        }
-
-        protected override async Task OnRenewContext(AppDbContext ctx) {
-            await base.OnRenewContext(ctx);
-
-            if (await ctx.FetchMembers(ViewModel.FilterMember.MgNr).SingleOrDefaultAsync() is not Member m) {
-                Close();
-                return;
-            }
-            ViewModel.FilterMember = m;
-            ViewModel.Title = $"Geschäftsanteilbewegungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
-
-            ControlUtils.RenewItemsSource(OtherMemberInput, await ctx.FetchMembers(includeNotActive: true).ToListAsync());
-
-            MemberInfo.Text = $"{m.FullAdministrativeName}\nGA: {m.Shares:N0} (normal) / {m.SharesRed:N0} (rot) / {m.SharesWhite:N0} (weiß) / {m.SharesDormant:N0} (ruhend)";
-
-            await RefreshList();
-        }
-
-        private void MemberHistoryList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
-            RefreshInputs();
-        }
-
-        protected override void ShortcutNew() {
-            if (!NewHistoryButton.IsEnabled || NewHistoryButton.Visibility != Visibility.Visible)
-                return;
-            NewHistoryButton_Click(null, null);
-        }
-
-        private async void NewHistoryButton_Click(object? sender, RoutedEventArgs? evt) {
-            IsCreating = true;
-            MemberHistoryList.IsEnabled = false;
-            ViewModel.SelectedHistoryEntry = null;
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
-            UnlockInputs();
-            await InitInputs();
-            DeductInput.IsEnabled = false;
-            OtherMgNrInput.IsEnabled = false;
-            OtherMemberInput.IsEnabled = false;
-        }
-
-        protected override void ShortcutEdit() {
-            if (!EditHistoryButton.IsEnabled || EditHistoryButton.Visibility != Visibility.Visible)
-                return;
-            EditHistoryButton_Click(null, null);
-        }
-
-        private void EditHistoryButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.SelectedHistoryEntry == null) return;
-
-            IsEditing = true;
-            MemberHistoryList.IsEnabled = false;
-
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
-            UnlockInputs();
-
-            DeductInput.IsEnabled = ViewModel.Reason == MemberHistory.REASON_PURCHASE || ViewModel.Reason == MemberHistory.REASON_PRESCRIPTION;
-            OtherMgNrInput.IsEnabled = ViewModel.Reason?.StartsWith(MemberHistory.REASON_TRANSFER) ?? false;
-            OtherMemberInput.IsEnabled = OtherMgNrInput.IsEnabled;
-        }
-
-        protected override void ShortcutDelete() {
-            if (!DeleteHistoryButton.IsEnabled || DeleteHistoryButton.Visibility != Visibility.Visible)
-                return;
-            DeleteHistoryButton_Click(null, null);
-        }
-
-        private async void DeleteHistoryButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (ViewModel.SelectedHistoryEntry is not MemberHistory h)
-                return;
-
-            if (InteractionService.AskContinueYesNo("Geschäftsanteilbewegung löschen", $"Soll die Geschäftsanteilbewegung wirklich unwiderruflich\ngelöscht werden?\n\nFalls ja:\nSoll die Änderung der aktuellen GA wieder rückgängig gemacht werden?") is bool enableTriggers) {
-                Mouse.OverrideCursor = Cursors.Wait;
-                try {
-                    await MemberBusinessSharesService.DeleteMemberHistory(h.HistNr, enableTriggers);
-                    App.HintContextChange();
-                } catch (Exception exc) {
-                    InteractionService.ShowDbException("Geschäftsanteilbewegung löschen", exc);
-                }
-                Mouse.OverrideCursor = null;
-            }
-        }
-
-        protected override void ShortcutSave() {
-            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
-                return;
-            SaveButton_Click(null, null);
-        }
-
-        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
-            SaveButton.IsEnabled = false;
-
-            int mgnr;
-            try {
-                mgnr = await ViewModel.UpdateMemberHistory(ViewModel.SelectedHistoryEntry?.HistNr, IsEditing || ViewModel.DateNotice >= DateOnly.FromDateTime(Utils.Today).AddDays(-14));
-                App.HintContextChange();
-            } catch (Exception exc) {
-                InteractionService.ShowDbException("Geschäftsanteilbewegung aktualisieren", exc);
-                SaveButton.IsEnabled = true;
-                Mouse.OverrideCursor = null;
-                return;
-            }
-
-            IsEditing = false;
-            IsCreating = false;
-            MemberHistoryList.IsEnabled = true;
-            OtherMgNrInput.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
-            LockInputs();
-            FinishInputFilling();
-            await EnsureContextRenewed();
-            Mouse.OverrideCursor = null;
-            if (mgnr is int m)
-                FocusMemberHistory(m);
-        }
-
-        protected override void ShortcutReset() {
-            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
-                return;
-            ResetButton_Click(null, null);
-        }
-
-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
-            if (IsEditing) {
-                RefreshInputs();
-            } else if (IsCreating) {
-                ClearInputs();
-                await InitInputs();
-            }
-            UpdateButtons();
-        }
-
-        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
-            IsEditing = false;
-            IsCreating = false;
-            MemberHistoryList.IsEnabled = true;
-            OtherMgNrInput.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
-            RefreshInputs();
-            LockInputs();
-        }
-
-        private void ShowSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = true;
-            ViewModel.EditingButtonsVisibility = Visibility.Visible;
-        }
-
-        private void HideSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = false;
-            ViewModel.EditingButtonsVisibility = Visibility.Hidden;
-        }
-
-        private void ShowNewEditDeleteButtons() {
-            NewHistoryButton.IsEnabled = true;
-            EditHistoryButton.IsEnabled = ViewModel.SelectedHistoryEntry != null;
-            DeleteHistoryButton.IsEnabled = ViewModel.SelectedHistoryEntry != null;
-            ViewModel.ControlButtonsVisibility = Visibility.Visible;
-        }
-
-        private void HideNewEditDeleteButtons() {
-            NewHistoryButton.IsEnabled = false;
-            EditHistoryButton.IsEnabled = false;
-            DeleteHistoryButton.IsEnabled = false;
-            ViewModel.ControlButtonsVisibility = Visibility.Hidden;
-        }
-
-        private void OtherMgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            var valid = InputTextChanged((TextBox)sender, Validator.CheckMgNr);
-            var text = OtherMgNrInput.Text;
-            var caret = OtherMgNrInput.CaretIndex;
-            ControlUtils.SelectItemWithPk(OtherMemberInput, valid ? ViewModel.OtherMgNr : null);
-            OtherMgNrInput.Text = text;
-            OtherMgNrInput.CaretIndex = caret;
-        }
-
-        private void OtherMgNrInput_LostFocus(object sender, RoutedEventArgs evt) {
-            var valid = InputLostFocus((TextBox)sender, Validator.CheckMgNr);
-            ControlUtils.SelectItemWithPk(OtherMemberInput, valid ? ViewModel.OtherMgNr : null);
-        }
-
-        private void OtherMemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
-            var m = OtherMemberInput.SelectedItem as Member;
-            ViewModel.OtherMgNr = m?.MgNr;
-        }
-
-        private void OtherMemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
-            if (OtherMemberInput.SelectedItem is not Member m) return;
-            App.FocusMember(m.MgNr);
-        }
-
-        private void ReasonInput_SelectionChanged(object sender, RoutedEventArgs evt) {
-            ComboBox_SelectionChanged(sender, evt);
-            if (!IsEditing && !IsCreating) return;
-            if (ViewModel.DateNotice is not DateOnly d) return;
-            if (ViewModel.Reason == MemberHistory.REASON_EXCLUSION || ViewModel.Reason == MemberHistory.REASON_DECEASED || ViewModel.Reason == MemberHistory.REASON_RETIREMENT) {
-                ViewModel.DateEffectiveString = $"31.12.{d.Year + 1}";
-            } else {
-                ViewModel.DateEffectiveString = ViewModel.DateNoticeString;
-            }
-            DeductInput.IsEnabled = ViewModel.Reason == MemberHistory.REASON_PURCHASE || ViewModel.Reason == MemberHistory.REASON_PRESCRIPTION;
-            if (!DeductInput.IsEnabled) DeductInput.IsChecked = false;
-            OtherMgNrInput.IsEnabled = ViewModel.Reason?.StartsWith(MemberHistory.REASON_TRANSFER) ?? false;
-            OtherMemberInput.IsEnabled = OtherMgNrInput.IsEnabled;
-            if (!OtherMgNrInput.IsEnabled) OtherMgNrInput.Text = "";
-        }
-
-        private void DateNoticeInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            DateInput_TextChanged(sender, evt);
-            if (!IsEditing && !IsCreating) return;
-            if (ViewModel.DateNotice is not DateOnly d) return;
-            ViewModel.DeductYear = d.Year;
-            if (ViewModel.DateEffective == null && ViewModel.Reason != null) {
-                if (ViewModel.Reason == MemberHistory.REASON_EXCLUSION || ViewModel.Reason == MemberHistory.REASON_DECEASED || ViewModel.Reason == MemberHistory.REASON_RETIREMENT) {
-                    ViewModel.DateEffectiveString = $"31.12.{d.Year + 1}";
-                } else {
-                    ViewModel.DateEffectiveString = ViewModel.DateNoticeString;
-                }
-            }
-        }
-
-        private void UpdateAmount() {
-            ViewModel.TotalAmount = $"{ViewModel.Shares * ViewModel.ValuePerShare:N2}";
-        }
-
-        private void SharesInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            IntegerInput_TextChanged(sender, evt);
-            UpdateAmount();
-        }
-
-        private void AmountPerShareInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 3, 2));
-            UpdateAmount();
-        }
-    }
-}

Elwig/Windows/OriginHierarchyWindow.xaml.cs

@@ -1,6 +1,5 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -22,11 +21,12 @@ namespace Elwig.Windows {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var origins = await ctx.WineOrigins
+            var origins = (await ctx.WineOrigins
-                .Include(o => o.Gems).ThenInclude(g => g.AtGem.Kgs).ThenInclude(k => k.WbKg!.Gl)
+                    .Include("Gems.AtGem.Kgs.WbKg.Gl")
-                .ToListAsync();
+                    .AsSplitQuery()
-            origins.ForEach(o => { origins.FirstOrDefault(p => p.HkId == o.ParentHkId)?.Children.Add(o); });
+                    .ToListAsync())
-            origins = [.. origins.OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId)];
+                    .OrderByDescending(o => o.SortKey)
+                    .ThenBy(o => o.HkId);
             ControlUtils.RenewItemsSource(WineOrigins, origins, WineOrigins_SelectionChanged);
             if (WineOrigins.SelectedItem == null) {
                 var hkid = await ctx.WbKgs
@@ -39,7 +39,8 @@ namespace Elwig.Windows {
             }
             var gls = await ctx.WbGls
                 .OrderBy(g => g.GlNr)
-                .Include(g => g.Kgs).ThenInclude(k => k.Rds)
+                .Include("Kgs.Rds")
+                .AsSplitQuery()
                 .ToListAsync();
             ControlUtils.RenewItemsSource(WbGls, gls, WbGls_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             UpdateWbGems();
@@ -99,8 +100,8 @@ namespace Elwig.Windows {
                 var allMembers = await ctx.Members.Where(m => m.DefaultKgNr == k.KgNr).CountAsync();
                 StatusDefaultKgs.Text += $"{activeMembers:N0} ({allMembers:N0})";
                 var year = Utils.CurrentNextSeason;
-                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr), year).CountAsync();
+                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr), year).CountAsync();
-                var allAreaComs = await ctx.AreaCommitments.Where(c => c.Contract.KgNr == k.KgNr).CountAsync();
+                var allAreaComs = await ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr).CountAsync();
                 StatusAreaCommitments.Text += $"{activeAreaComs:N0} ({allAreaComs:N0})";
                 var deliveryParts = await ctx.DeliveryParts.Where(p => p.KgNr == k.KgNr).CountAsync();
                 var deliveries = await ctx.Deliveries.Where(d => d.Parts.Any(p => p.KgNr == k.KgNr)).CountAsync();
@@ -193,14 +194,18 @@ namespace Elwig.Windows {
                 App.HintContextChange();
                 ControlUtils.SelectItemWithPk(WbGlKgs, k.KgNr);
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Katastralgemeinde aktivieren", 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, "Katastralgemeinde aktivieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
         private async void DeactivateKgButton_Click(object sender, RoutedEventArgs e) {
             if (WbGlKgs.SelectedItem is not AT_Kg k || k.WbKg == null) return;
-            if (!InteractionService.AskConfirmation("Katastralgemeinde deaktivieren", $"Sollen alle Riede und Stammgemeinden-Einträge von der KG {k.Name} wirklich unwiderruflich gelöscht werden?"))
+            var r = MessageBox.Show(
-                return;
+                $"Sollen alle Riede und Stammgemeinden-Einträge von der KG {k.Name} wirklich unwiderruflich gelöscht werden?",
+                "Katastralgemeinde deaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (r != MessageBoxResult.Yes) return;
             try {
                 using (var ctx = new AppDbContext()) {
                     ctx.Remove(k.WbKg);
@@ -209,8 +214,10 @@ namespace Elwig.Windows {
                 App.HintContextChange();
                 ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
             } catch (Exception exc) {
-                await ForceContextReload();
+                await HintContextChange();
-                InteractionService.ShowDbException("Katastralgemeinde deaktivieren", exc);
+                var str = "Der Eintrag konnte nicht aus der Datenbank gelöscht werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Katastralgemeinde deaktivieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 

Elwig/Windows/PaymentAdjustmentWindow.xaml

@@ -76,7 +76,7 @@
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Nachname" Binding="{Binding Name}" Width="100"/>
                     <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="90"/>
-                    <DataGridTextColumn Header="GA" Binding="{Binding SharesActive, StringFormat='{}{0:N0} '}" Width="35">
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0:N0} '}" Width="35">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -104,7 +104,7 @@
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Strafe GA" Binding="{Binding PenaltyShares, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
+                    <DataGridTextColumn Header="Strafe GA" Binding="{Binding PenaltyBs, Converter={StaticResource CurrencyConverter}, StringFormat='{}{0} '}" Width="65">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -194,7 +194,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Automatische Nachzeichnung von Geschäftsanteilen" Margin="5,10,10,10" Height="180" Width="365"
+            <GroupBox Header="Automatische Nachzeichnung der Geschäftsanteile" Margin="5,10,10,10" Height="180" Width="365"
                       VerticalAlignment="Bottom" HorizontalAlignment="Left">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -204,28 +204,28 @@
                     <Label Content="Absoluter Freibetrag:" Margin="10,10,0,0" Grid.ColumnSpan="2"/>
                     <ctrl:UnitTextBox x:Name="AllowanceKgInput" Unit="kg" Margin="128,10,0,0" Width="70"
                            TextChanged="KgInput_TextChanged" Grid.Column="1"/>
-                    <ctrl:UnitTextBox x:Name="AllowanceShareInput" Unit="GA" Margin="203,10,0,0" Width="60"
+                    <ctrl:UnitTextBox x:Name="AllowanceBsInput" Unit="GA" Margin="203,10,0,0" Width="60"
                            TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
 
                     <Label Content="Relativer Freibetrag:" Margin="10,40,0,0" Grid.ColumnSpan="2"/>
-                    <ctrl:UnitTextBox x:Name="AllowanceKgPerShareInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
+                    <ctrl:UnitTextBox x:Name="AllowanceKgPerBsInput" Unit="kg/GA" Margin="128,40,0,0" Width="87"
                            TextChanged="KgInput_TextChanged" Grid.Column="1"/>
                     <ctrl:UnitTextBox x:Name="AllowancePercentInput" Unit="%" Margin="220,40,0,0" Width="60"
                            TextChanged="PercentInput_TextChanged" Grid.Column="1"/>
 
                     <Label Content="Nur mind. nachz.:" Margin="10,70,0,0" Grid.ColumnSpan="2"/>
-                    <ctrl:UnitTextBox x:Name="MinSharesInput" Unit="GA" Margin="128,70,0,0" Width="50"
+                    <ctrl:UnitTextBox x:Name="MinBsInput" Unit="GA" Margin="128,70,0,0" Width="50"
-                           TextChanged="SharesInput_TextChanged" Grid.Column="1"/>
+                           TextChanged="BsInput_TextChanged" Grid.Column="1"/>
 
                     <Button x:Name="SeasonButton" Content="GA-Wert" Margin="0,0,10,42" Width="120"
                             HorizontalAlignment="Right" VerticalAlignment="Bottom"
                             Click="SeasonButton_Click" Grid.Column="1"/>
-                    <Button x:Name="AutoAdjustSharesButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
+                    <Button x:Name="AutoAdjustBsButton" Content="Nachzeichnen" Margin="0,0,135,10" Width="120"
                             HorizontalAlignment="Right" VerticalAlignment="Bottom"
-                            Click="AutoAdjustSharesButton_Click" Grid.Column="1"/>
+                            Click="AutoAdjustBsButton_Click" Grid.Column="1"/>
-                    <Button x:Name="UnAdjustSharesButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
+                    <Button x:Name="UnAdjustBsButton" Content="Rückgängig" Margin="0,0,10,10" Width="120"
                             HorizontalAlignment="Right" VerticalAlignment="Bottom"
-                            Click="UnAdjustSharesButton_Click" Grid.Column="1"/>
+                            Click="UnAdjustBsButton_Click" Grid.Column="1"/>
                 </Grid>
             </GroupBox>
         </Grid>

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -2,7 +2,6 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -26,56 +25,59 @@ namespace Elwig.Windows {
             Year = year;
             // using (var ctx = new AppDbContext()) { SeasonLocked = ctx.Seasons.Find(Year + 1) != null; }
             Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
-            AutoAdjustSharesButton.IsEnabled = !SeasonLocked;
+            AutoAdjustBsButton.IsEnabled = !SeasonLocked;
-            UnAdjustSharesButton.IsEnabled = !SeasonLocked;
+            UnAdjustBsButton.IsEnabled = !SeasonLocked;
             SaveCustomButton.IsEnabled = !SeasonLocked;
             RemoveCustomButton.IsEnabled = !SeasonLocked;
             CustomAmountInput.IsEnabled = !SeasonLocked;
             CustomCommentInput.IsEnabled = !SeasonLocked;
 
-            AllowanceKgInput.Text = $"{App.Client.AutoAdjustShares.AllowanceKg}";
+            AllowanceKgInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKg}";
-            AllowanceShareInput.Text = $"{App.Client.AutoAdjustShares.AllowanceShares}";
+            AllowanceBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceBs}";
-            AllowanceKgPerShareInput.Text = $"{App.Client.AutoAdjustShares.AllowanceKgPerShare}";
+            AllowanceKgPerBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKgPerBs}";
-            AllowancePercentInput.Text = $"{App.Client.AutoAdjustShares.AllowancePercent}";
+            AllowancePercentInput.Text = $"{App.Client.AutoAdjustBs.AllowancePercent}";
-            MinSharesInput.Text = $"{App.Client.AutoAdjustShares.MinShares}";
+            MinBsInput.Text = $"{App.Client.AutoAdjustBs.MinBs}";
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var members = await ctx.FetchMembers(includeNotActive: true)
+            var members = await ctx.Members
                 .Select(m => new {
                     m.MgNr,
                     m.Name,
                     m.GivenName,
-                    m.SharesActive,
+                    m.BusinessShares,
                     m.IsActive,
                 })
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
                 .ToListAsync();
-            var season = await ctx.FetchSeasons(Year).SingleAsync();
+            var season = (await ctx.Seasons.FindAsync(Year))!;
             var contracts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
 
-            var (tbl1, _, _) = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
+            var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
             var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, Year);
-            var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.WeightTotal);
+            var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
             var areaComs = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
             CustomPayments = await ctx.CustomPayments.Where(p => p.Year == Year).ToDictionaryAsync(p => p.MgNr, p => p);
 
             var history = await ctx.MemberHistory
-                .Where(h => h.DeductYear == Year)
+                .Where(h => h.DateString.CompareTo($"{Year}-01-01") >= 0 && h.DateString.CompareTo($"{Year}-12-31") <= 0 && h.Type == "auto" && h.BusinessShares > 0)
-                .GroupBy(h => h.ToMember)
+                .GroupBy(h => h.Member)
-                .ToDictionaryAsync(h => h.Key.MgNr, h => h.Sum(g => g.Shares));
+                .ToDictionaryAsync(h => h.Key.MgNr, h => h.Sum(g => g.BusinessShares));
 
             var list = members
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
                     m.IsActive,
-                    SharesActive = m.SharesActive - history.GetValueOrDefault(m.MgNr, 0),
+                    BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
-                    DeliveryObligation = (m.SharesActive - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerShare,
+                    DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
-                    DeliveryRight = (m.SharesActive - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerShare,
+                    DeliveryRight = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerBusinessShare,
                     Adjust = history.TryGetValue(m.MgNr, out int v2) ? (int?)v2 : null,
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive,
+                    m.BusinessShares,
                     Weight = weight.GetValueOrDefault(m.MgNr, 0),
                     OverUnder = weight.TryGetValue(m.MgNr, out int v1) ?
                         (v1 < m.DeliveryObligation ? (int?)v1 - m.DeliveryObligation :
@@ -86,12 +88,12 @@ namespace Elwig.Windows {
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
+                    m.BusinessShares, m.Weight, m.OverUnder,
-                    PenaltyShares = m.OverUnder != null && m.OverUnder < 0 ?
+                    PenaltyBs = m.OverUnder != null && m.OverUnder < 0 ?
                         (season.PenaltyPerKg * m.OverUnder ?? 0) +
                         (-season.PenaltyAmount ?? 0) +
-                        (season.PenaltyPerShareAmount * Math.Floor(m.OverUnder / season.MinKgPerShare ?? 0m) ?? 0) +
+                        (season.PenaltyPerBsAmount * Math.Floor(m.OverUnder / season.MinKgPerBusinessShare ?? 0m) ?? 0) +
-                        (m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerShareNone * m.SharesActive ?? 0) : 0)
+                        (m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerBsNone * m.BusinessShares ?? 0) : 0)
                         : (decimal?)null,
                     PenaltyAc = areaComs.TryGetValue(m.MgNr, out var c) ? c.Select(r => {
                             var con = contracts[r.Key];
@@ -103,30 +105,30 @@ namespace Elwig.Windows {
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
+                    m.BusinessShares, m.Weight, m.OverUnder,
-                    PenaltyShares = m.PenaltyShares == null || m.PenaltyShares == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyShares, 2),
+                    PenaltyBs = m.PenaltyBs == null || m.PenaltyBs == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyBs, 2),
                     PenaltyAc = m.PenaltyAc == null ? (decimal?)null : Math.Round((decimal)m.PenaltyAc, 2),
                     m.Adjust,
                     AdjustAmount = m.AdjustAmount == null ? (decimal?)null : Math.Round((decimal)m.AdjustAmount, 2),
                     CustomAmount = m.Custom?.Amount,
-                    m.Custom?.ModAbs,
+                    ModAbs = m.Custom?.ModAbs,
-                    m.Custom?.ModRel,
+                    ModRel = m.Custom?.ModRel,
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
+                    m.BusinessShares, m.Weight, m.OverUnder,
-                    m.PenaltyShares, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
-                    Total = (m.PenaltyShares ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.CustomAmount ?? 0),
+                    Total = (m.PenaltyBs ?? 0) + (m.PenaltyAc ?? 0) + (m.AdjustAmount ?? 0) + (m.CustomAmount ?? 0),
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
+                    m.BusinessShares, m.Weight, m.OverUnder,
-                    m.PenaltyShares, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
                     m.Total,
                     Background = m.Weight == 0 ? Brushes.Orange : m.Weight / 2 < -m.Total ? Brushes.Red : Brushes.White,
                     Foreground = m.Total == 0 ? Brushes.Gray : Brushes.Black,
                 })
-                .Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyShares != null || m.PenaltyAc != null || m.CustomAmount != null || m.ModAbs != null || m.ModRel != null)
+                .Where(m => m.OverUnder != null || m.Adjust != null || m.PenaltyBs != null || m.PenaltyAc != null || m.CustomAmount != null || m.ModAbs != null || m.ModRel != null)
                 .OrderByDescending(m => m.OverUnder ?? 0)
                 .ThenBy(m => m.Name)
                 .ThenBy(m => m.GivenName)
@@ -136,54 +138,62 @@ namespace Elwig.Windows {
             MemberList.ItemsSource = list;
 
             var sym = season.Currency.Symbol ?? season.Currency.Code;
-            PenaltyBusinessShares.Text = $"{list.Count(r => r.PenaltyShares != null && r.PenaltyShares != 0)} Mg. / {list.Sum(r => r.PenaltyShares):N2} {sym}";
+            PenaltyBusinessShares.Text = $"{list.Count(r => r.PenaltyBs != null && r.PenaltyBs != 0)} Mg. / {list.Sum(r => r.PenaltyBs):N2} {sym}";
             PenaltyAreaCommitments.Text = $"{list.Count(r => r.PenaltyAc != null && r.PenaltyAc != 0)} Mg. / {list.Sum(r => r.PenaltyAc):N2} {sym}";
             AutoBusinessShareAdjustment.Text = $"{list.Count(r => r.Adjust > 0)} Mg. / {list.Sum(r => r.Adjust)} GA / {list.Sum(r => r.AdjustAmount):N2} {sym}";
             CustomModifiers.Text = $"{list.Count(r => r.CustomAmount != null)} Mg. / {list.Sum(r => r.CustomAmount):N2} {sym}";
             TotalModifiers.Text = $"{list.Count(r => r.Total != 0)} Mg. / {list.Sum(r => r.Total):N2} {sym}";
             NonDeliveries.Text = $"{list.Count(r => r.Weight == 0):N0}";
 
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: true).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ThenBy(m => m.MgNr)
+                .ToListAsync());
             CustomAmountInput.Unit = sym;
         }
 
-        private async void AutoAdjustSharesButton_Click(object sender, RoutedEventArgs evt) {
+        private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
-                double? shares = AllowanceShareInput.Text == "" ? null : double.Parse(AllowanceShareInput.Text);
+                double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
-                int? kgPerShare = AllowanceKgPerShareInput.Text == "" ? null : int.Parse(AllowanceKgPerShareInput.Text);
+                int? kgPerBs = AllowanceKgPerBsInput.Text == "" ? null : int.Parse(AllowanceKgPerBsInput.Text);
                 double? percent = AllowancePercentInput.Text == "" ? null : double.Parse(AllowancePercentInput.Text);
-                int? minShares = MinSharesInput.Text == "" ? null : int.Parse(MinSharesInput.Text);
+                int? minBs = MinBsInput.Text == "" ? null : int.Parse(MinBsInput.Text);
 
-                App.Client.AutoAdjustShares.AllowanceKg = kg;
+                App.Client.AutoAdjustBs.AllowanceKg = kg;
-                App.Client.AutoAdjustShares.AllowanceShares = shares;
+                App.Client.AutoAdjustBs.AllowanceBs = bs;
-                App.Client.AutoAdjustShares.AllowanceKgPerShare = kgPerShare;
+                App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
-                App.Client.AutoAdjustShares.AllowancePercent = percent;
+                App.Client.AutoAdjustBs.AllowancePercent = percent;
-                App.Client.AutoAdjustShares.MinShares = minShares;
+                App.Client.AutoAdjustBs.MinBs = minBs;
 
                 await Task.Run(async () => {
                     await App.Client.UpdateValues();
-                    var b = await Billing.Create(Year);
+                    var b = new Billing(Year);
-                    await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, shares ?? default, kgPerShare ?? default, percent / 100.0 ?? default, minShares ?? default);
+                    await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
                 });
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("GA Nachzeichnen", 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, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
 
-        private async void UnAdjustSharesButton_Click(object sender, RoutedEventArgs evt) {
+        private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 await Task.Run(async () => {
-                    var b = await Billing.Create(Year);
+                    var b = new Billing(Year);
                     await b.UnAdjustBusinessShares();
                 });
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("GA Nachzeichnen", 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, "GA Nachzeichnen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -196,7 +206,7 @@ namespace Elwig.Windows {
             Validator.CheckInteger((TextBox)sender, false, 6);
         }
 
-        private void SharesInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void BsInput_TextChanged(object sender, TextChangedEventArgs evt) {
             Validator.CheckInteger((TextBox)sender, false, 3);
         }
 
@@ -300,7 +310,9 @@ namespace Elwig.Windows {
                 });
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Benutzerdefinierten Zu-/Abschlag speichern", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -188,7 +188,7 @@
                       Margin="110,135,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
             <CheckBox x:Name="ConsiderAutoInput" IsChecked="{Binding ConsiderAuto, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="(Automatische) Nachzeichnungen von GA"
+                      Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
             <CheckBox x:Name="ConsiderCustomInput" IsChecked="{Binding ConsiderCustom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -48,6 +48,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(PaymentVariantList, await ctx.PaymentVariants
                 .Where(v => v.Year == Year)
                 .OrderBy(v => v.AvNr)
+                .Include(v => v.Season.Currency)
                 .ToListAsync());
             if (PaymentVariantList.SelectedItem == null && PaymentVariantList.Items.Count > 0) {
                 PaymentVariantList.SelectedIndex = PaymentVariantList.Items.Count - 1;
@@ -90,7 +91,9 @@ namespace Elwig.Windows {
                 App.HintContextChange();
                 ControlUtils.SelectItem(PaymentVariantList, v);
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Auszahlungsvariante erstellen", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante erstellen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -104,7 +107,9 @@ namespace Elwig.Windows {
                 App.HintContextChange();
                 ControlUtils.SelectItem(PaymentVariantList, n);
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Auszahlungsvariante kopieren", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -112,14 +117,19 @@ namespace Elwig.Windows {
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant)
                 return;
-            if (!InteractionService.AskContinue("Auszahlungsvariante löschen", $"Soll die Auszahlungsvariante \"{v.Name}\" wirklich unwiderruflich gelöscht werden?"))
+            var res = MessageBox.Show(
+                $"Soll die Auszahlungsvariante \"{v.Name}\" wirklich unwiderruflich gelöscht werden?",
+                "Auszahlungsvariante löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (res != MessageBoxResult.OK)
                 return;
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowDbException("Auszahlungsvariante löschen", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante löschen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -133,7 +143,7 @@ namespace Elwig.Windows {
                 await PaymentVariantService.Calculate(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowException("Berechnungsfehler", exc);
+                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
             ViewModel.CalculateIsEnabled = true;
@@ -195,7 +205,7 @@ namespace Elwig.Windows {
                 await PaymentVariantService.Commit(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
             ViewModel.RevertIsEnabled = true;
@@ -204,9 +214,11 @@ namespace Elwig.Windows {
         private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;
-            if (!InteractionService.AskConfirmation("Traubengutschriften löschen",
+            var res = MessageBox.Show(
                 "Sollen wirklich alle festgesetzten Traubengutschriften der ausgewählten Auszahlungsvariante unwiderruflich gelöscht werden?\n\n" +
-                "Dies ist im Allgemeinen nie empfohlen. Handelt es sich um die aktuellste Auszahlungsvariante könnte das eine Ausnahme sein."))
+                "Dies ist im Allgemeinen nie empfohlen. Handelt es sich um die aktuellste Auszahlungsvariante könnte das eine Ausnahme sein.",
+                "Traubengutschriften löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
                 return;
             ViewModel.RevertIsEnabled = false;
             Mouse.OverrideCursor = Cursors.Wait;
@@ -214,7 +226,7 @@ namespace Elwig.Windows {
                 await PaymentVariantService.Revert(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
             ViewModel.CommitIsEnabled = true;
@@ -224,7 +236,7 @@ namespace Elwig.Windows {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 return;
             } else if (v.TransferDate == null) {
-                InteractionService.ShowError("Exportieren nicht möglich", "Überweisungsdatum muss gesetzt sein!");
+                MessageBox.Show("Überweisungsdatum muss gesetzt sein!", "Exportieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Error);
                 return;
             }
             await PaymentVariantService.GenerateEbics(v.Year, v.AvNr);
@@ -244,11 +256,13 @@ namespace Elwig.Windows {
                 await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
                 App.HintContextChange();
             } catch (Exception exc) {
-                await ForceContextReload();
+                await HintContextChange();
-                InteractionService.ShowDbException("Auszahlungsvariante aktualisieren", exc);
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
-            await EnsureContextRenewed();
+            await HintContextChange();
             CommentInput_TextChanged(null, null);
             DateInput_TextChanged(null, null);
             TransferDateInput_TextChanged(null, null);