[WIP] Entities: Add AreaComContract to group area commitments together

.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,125 +2,6 @@
 Changelog
 =========
 
-[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}
 ---------------------------------------------
 

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);
             }
         }
 

Elwig/Controls/IntegerUpDown.cs

@@ -47,15 +47,15 @@ namespace Elwig.Controls {
         private void UpdateButtons() {
             var incButton = GetTemplateChild("IncrementButton") as RepeatButton;
             var decButton = GetTemplateChild("DecrementButton") as RepeatButton;
-            incButton?.IsEnabled = Maximum == null || Value < Maximum;
+            incButton?.IsEnabled = Maximum != null && Value < Maximum;
-            decButton?.IsEnabled = Minimum == null || Value > Minimum;
+            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)]);
             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;

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using System;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -20,7 +19,6 @@ namespace Elwig.Dialogs {
             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;
@@ -28,8 +26,7 @@ namespace Elwig.Dialogs {
                 DescBlock1.Visibility = Visibility.Hidden;
                 DescBlock2.Visibility = Visibility.Visible;
             }
-            SeasonInput.Minimum = yearFrom.HasValue ? yearFrom + 1 : null;
+            SeasonInput.Minimum = yearFrom + 1;
-            SeasonInput.Maximum = yearTo.HasValue ? yearTo : null;
             if (forceRetroactive || (yearTo.HasValue && yearTo < Utils.CurrentYear) || (yearFrom.HasValue && yearFrom >= Utils.CurrentYear)) {
                 RetroactiveInput.IsChecked = true;
             } else {
@@ -53,7 +50,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.CurrentYear}";
                 DescBlock1.Visibility = QuestionBlock1.Visibility;
                 DescBlock2.Visibility = QuestionBlock2.Visibility;
             }

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

@@ -18,12 +18,10 @@ namespace Elwig.Documents {
     public class BusinessDocument : Document {
 
         public Member Member;
-        public MemberHistoryPoint MemberHistory;
         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,13 +47,11 @@ 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;
-            MemberHistory = 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) {
@@ -109,7 +105,7 @@ namespace Elwig.Documents {
                 }
             }
 
-            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 +261,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 +314,11 @@ namespace Elwig.Documents {
                 .Where(b => !fbVars.Contains(b.Key))
                 .OrderBy(b => b.Value.Name);
 
-            if (MemberHistory.Shares != 0 || (MemberHistory.SharesRed == 0 && MemberHistory.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(MemberHistory.Shares * (season.MinKgPerShare ?? 0), MemberHistory.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 (MemberHistory.SharesRed != 0 || MemberHistory.SharesWhite != 0) {
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA (rot)", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberHistory.SharesRed * (season.MinKgPerShareRed ?? season.MinKgPerShare ?? 0), MemberHistory.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(MemberHistory.SharesWhite * (season.MinKgPerShareWhite ?? season.MinKgPerShare ?? 0), MemberHistory.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,36 +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) {
                 var fromDate = $"{season.Year}-01-01";
                 var toDate = $"{season.Year}-12-31";
-                MemberAutoBusinessShares = await ctx.MemberHistory
+                MemberAutoBusinessShares = ctx.MemberHistory
-                    .Where(h => h.ToMgNr == Member.MgNr && h.Reason == "auto")
+                    .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
                     .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
-                    .SumAsync(h => h.Shares);
+                    .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 : ""),
@@ -135,9 +104,8 @@ 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()
@@ -163,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 {
@@ -171,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));
@@ -304,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) {
@@ -332,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,53 +5,33 @@ 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) {
-            await base.LoadData(ctx);
-            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);
-            MemberHistory = 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;
@@ -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,15 +113,14 @@ 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}", right: true));
                         sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, right: 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,45 +25,16 @@ 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;
-        }
+            Date = DateOnly.FromDateTime(d.ModifiedAt);
-
+            IsDoublePaged = true;
-        public static async Task<DeliveryNote> Initialize(int year, int did) {
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
-            using var ctx = new AppDbContext();
-            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);
-            MemberHistory = 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) {
@@ -86,7 +53,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);
@@ -126,8 +128,6 @@ namespace Elwig.Documents {
             }
         }
 
-        protected virtual async Task LoadData(AppDbContext ctx) { }
-
         protected virtual void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
 
         protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
@@ -136,7 +136,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);
@@ -181,7 +181,6 @@ namespace Elwig.Documents {
                             merger.Merge(src, 1, src.GetNumberOfPages());
                             p += 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);
@@ -234,7 +233,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();

Elwig/Documents/Letterhead.cs

@@ -6,7 +6,7 @@ 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) {
         }
 
         protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {

Elwig/Documents/MemberDataSheet.cs

@@ -5,56 +5,32 @@ 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 Dictionary<string, MemberBucket> MemberBuckets = [];
-        public List<AreaCom> ActiveAreaCommitments = [];
 
-        public MemberDataSheet(Member m) :
+        public MemberDataSheet(Member m, AppDbContext ctx) :
-            base($"{Name} {m.AdministrativeName}", m, DateOnly.FromDateTime(m.ModifiedAt)) {
+            base($"{Name} {m.AdministrativeName}", m) {
-            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");
-            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) {
@@ -62,7 +38,7 @@ namespace Elwig.Documents {
                     firstOnPage = true;
                 }
                 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());
             }
         }
 
@@ -76,7 +52,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)
@@ -136,21 +112,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)
@@ -161,8 +134,8 @@ 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(),
                 Size = group.Sum(c => c.Area)
@@ -204,7 +177,7 @@ namespace Elwig.Documents {
             }
 
             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;

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.SharesTotal: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();
@@ -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.0.5.6</Version>
+    <Version>1.0.4.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -23,21 +23,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="151.0.7906" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="148.0.7749" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="itext" Version="9.6.0" />
+    <PackageReference Include="itext" Version="9.5.0" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.6.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.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4022.49" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.5" />
-    <PackageReference Include="NJsonSchema" Version="11.6.1" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3856.49" />
-    <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.5" />
-    <PackageReference Include="System.Management" Version="10.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.5" />
+    <PackageReference Include="System.Management" Version="10.0.5" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -1,6 +1,5 @@
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -11,10 +10,10 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Windows;
 
 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);
@@ -83,71 +82,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 +95,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,58 +119,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.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();
@@ -252,23 +139,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 AreaCommitmentContracts.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() {
@@ -286,107 +173,88 @@ namespace Elwig.Helpers {
         }
 
         public async Task<int> NextRevNr(int fbnr) {
-            return (await AreaCommitments.Where(c => c.FbNr == fbnr).Select(c => (int?)c.RevNr).MaxAsync() ?? 0) + 1;
+            int c = 0;
+            (await AreaCommitments.Where(c => c.FbNr == fbnr).Select(c => c.RevNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 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 IAsyncEnumerable<Branch> FetchBranches(string? zwstid = null, bool includeWithoutMembers = true) {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
-            return _compiledQueryBranches.Invoke(this, zwstid, includeWithoutMembers);
+            foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
-        }
-
-        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) {
@@ -402,22 +270,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();
@@ -508,12 +360,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);
@@ -553,12 +399,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 = 38;
 
         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 = 'auto' AND SUBSTR(date, 1, 4) = '{Year}';
+                UPDATE member
-                INSERT INTO member_history (histnr, from_mgnr, from_type, to_mgnr, to_type, date, reason, source, shares, value_per_share, currency)
+                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}', 'auto', 'elwig',
+                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
+                       '{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 = 'auto' AND SUBSTR(date, 1, 4) = '{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,5 +1,4 @@
 using Elwig.Models.Entities;
-using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -9,6 +8,7 @@ using System.IO.Compression;
 using System.Linq;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace Elwig.Helpers.Export {
     public static class ElwigData {
@@ -41,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));
@@ -59,7 +59,6 @@ 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,
@@ -77,7 +76,7 @@ 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"] = [],
@@ -143,17 +142,6 @@ namespace Elwig.Helpers.Export {
                             }
                         }
 
-                        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) {
@@ -220,21 +208,26 @@ 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 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)>();
 
-                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, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
@@ -246,12 +239,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))
@@ -321,9 +308,9 @@ namespace Elwig.Helpers.Export {
                     }
 
                     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)));
@@ -341,13 +328,8 @@ namespace Elwig.Helpers.Export {
                         importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
                     }
 
-                    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.RemoveRange(ctx.AreaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
                         ctx.UpdateRange(contracts.Where(c => duplicateFbNrs.Contains(c.FbNr)));
                         ctx.AddRange(areaCommitments.Where(c => duplicateFbNrs.Contains(c.FbNr)));
                     }
@@ -357,9 +339,8 @@ namespace Elwig.Helpers.Export {
                     }
                     if (contracts.Count > 0) {
                         ctx.AddRange(riede);
-                        var n = importNewContracts ? contracts.Count - duplicateFbNrs.Count : 0;
+                        var imported = contracts.Where(c => (importNewContracts && !duplicateFbNrs.Contains(c.FbNr)) || (importDuplicateContracts && duplicateFbNrs.Contains(c.FbNr))).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) {
@@ -368,10 +349,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))));
@@ -383,10 +363,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))));
@@ -402,9 +381,7 @@ namespace Elwig.Helpers.Export {
                         importedDeliveries.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, deliveries.Count - n - o, meta.DeliveryFilters));
                     }
 
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
                     await ctx.SaveChangesAsync();
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
 
                     var primaryKeys = new Dictionary<string, string>() {
                         ["member"] = "mgnr, 0, 0",
@@ -431,7 +408,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", [
@@ -441,10 +418,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)}",
@@ -453,32 +430,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<AreaComContract> 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);
@@ -494,7 +476,6 @@ 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<AreaComContract> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
             public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
 
@@ -514,21 +495,17 @@ 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 {
                             ["count"] = AreaComs.Value.AreaComs.Count(),
@@ -559,13 +536,6 @@ 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);
                     using var writer = new StreamWriter(json.Open(), Utils.UTF8);
@@ -624,10 +594,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,
@@ -696,10 +663,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>(),
@@ -744,40 +708,6 @@ namespace Elwig.Helpers.Export {
              DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
-        public static JsonObject ToJson(this MemberHistory h) {
-            return new JsonObject {
-                ["histnr"] = h.HistNr,
-                ["from_mgnr"] = h.FromMgNr,
-                ["from_type"] = h.FromType,
-                ["to_mgnr"] = h.ToMgNr,
-                ["to_type"] = h.ToType,
-                ["date"] = h.DateString,
-                ["reason"] = h.Reason,
-                ["source"] = h.Source,
-                ["shares"] = h.Shares,
-                ["value_per_share"] = h.ValuePerShare,
-                ["currency"] = h.CurrencyCode,
-                ["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 = json["from_type"]?.AsValue().GetValue<int>(),
-                ToMgNr = json["to_mgnr"]?.AsValue().GetValue<int>(),
-                ToType = json["to_type"]?.AsValue().GetValue<int>(),
-                DateString = json["date"]!.AsValue().GetValue<string>(),
-                Reason = json["reason"]!.AsValue().GetValue<string>(),
-                Source = json["source"]!.AsValue().GetValue<string>(),
-                Shares = json["shares"]!.AsValue().GetValue<int>(),
-                ValuePerShare = json["value_per_share"]?.AsValue().GetValue<decimal>(),
-                CurrencyCode = json["currency"]?.AsValue().GetValue<string>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
-            };
-        }
-
         public static JsonObject ToJson(this AreaComContract c) {
             return new JsonObject {
                 ["fbnr"] = c.FbNr,
@@ -930,7 +860,7 @@ namespace Elwig.Helpers.Export {
                 ["ried"] = p.Rd?.Name,
                 ["net_weight"] = p.IsNetWeight,
                 ["manual_weighing"] = p.IsManualWeighing,
-                ["modids"] = new JsonArray(p.PartModifiers.Select(m => (JsonNode)m.ModId).ToArray()),
+                ["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}",

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/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/Dtos/CreditNoteData.cs

@@ -29,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),
@@ -56,9 +56,9 @@ namespace Elwig.Models.Dtos {
                        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
@@ -94,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;
@@ -122,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);
@@ -179,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),
-            ("SharesTotal", "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,11 +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 SharesDormant;
-        public int SharesTotal;
         public string Address;
         public int Plz;
         public string Locality;
@@ -102,11 +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;
-            SharesDormant = m.SharesDormant;
-            SharesTotal = Shares + SharesRed + SharesWhite + SharesDormant;
             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/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

@@ -67,22 +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 SharesTotal => Shares + SharesRed + SharesWhite + SharesDormant;
-        [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,23 +1,12 @@
-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("histnr")]
+        [Column("mgnr")]
-        public int HistNr { get; set; }
+        public int MgNr { get; set; }
-
-        [Column("from_mgnr")]
-        public int? FromMgNr { get; set; }
-        [Column("from_type")]
-        public int? FromType { get; set; }
-
-        [Column("to_mgnr")]
-        public int? ToMgNr { get; set; }
-        [Column("to_type")]
-        public int? ToType { get; set; }
 
         [Column("date")]
         public required string DateString { get; set; }
@@ -27,39 +16,16 @@ namespace Elwig.Models.Entities {
             set => value.ToString("yyyy-MM-dd");
         }
 
-        [Column("reason")]
+        [Column("type")]
-        public required string Reason { get; set; }
+        public required string Type { get; set; }
 
-        [Column("source")]
+        [Column("business_shares")]
-        public required string Source { get; set; }
+        public int BusinessShares { get; set; }
-
-        [Column("shares")]
-        public int Shares { 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("comment")]
         public string? Comment { get; set; }
 
-        [ForeignKey("FromMgNr")]
+        [ForeignKey("MgNr")]
-        public virtual Member FromMember { get; private set; } = null!;
+        public virtual Member Member { 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

@@ -153,27 +153,6 @@ 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

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,318 +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;
-ALTER TABLE member ADD COLUMN shares_white     INTEGER NOT NULL DEFAULT 0;
-ALTER TABLE member ADD COLUMN shares_dormant   INTEGER NOT NULL DEFAULT 0;
-
-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            TEXT    NOT NULL CHECK (date 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,
-    value_per_share INTEGER DEFAULT NULL,
-    currency        TEXT    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, reason, source, shares, value_per_share, currency, comment)
-SELECT ROW_NUMBER() OVER(ORDER BY h.date, h.mgnr), NULL, NULL, h.mgnr, 1, h.date, h.type, 'elwig', h.business_shares, s.bs_value / POW(10, s.precision - 2), s.currency, comment
-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 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, 1, 4) + 0) > s.year AND h1.from_mgnr = m.mgnr
-    LEFT JOIN member_history h2 ON (SUBSTR(h2.date, 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, 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 = 'auto' AND h.source = 'elwig'
-GROUP BY year, h.to_mgnr
-ORDER BY year, h.to_mgnr;
-
-PRAGMA writable_schema = OFF;

Elwig/Services/AreaComService.cs

@@ -20,7 +20,6 @@ namespace Elwig.Services {
         }
 
         public static void ClearInputs(this AreaComAdminViewModel vm) {
-            vm.Period = null;
         }
 
         public static void FillInputs(this AreaComAdminViewModel vm, AreaComContract c) {
@@ -56,9 +55,9 @@ 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 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];

Elwig/Services/DeliveryAncmtService.cs

@@ -8,6 +8,8 @@ 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;
@@ -63,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];
@@ -259,20 +261,37 @@ 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;
             }
         }
 
@@ -299,13 +318,18 @@ namespace Elwig.Services {
                 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
@@ -346,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);
                     }
                 }
 
@@ -369,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,11 @@ 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;
@@ -25,7 +27,10 @@ namespace Elwig.Services {
 
         public static async Task<Member?> GetMemberAsync(int mgnr) {
             using var ctx = new AppDbContext();
-            return await ctx.FetchMembers(mgnr).SingleOrDefaultAsync();
+            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) {
@@ -66,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)!);
             }
 
@@ -124,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];
@@ -467,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);
@@ -544,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;
             });
@@ -570,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,
@@ -600,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;
@@ -635,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) {
@@ -651,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;
@@ -684,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) {
@@ -699,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++;
@@ -725,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) {
@@ -765,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;
             }
         }
 
@@ -823,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) {
@@ -843,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;
             }
         }
 
@@ -880,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;
             }
         }
 
@@ -928,15 +987,26 @@ 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;
             }
         }
 
@@ -978,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 })
@@ -1045,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) {
@@ -1066,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}]")))}";
                 }
             }
@@ -1135,11 +1198,12 @@ namespace Elwig.Services {
                     attrid = $"'{attr.AttrId}'";
                 }
                 var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Attribut setzen",
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) das Attribut\n'{attributeName}' gesetz werden?",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) das Attribut\n'{attributeName}' gesetz werden?"))
+                    "Massenaktion: Attribut setzen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    return;
+                if (res != MessageBoxResult.OK) return;
 
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     using (var cnx = await AppDbContext.ConnectAsync()) {
                         await cnx.ExecuteBatch($"""
                         UPDATE delivery_part SET attrid = {attrid}
@@ -1149,7 +1213,9 @@ namespace Elwig.Services {
                     App.HintContextChange();
                 });
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -1162,11 +1228,12 @@ namespace Elwig.Services {
                 }
 
                 var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Zu-/Abschlag hinzufügen",
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' hinzugefügt werden?",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' hinzugefügt werden?"))
+                    "Massenaktion: Zu-/Abschlag hinzufügen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    return;
+                if (res != MessageBoxResult.OK) return;
 
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     using (var cnx = await AppDbContext.ConnectAsync()) {
                         await cnx.ExecuteBatch($"""
                         INSERT INTO delivery_part_modifier (year, did, dpnr, modid)
@@ -1177,7 +1244,9 @@ namespace Elwig.Services {
                     App.HintContextChange();
                 });
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -1190,11 +1259,12 @@ namespace Elwig.Services {
                 }
 
                 var dids = await vm.GetDidsFromFilters();
-                if (!InteractionService.AskContinue("Massenaktion: Zu-/Abschlag entfernen",
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' entfernt werden?",
-                    $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' entfernt werden?"))
+                    "Massenaktion: Zu-/Abschlag entfernen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                    return;
+                if (res != MessageBoxResult.OK) return;
 
-                await Utils.RunForeground(async () => {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                     using (var cnx = await AppDbContext.ConnectAsync()) {
                         await cnx.ExecuteBatch($"""
                         DELETE FROM delivery_part_modifier
@@ -1204,7 +1274,9 @@ namespace Elwig.Services {
                     App.HintContextChange();
                 });
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
     }

Elwig/Services/InteractionService.cs

@@ -1,150 +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 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/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,69 +488,111 @@ 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).DistinctBy(h => h.HistNr).OrderBy(h => h.HistNr).ToList();
+                                .Include(m => m.TelephoneNumbers)
-                        var areaComs = await query
+                                .Include(m => m.EmailAddresses)
-                            .SelectMany(m => m.AreaCommitments)
+                                .Include(m => m.DefaultWbKg!.Gl)
-                            .Select(c => c.Contract).Distinct()
+                                .AsSplitQuery()
-                            .Include(c => c.Revisions)
+                                .ToListAsync();
-                            .ToListAsync();
+                            var areaComs = await query
-                        var wbKgs = members
+                                .SelectMany(m => m.AreaCommitments)
-                            .Where(m => m.DefaultWbKg != null)
+                                .Select(c => c.Contract).Distinct()
-                            .Select(m => m.DefaultWbKg!)
+                                .Include(c => c.Rd)
-                            .Union(areaComs.Select(c => c.Kg))
+                                .Include(c => c.Kg.Gl)
-                            .Distinct()
+                                .Include(c => c.Revisions)
-                            .OrderBy(k => k.KgNr)
+                                .ToListAsync();
-                            .ToList();
+                            var wbKgs = members
-                        await ElwigData.Export(filename, members, history, areaComs, wbKgs, filterNames);
+                                .Where(m => m.DefaultWbKg != null)
+                                .Select(m => m.DefaultWbKg!)
+                                .Union(areaComs.Select(c => c.Kg))
+                                .Distinct()
+                                .OrderBy(k => k.KgNr)
+                                .ToList();
+                            await ElwigData.Export(d.FileName, members, areaComs, wbKgs, filterNames);
+                        } catch (Exception exc) {
+                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                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;
             }
         }
 
@@ -557,10 +623,7 @@ namespace Elwig.Services {
 
                 EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.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,
-                SharesWhite = App.Client.HasRedWhite ? vm.BusinessShares2 ?? 0 : 0,
-                SharesDormant = App.Client.HasRedWhite ? vm.BusinessShares3 ?? 0 : vm.BusinessShares2 ?? 0,
                 AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
                 IsActive = vm.IsActive,
                 IsVollLieferant = vm.IsVollLieferant,
@@ -662,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;
             }
         }
 
@@ -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,6 +10,7 @@ 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 {
@@ -24,20 +25,18 @@ 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.HistNr).ToList();
                 var areaComs = await query
                     .SelectMany(m => m.AreaCommitments)
                     .Select(c => c.Contract).Distinct()
                     .OrderBy(c => c.FbNr)
+                    .Include(c => c.Rd)
+                    .Include(c => c.Kg.Gl)
                     .Include(c => c.Revisions)
                     .ToListAsync();
                 var wbKgs = members
@@ -48,20 +47,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);
-                    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);
             }
         }
 
@@ -72,7 +73,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)
@@ -82,20 +86,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);
-                    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);
             }
         }
 
@@ -108,19 +114,27 @@ namespace Elwig.Services {
                 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
                        .Where(ChangedAreaComContracts)
+                       .Include(c => c.Rd)
+                       .Include(c => c.Kg.Gl)
                        .Include(c => c.Revisions)
                        .OrderBy(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
@@ -134,7 +148,8 @@ 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 {
@@ -145,14 +160,15 @@ namespace Elwig.Services {
                     }).Export(path);
                     await Utils.UploadExportData(path, url, username, password);
                     await UpdateExportedAt(members, areaComs, 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, {areaComs.Count:N0} Flächenbindungsverträgen, 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);
             }
         }
 
@@ -163,8 +179,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)
@@ -173,20 +192,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);
-                    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);
             }
         }
 
@@ -225,11 +246,11 @@ 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);
             }
         }
 
@@ -256,7 +277,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.AreaCommitmentContracts.AnyAsync(ChangedAreaComContracts) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
             } catch {
                 return false;
             }

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -20,7 +20,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;
@@ -124,22 +124,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;

Elwig/Windows/AboutWindow.xaml

@@ -15,7 +15,7 @@
             <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/>
             <LineBreak/>
             <Bold>Verwendete Technologien:</Bold><LineBreak/>

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;
                 }
@@ -349,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();
             }
 
@@ -389,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="550" Width="1000" MinWidth="860"
+        Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:AreaComAdminViewModel/>
     </Window.DataContext>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -39,6 +39,10 @@ namespace Elwig.Windows {
             ViewModel.FilterSeason = Utils.CurrentYear;
         }
 
+        private void Window_Loaded(object sender, RoutedEventArgs e) {
+            LockInputs();
+        }
+
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
             if (!IsEditing && !IsCreating) {
                 SearchInput.Focus();
@@ -47,44 +51,42 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshList(bool updateSort = false) {
-            var vm = ViewModel;
+            using var ctx = new AppDbContext();
-            var cursor = Mouse.OverrideCursor != null;
+            var (_, contractQuery, areaComQuery, filter) = await ViewModel.GetFilters(ctx);
-            if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
+            var contracts = await contractQuery
-            var query = (vm.SearchQuery, vm.FilterSeason);
+                .Include(c => c.Kg.AtKg)
-            var (filter, contracts, areaComs, areaComCount, stat) = await Task.Run(async () => {
+                .Include(c => c.Rd!.Kg.AtKg)
-                using var ctx = new AppDbContext();
+                .Include(c => c.Revisions).ThenInclude(a => a.WineCult)
-                var (_, contractQuery, areaComQuery, filter) = await vm.GetFilters(ctx);
+                .Include(c => c.Revisions).ThenInclude(a => a.AreaComType.WineAttr)
-                var contracts = await contractQuery
+                .Include(c => c.Revisions).ThenInclude(a => a.AreaComType.WineVar)
-                    .Include(c => c.Revisions).ThenInclude(a => a.Member)
+                .Include(c => c.Revisions).ThenInclude(a => a.Member)
-                    .ToListAsync();
+                .ToListAsync();
-                var areaComs = await areaComQuery.ToListAsync();
+            var areaComs = await areaComQuery
+                .Include(c => c.Contract.Kg.AtKg)
+                .Include(c => c.Contract.Rd!.Kg.AtKg)
+                .Include(a => a.WineCult)
+                .Include(a => a.AreaComType.WineAttr)
+                .Include(a => a.AreaComType.WineVar)
+                .ToListAsync();
 
-                if (filter.Count > 0 && contracts.Count > 0) {
+            if (filter.Count > 0 && contracts.Count > 0) {
-                    var dict = contracts.AsParallel()
+                var dict = contracts.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.Max(a => a.Value) * 3 / 4;
-                    contracts = [.. dict
+                contracts = [.. dict
                     .Where(a => a.Value > threshold)
                     .Select(a => a.Key)];
-                }
+            }
-
-                var areaComCount = await areaComQuery.CountAsync();
-                var season = await ctx.FetchSeasons().FirstOrDefaultAsync();
-                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);
+                AreaCommitmentList_SelectionChanged, filter.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 {
@@ -151,15 +153,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 +173,12 @@ namespace Elwig.Windows {
                 .Include(c => c.WineAttr)
                 .OrderBy(v => v.VtrgId)
                 .ToListAsync());
-            ControlUtils.RenewItemsSource(MemberInput, await ctx.FetchMembers(includeNotActive: true).ToListAsync());
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
-            var cultList = await ctx.FetchWineCultivations().Cast<object>().ToListAsync();
+                .OrderBy(m => m.Name).ThenBy(m => m.GivenName).ThenBy(m => m.MgNr)
+                .ToListAsync());
+            var cultList = await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem());
             ControlUtils.RenewItemsSource(WineCultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
             await RefreshList();
@@ -246,7 +247,9 @@ namespace Elwig.Windows {
                 }
                 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;
         }
@@ -264,10 +267,8 @@ namespace Elwig.Windows {
             if (InputHasChanged(AreaInput) || InputHasChanged(AreaComTypeInput) || InputHasChanged(MgNrInput)) {
                 var a = (RevisionList.SelectedItem as AreaCom)!;
                 var d = new AreaComModifyDialog(a.YearFrom, a.YearTo, a.Area, false, RevisionList.ItemsSource.Cast<object>().FirstOrDefault() != a);
-                if (d.ShowDialog() != true) {
+                if (d.ShowDialog() != true)
-                    SaveButton.IsEnabled = true;
                     return;
-                }
                 yearTo = d.YearTo;
             }
 
@@ -296,7 +297,9 @@ namespace Elwig.Windows {
                 }
                 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;
@@ -443,19 +446,17 @@ namespace Elwig.Windows {
         }
 
         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;
+            if (ViewModel.FilterSeason == null) return;
             await RefreshList();
         }
 

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,20 +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"/>
-                        </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;
@@ -378,8 +410,6 @@ namespace Elwig.Windows {
             p.EmailAddress = string.IsNullOrEmpty(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
             p.Website = string.IsNullOrEmpty(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
 
-            p.ModeBusinessShares = ParameterBusinessShareModeInput.SelectedIndex;
-            p.EnableMemberHistory = ParameterBusinessShareHistoryInput.IsChecked ?? false;
             p.TextDeliveryNote = string.IsNullOrEmpty(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
             p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
             p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
@@ -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 {
@@ -81,9 +80,14 @@ namespace Elwig.Windows {
             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);
@@ -620,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();
@@ -636,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();
@@ -645,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;
@@ -765,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

@@ -18,8 +18,6 @@ namespace Elwig.Windows {
             }
         }
 
-        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();
         }
 
         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() {
             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>
@@ -529,12 +530,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;
@@ -36,7 +37,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,23 +122,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");
             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);
                 }
             }
         }
@@ -164,7 +163,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);
         }
@@ -172,11 +173,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;
@@ -414,57 +420,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);
@@ -492,7 +486,7 @@ namespace Elwig.Windows {
 
             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}",
@@ -501,9 +495,6 @@ 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 {
@@ -512,7 +503,7 @@ namespace Elwig.Windows {
             };
             noAttr.Click += Menu_BulkAction_SetAttribute_Click;
             Menu_BulkAction_SetAttribute.Items.Add(noAttr);
-            foreach (var attr in attributes) {
+            foreach (var attr in await ctx.WineAttributes.OrderBy(a => a.AttrId).ToListAsync()) {
                 var i = new MenuItem {
                     Header = attr.Name,
                 };
@@ -522,7 +513,7 @@ namespace Elwig.Windows {
 
             Menu_BulkAction_AddModifier.Items.Clear();
             Menu_BulkAction_RemoveModifier.Items.Clear();
-            foreach (var mod in Modifiers.GetValueOrDefault(ViewModel.SelectedDelivery?.Year ?? year, [])) {
+            foreach (var mod in await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.ModId).ToListAsync()) {
                 var i1 = new MenuItem {
                     Header = mod.Name,
                 };
@@ -536,34 +527,44 @@ namespace Elwig.Windows {
             }
 
             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();
         }
 
@@ -575,28 +576,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();
         }
 
@@ -608,6 +617,7 @@ namespace Elwig.Windows {
         }
 
         private void FillInputs(DeliveryPart p) {
+            FillInputs(p.Delivery);
             ClearOriginalValues();
             ClearDefaultValues();
             ViewModel.FillInputs(p);
@@ -634,10 +644,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;
@@ -670,19 +681,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;
@@ -691,7 +700,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;
@@ -711,7 +719,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 {
@@ -793,7 +801,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;
@@ -802,12 +812,11 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
-
             await EnsureContextRenewed();
             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());
             InitialInputs();
         }
 
@@ -829,7 +838,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;
@@ -838,36 +849,46 @@ namespace Elwig.Windows {
             }
 
             EmptyScale();
-
-            Utils.RunBackground("Lieferschein drucken", async () => {
-                using var doc = await DeliveryNote.Initialize(p.Year, p.DId);
-                using (var ctx = new AppDbContext()) {
-                    await doc.Generate(ctx);
-                }
-                if (App.Config.Debug) {
-                    doc.Show();
-                } else {
-                    await doc.Print(2);
-                }
-            });
-
             await EnsureContextRenewed();
+            if (p?.Delivery != null) {
+                try {
+                    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);
+                }
+            }
+
             Mouse.OverrideCursor = null;
             DeliveryList.SelectedItem = null;
+            await EnsureContextRenewed();
             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;
@@ -899,11 +920,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;
@@ -941,7 +972,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;
         }
@@ -988,13 +1021,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;
             }
@@ -1022,7 +1060,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;
@@ -1259,7 +1299,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 {
@@ -386,7 +403,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 {

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();
@@ -691,7 +703,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 +725,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 +755,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 +769,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 +791,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 +804,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 +827,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 +861,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 +909,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 +949,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 +982,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 +1014,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 SharesTotal, StringFormat='{}{0} '}" Width="40">
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -619,16 +620,9 @@
                              Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                    <Label Content="Geschäftsanteile:" Margin="10,65,0,0" Grid.Column="0"/>
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <Label x:Name="BusinessSharesLabel" Content="(rot/weiß/ruhend)" Margin="10,78,0,0" Grid.Column="0" FontSize="10"/>
+                    <TextBox x:Name="BusinessSharesInput" Text="{Binding BusinessSharesString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                    <TextBox x:Name="BusinessShares1Input" Text="{Binding BusinessShares1String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             Margin="0,70,10,0" Width="32" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares2Input" Text="{Binding BusinessShares2String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="37,70,10,0" Width="32" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares3Input" Text="{Binding BusinessShares3String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="74,70,10,0" Width="32" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -13,7 +13,6 @@ using Elwig.Dialogs;
 using Elwig.Services;
 using Elwig.ViewModels;
 using System.Windows.Data;
-using System.Windows.Media;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -44,7 +43,7 @@ namespace Elwig.Windows {
             RequiredInputs = [
                 MgNrInput, GivenNameInput, NameInput,
                 AddressInput, PlzInput, OrtInput, BillingOrtInput,
-                BusinessShares1Input, BusinessShares2Input, BusinessShares3Input, BranchInput, DefaultKgInput
+                BusinessSharesInput, BranchInput, DefaultKgInput
             ];
             EmailAddressInputs = [
                 (EmailAddress1Label, EmailAddress1Input),
@@ -83,27 +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;
-            }
-
             UpdateContactInfoVisibility();
+            LockInputs();
         }
 
         public void FocusMember(int mgnr) {
@@ -129,52 +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, totalMemberCount, totalBusinessShares) = 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 totalMemberCount = await ctx.Members.CountAsync();
+            }
-                var totalBusinessShares = await ctx.Members.SumAsync(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant);
-
-                return (members, totalMemberCount, totalBusinessShares);
-            });
-            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} ({totalMemberCount:N0})";
+            ViewModel.StatusMembers = $"{members.Count:N0} ({await ctx.Members.CountAsync():N0})";
-            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant):N0} ({totalBusinessShares:N0})";
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -206,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 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 {
@@ -298,9 +276,9 @@ 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 bA = $"{await ctx.Members.Where(m => m.IsActive).SumAsync(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant):N0}";
+            var bA = $"{await ctx.Members.Where(m => m.IsActive).SumAsync(m => m.BusinessShares):N0}";
-            var bI = $"{await ctx.Members.Where(m => !m.IsActive).SumAsync(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant):N0}";
+            var bI = $"{await ctx.Members.Where(m => !m.IsActive).SumAsync(m => m.BusinessShares):N0}";
-            var bT = $"{await ctx.Members.SumAsync(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant):N0}";
+            var bT = $"{await ctx.Members.SumAsync(m => m.BusinessShares):N0}";
             var bM = Math.Max(bA.Length, Math.Max(bI.Length, bT.Length));
             var bS = bM > 3;
             if (bS) bM--;
@@ -350,7 +328,6 @@ namespace Elwig.Windows {
         }
 
         private async void ActiveMemberInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList();
         }
 
@@ -407,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) {
@@ -418,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;
             }
@@ -439,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;
@@ -502,7 +484,6 @@ namespace Elwig.Windows {
         }
 
         private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
-            if (!HasContextLoaded) return;
             await RefreshList(true);
         }
 
@@ -517,9 +498,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 {
@@ -527,7 +506,7 @@ namespace Elwig.Windows {
                     }
                 });
             } catch (Exception exc) {
-                InteractionService.ShowException(exc);
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             Mouse.OverrideCursor = null;
         }
@@ -549,7 +528,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);
         }
@@ -579,7 +560,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);
         }
@@ -613,7 +596,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);
         }
@@ -802,7 +787,7 @@ 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.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
                     $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +

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();
@@ -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"/>
@@ -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.DateString.CompareTo($"{Year}-01-01") >= 0 && h.DateString.CompareTo($"{Year}-12-31") <= 0 && h.Reason == "auto" && h.Shares > 0)
+                .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.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);

Elwig/Windows/QueryWindow.xaml.cs

@@ -1,6 +1,6 @@
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
-using Elwig.Services;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -42,9 +42,9 @@ namespace Elwig.Windows {
                 Mouse.OverrideCursor = Cursors.Wait;
                 await DisplayQuery(QueryInput.Text);
                 Mouse.OverrideCursor = null;
-            } catch (Exception exc) {
+            } catch (Exception e) {
                 Mouse.OverrideCursor = null;
-                InteractionService.ShowException("Fehler beim Ausführen", exc);
+                MessageBox.Show(e.Message, "Fehler beim Ausführen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
@@ -85,16 +85,21 @@ namespace Elwig.Windows {
         }
 
         private static async Task SaveQuery(string sqlQuery) {
-            var filename = InteractionService.SaveFile("Datenbank Abfrage", "Abfrage", "csv");
+            var d = new SaveFileDialog() {
-            if (filename != null) {
+                FileName = $"Abfrage.csv",
+                DefaultExt = "csv",
+                Filter = "CSV-Datei (*.csv)|*.csv",
+                Title = $"Datenbank Abfrage speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
                 Mouse.OverrideCursor = Cursors.Wait;
                 await Task.Run(async () => {
                     try {
                         var (header, rows) = await ExecuteQuery(sqlQuery);
-                        using var csv = new CsvSimple(filename, ';', Utils.UTF8BOM);
+                        using var csv = new CsvSimple(d.FileName, ';', Utils.UTF8BOM);
                         await csv.ExportAsync(rows.Prepend([.. header.Select(h => h.ColumnName)]));
                     } catch (Exception exc) {
-                        InteractionService.ShowException("Fehler beim Ausführen", exc);
+                        MessageBox.Show(exc.Message, "Fehler beim Ausführen", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
                 });
                 Mouse.OverrideCursor = null;

Installer/Files/README.txt

@@ -1,17 +0,0 @@
-
-Elwig
-=====
-
-Source code
-C:\Program Files\Elwig\src\
-https://git.necronda.net/winzer/elwig
-
-Installation folder
-C:\Program Files\Elwig\
-
-Data and configuration folder
-C:\ProgramData\Elwig\
-- config.ini       : main configuration file
-- database.sqlite3 : stores all data
-- imported.txt     : list of all imported *.elwig.zip files to not automatically import them again
-- mails\           : sent/outgoing email log

Installer/Folders.wxs

@@ -3,9 +3,7 @@
   <Fragment>
     <!-- C:\Program Files (x86)\Elwig or C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
-        <Directory Id="SourceFolder" Name="src"/>
-      </Directory>
     </StandardDirectory>
 
     <!-- C:\ProgramData\Elwig -->

Installer/Installer.wixproj

@@ -1,4 +1,4 @@
-<Project Sdk="WixToolset.Sdk/7">
+<Project Sdk="WixToolset.Sdk/6">
   <PropertyGroup>
     <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
     <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
@@ -11,7 +11,6 @@
     <BuildProjectReferences>False</BuildProjectReferences>
     <OutputName>Elwig</OutputName>
     <Cultures>de-AT</Cultures>
-    <AcceptEula>wix7</AcceptEula>
   </PropertyGroup>
   <UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
@@ -34,11 +33,7 @@
       <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>
   </Target>
-  <Target Name="CreateSourceArchive" BeforeTargets="BeforeBuild">
-    <Exec Command="git -C .. archive -o $(ProjectDir)\Files\elwig.zip HEAD" />
-  </Target>
   <ItemGroup>
     <None Include="Files\config.ini" />
-    <None Include="Files\README.txt" />
   </ItemGroup>
 </Project>

Installer/MainComponents.wxs

@@ -4,15 +4,9 @@
       <Component Directory="InstallFolder">
         <File Source="$(var.ElwigProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"/>
       </Component>
-      <Component Directory="SourceFolder">
-        <File Source="$(ProjectDir)\Files\elwig.zip" Id="elwig.zip"/>
-      </Component>
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
         <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
       </Component>
-      <Component Directory="ConfigFolder">
-        <File Source="$(ProjectDir)\Files\README.txt" Id="README.txt"/>
-      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>

README.md

@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.5.6 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.4.1 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
@@ -33,7 +33,7 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.5.6 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.4.1 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  

Setup/Setup.wixproj

@@ -1,9 +1,8 @@
-<Project Sdk="WixToolset.Sdk/7">
+<Project Sdk="WixToolset.Sdk/6">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
     <OutputName>Elwig</OutputName>
     <Cultures>de-AT</Cultures>
-    <AcceptEula>wix7</AcceptEula>
   </PropertyGroup>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
     <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
@@ -14,7 +13,7 @@
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="7.0.0" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="6.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" />
   </ItemGroup>
 </Project>

Tests/DatabaseSetup.cs

@@ -2,7 +2,6 @@ using Elwig;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
 using System.Reflection;
 
 namespace Tests {
@@ -23,7 +22,7 @@ namespace Tests {
         public void Setup_2_Client() {
             using var ctx = new AppDbContext();
             App.Client = new ClientParameters(ctx);
-            App.SetBranch(ctx.Branches.Include(b => b.PostalDest).Single());
+            App.SetBranch(ctx.Branches.Single());
         }
 
         [OneTimeSetUp]

Tests/E2ETests/MemberAdminWindowTest.cs

@@ -80,7 +80,6 @@ namespace Tests.E2ETests {
 
             Window.FindElement(By.WpfId("SaveButton")).Click();
 
-            Thread.Sleep(500);
             Window.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
             Thread.Sleep(500);
             var memberListRow = Window.FindElement(By.WpfId("MemberList")).FindElement(By.ClassName("DataGridRow"));

Tests/Resources/Sql/BillingDelete.sql

@@ -3,7 +3,7 @@
 DELETE FROM credit;
 DELETE FROM payment_variant;
 DELETE FROM delivery;
-DELETE FROM area_commitment_contract;
+DELETE FROM area_commitment;
 DELETE FROM area_commitment_type;
 DELETE FROM season;
 DELETE FROM wine_attribute;

Tests/Resources/Sql/BillingInsert.sql

@@ -22,19 +22,14 @@ INSERT INTO area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, p
 ('GVQ', 'GV', 'Q',  NULL, 5000, 1000, 1000000, NULL),
 ('GVR', 'GV', 'R',  NULL, 5000, 1000, 1000000, NULL);
 
-INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr) VALUES
+INSERT INTO area_commitment (fbnr, mgnr, vtrgid, cultid, area, kgnr, gstnr, rdnr, year_from, year_to) VALUES
-( 1, 06109, NULL),
+( 1, 101, 'GV', 'KIP', 10000, 06109, '123/4', NULL, 2000, 2019),
-( 2, 06109, NULL),
+( 2, 101, 'GV', 'KIP', 10000, 06109, '123/5', NULL, 2025, 2030),
-( 3, 06109, NULL);
+( 3, 101, 'GV', 'KIP', 10000, 06109, '123/6', NULL, 2021, 2031);
 
-INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to) VALUES
+INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
-( 1, 1, 101, 'GV', 'KIP', 10000, '123/4', 2000, 2019),
+(2020, 'EUR', 1000, 2000, NULL, NULL, NULL, NULL, NULL),
-( 2, 1, 101, 'GV', 'KIP', 10000, '123/5', 2025, 2030),
+(2021, 'EUR', 2000, 4000, NULL, NULL, NULL, NULL, NULL);
-( 3, 1, 101, 'GV', 'KIP', 10000, '123/6', 2021, 2031);
-
-INSERT INTO season (year, currency, min_kg_per_share, max_kg_per_share, start_date, end_date) VALUES
-(2020, 'EUR', 1000, 2000, NULL, NULL),
-(2021, 'EUR', 2000, 4000, NULL, NULL);
 
 INSERT INTO modifier (year, modid, ordering, name, abs, rel, active) VALUES
 (2020, 'S', 0, 'Geschädigte Trauben', NULL, -0.1, TRUE),

Tests/Resources/Sql/DocumentInsert.sql

@@ -6,8 +6,8 @@ INSERT INTO wine_cultivation (cultid, name, description) VALUES
 INSERT INTO wine_attribute (attrid, name, active, max_kg_per_ha, strict, fill_lower) VALUES
 ('K', 'Kabinett',  TRUE, NULL, FALSE, 0);
 
-INSERT INTO season (year, currency, min_kg_per_share, max_kg_per_share, start_date, end_date) VALUES
+INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
-(2020, 'EUR', 1000, 2000, NULL, NULL);
+(2020, 'EUR', 1000, 2000, NULL, NULL, NULL, NULL, NULL);
 
 INSERT INTO delivery_schedule (year, dsnr, date, zwstid, description, max_weight, ancmt_from, ancmt_to) VALUES
 (2020, 1, '2020-10-01', 'X', 'GV Kabinettaktion', 100000, NULL, NULL);
@@ -64,10 +64,6 @@ INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw,
 (2020, 12, 1, 'BP', NULL, NULL,  2410, 18.0, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 12, 2, 'BP', NULL, NULL,  2313, 18.1, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL);
 
-INSERT INTO delivery_part_modifier (year, did, dpnr, modid) VALUES
-(2020, 2, 1, 'S'),
-(2020, 2, 2, 'A');
-
 INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value) VALUES
 (2020, 1, 1, 0, '_', 3219),
 (2020, 3, 1, 0, '_', 2561),

Tests/Resources/Sql/ServiceDelete.sql

@@ -4,7 +4,7 @@ DELETE FROM credit;
 DELETE FROM payment_variant;
 DELETE FROM delivery;
 DELETE FROM season;
-DELETE FROM area_commitment_contract;
+DELETE FROM area_commitment;
 DELETE FROM area_commitment_type;
 DELETE FROM member WHERE mgnr >= 200;
 DELETE FROM wine_cultivation;

Tests/Resources/Sql/ServiceInsert.sql

@@ -29,23 +29,17 @@ INSERT INTO member_email_address (mgnr, nr, address, comment) VALUES
 INSERT INTO area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, penalty_per_kg, penalty_amount, penalty_none) VALUES
 ('GV', 'GV', NULL, NULL, 5000,  500,    NULL, NULL);
 
-INSERT INTO area_commitment_contract (fbnr, kgnr, rdnr) VALUES
+INSERT INTO area_commitment (fbnr, mgnr, vtrgid, cultid, area, kgnr, gstnr, rdnr, year_from, year_to) VALUES
-( 1, 15224, NULL),
+( 1, 203, 'GV', NULL, 10000, 15224, '321/9', NULL, NULL, NULL),
-( 2, 15224, NULL),
+( 2, 204, 'GV', NULL, 10000, 15224, '123/1', NULL, 2000, 2019),
-( 3, 15224, NULL),
+( 3, 204, 'GV', NULL, 10000, 15224, '123/2', NULL, 2025, 2030),
-( 4, 15224, NULL);
+( 4, 204, 'GV', NULL, 10000, 15224, '123/3', NULL, 2021, 2031);
-
-INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, year_from, year_to) VALUES
-( 1, 1, 203, 'GV', NULL, 10000, '321/9', NULL, NULL),
-( 2, 1, 204, 'GV', NULL, 10000, '123/1', 2000, 2019),
-( 3, 1, 204, 'GV', NULL, 10000, '123/2', 2025, 2030),
-( 4, 1, 204, 'GV', NULL, 10000, '123/3', 2021, 2031);
 
 
-INSERT INTO season (year, currency, min_kg_per_share, max_kg_per_share, start_date, end_date) VALUES
+INSERT INTO season (year, currency, min_kg_per_bs, max_kg_per_bs, penalty_per_kg, penalty_amount, penalty_none, start_date, end_date) VALUES
-(2021, 'EUR', 2000, 4000, NULL, NULL),
+(2021, 'EUR', 2000, 4000, NULL, NULL, NULL, NULL, NULL),
-(2022, 'EUR', 2000, 4000, NULL, NULL),
+(2022, 'EUR', 2000, 4000, NULL, NULL, NULL, NULL, NULL),
-(2023, 'EUR', 2000, 4000, NULL, NULL);
+(2023, 'EUR', 2000, 4000, NULL, NULL, NULL, NULL, NULL);
 
 INSERT INTO modifier (year, modid, ordering, name, abs, rel, active) VALUES
 (2021, 'S', 0, 'Geschädigte Trauben', NULL, -0.1, TRUE),