Elwig: Add InteractionService to centrally manage MessageBox and SaveFileDialogs

.gitea/workflows/test.yaml

@@ -2,7 +2,7 @@ name: Test
 on:
   push:
     branches: ["**"]
-    paths: ["Elwig/**", "Tests/**", ".gitea/workflows/test.yaml"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"]
 jobs:
   test:
     name: Run tests

CHANGELOG.md

@@ -2,168 +2,6 @@
 Changelog
 =========
 
-[v1.1.2.1][v1.1.2.1] (2026-08-27) {#v1.1.2.1}
----------------------------------------------
-
-### Behobene Fehler {#v1.1.2.1-bugfixes}
-
-* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) und im Leseplanung-Fenster (`DeliveryScheduleAdminWindow`) kam es seit [v1.1.1.2](#v1.1.1.2) (2026-08-25) zu einem Absturz. (f0745eae4e)
-
-### Sonstiges {#v1.1.2.1-misc}
-
-* Bei E-Mails wird ab jetzt auch Datum und Uhrzeit gesetzt. (848a6d1ce0)
-
-[v1.1.2.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.2.1
-
-
-
-
-[v1.1.2.0][v1.1.2.0] (2026-08-26) {#v1.1.2.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.1.2.0-features}
-
-* Eine Automatische Backup-/Sicherungs-Funktion für die Datenbank wurde hinzugefügt. (ca5b719630, cadac4302d)
-
-### Behobene Fehler {#v1.1.2.0-bugfixes}
-
-* Wenn am heutigen Tag noch keine Lieferung übernommen wurde, wurden im Lieferungen-/Übernahme-Fenster (`DeliveryAdminWindow`) mit dem Filter "Nur heute" auch Lieferungen des vorhergehenden Tages angezeigt. (c1690bf104)
-
-### Sonstiges {#v1.1.2.0-misc}
-
-* Abhängigkeiten aktualisiert. (2360402124, 7add96dfd5)
-
-[v1.1.2.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.2.0
-
-
-
-
-[v1.1.1.2][v1.1.1.2] (2026-08-25) {#v1.1.1.2}
----------------------------------------------
-
-### Behobene Fehler {#v1.1.1.2-bugfixes}
-
-* Auf Lieferscheinen (`DeliveryNote`) waren die Mengenangaben nicht rechtsbündig. (ff71e9fb7f)
-* Beim Importieren von Mitgliedern mit Stamm-KG ohne Großlage kam es zu einem Fehler, obwohl die Großlage automatisch hätte zugewiesen werden müssen. (edf3678154)
-
-### Sonstiges {#v1.1.1.2-misc}
-
-* In Matzen werden für Planenw./Kipper und Lesewagen die Klassen automatisch gesetzt. (3366cc25eb)
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) wird für "Nur heute" nicht mehr nur das Datum, sondern die letzten zusammenhängenden Lieferungen verwendet. (46e596ae23)
-* Für Pamhagen wird als standard Wiege-Methode "brutto" verwendet. (0c4611024f)
-* Für Waagen kann das automatische setzen von Datum und Uhrzeit nun per Opt-out ausgeschalten werden (Konfigurationsdatei -> `[scale.X]` -> `synctime = false`). (f450dc35b1)
-
-[v1.1.1.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.1.2
-
-
-
-
-[v1.1.1.1][v1.1.1.1] (2026-08-24) {#v1.1.1.1}
----------------------------------------------
-
-### Sonstiges {#v1.1.1.1-misc}
-
-* Beim Export der Flächenbindungen im Haupt-Fenster (`MainWindow`) werden neben der zusammengefassten gebundenen Fläche nun auch die jeweiligen Flächenindungen exportiert. (b468bbce31)
-
-[v1.1.1.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.1.1
-
-
-
-
-[v1.1.1.0][v1.1.1.0] (2026-08-19) {#v1.1.1.0}
----------------------------------------------
-
-### Sonstiges {#v1.1.1.0-misc}
-
-* Bei der BKI-Traubentransportscheinliste werden Volllieferanten/Vollablieferer nun auch als solche markiert. (20b6e11b7f)
-
-[v1.1.1.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.1.0
-
-
-
-
-[v1.1.0.3][v1.1.0.3] (2026-08-17) {#v1.1.0.3}
----------------------------------------------
-
-### Sonstiges {#v1.1.0.3-misc}
-
-* Beim Drucken mehrerer Kopien einer PDF-Datei wird nun nur mehr ein einzelner Druck-Auftrag verwendet. (fc5ad82686)
-* Beim Synchronisieren können Geräte als Hauptgerät festgelegt werden. (eaddf0c3cb)
-* Abhängigkeiten aktualisiert. (e6e140dc08, 58bfb4f56d)
-
-[v1.1.0.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.3
-
-
-
-
-[v1.1.0.2][v1.1.0.2] (2026-08-11) {#v1.1.0.2}
----------------------------------------------
-
-### Neue Funktionen {#v1.1.0.2-features}
-
-* Es ist nun möglich zwischen dem Senden von E-Mail einige Sekunden zu warten (Konfigurationsdatei -> `[smtp]` -> `wait = 0.5`). (76ea3513ac)
-
-### Behobene Fehler {#v1.1.0.2-bugfixes}
-
-* Beim Drucken von Dokumenten waren die Seitenränder nicht korrekt. (f13a836ebd, 20b19775b1, 470c6e09e5, 07b197958d)
-
-[v1.1.0.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.2
-
-
-
-
-[v1.1.0.1][v1.1.0.1] (2026-08-05) {#v1.1.0.1}
----------------------------------------------
-
-### Neue Funktionen {#v1.1.0.1-features}
-
-* Auf Lieferscheinen sind nun Waage und Terminal angegeben. (309f118739)
-* Beim Starten von Elwig wird Datum/Uhrzeit auf allen angeschlossenen Waagen gesetzt. (2a3999f300)
-
-### Behobene Fehler {#v1.1.0.1-bugfixes}
-
-* Im Stammdaten-Fenster (`BaseDataWindow`) war es nach einem Fehler beim Bearbeiten bis zum Schließen des Fensters nicht mehr möglich zu speichern. ([#82][i82])
-
-### Sonstiges {#v1.1.0.1-misc}
-
-* Im Auszahlungsvarianten-Fenster (`PaymentVariantsWindow`)...
-  * wurde auf 3 Knöpfen das Symbol "in neuem Fenster öffnen" hinzugefügt. (88616b2c0b)
-  * wird beim "Speichern" die Variante automatisch auch berechnet um Fehler/Missverständnisse zu vermeiden. ([#83][i83])
-* Abhängigkeiten aktualisiert. (b445928c4d, 668030fbff, a8cc3c9cb9)
-
-[v1.1.0.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.1
-[i82]: https://git.necronda.net/winzer/elwig/issues/82
-[i83]: https://git.necronda.net/winzer/elwig/issues/83
-
-
-
-
-[v1.1.0.0][v1.1.0.0] (2026-07-09) {#v1.1.0.0}
----------------------------------------------
-
-### Neue Funktionen {#v1.1.0.0-features}
-
-* Per Opt-In Einstellung in den Stammdaten ist es nun möglich Mitgliederbewegungen und Verläufe von Geschäftsanteilen mit Elwig zu erfassen. ([#20][i20])
-* Es wird nun unterstützt verschiedene Typen von Geschäftsanteilen pro Mitglied zu erfassen (normal, rot, weiß, ruhend). ([#80][i80])
-
-### Behobene Fehler {#v1.1.0.0-bugfixes}
-
-* Falls die Datenbank für die momentan verwndete Elwig-Version zu neu war kam es beim Überprüfen auf ein Update zu einem Fehler. (4ebe07f579)
-* Im Stammdatenblatt (`MemberDataSheet`) wurde die Stamm-Zweigstelle nicht angeführt. (a71c41af5c)
-
-### Sonstiges {#v1.1.0.0-misc}
-
-* In der Buchungsliste (`CreditNoteData`) wird nun auch das Buchhaltungskonto der Mitglieder angeführt. (000117dc67)
-* Viele kleine Verbesserungen der Code-Qualität. (u.a. fcd0555e4d, 69efca1cc3,  beacba6bd9, 1169ba5101)
-* Abhängigkeiten aktualisiert. (e8789aff37, 2350b55cea)
-
-[v1.1.0.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.1.0.0
-[i20]: https://git.necronda.net/winzer/elwig/issues/20
-[i80]: https://git.necronda.net/winzer/elwig/issues/80
-
-
-
-
 [v1.0.5.6][v1.0.5.6] (2026-06-25) {#v1.0.5.6}
 ---------------------------------------------
 
@@ -426,7 +264,7 @@ Changelog
 
 [v1.0.3.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.0
 [i50]: https://git.necronda.net/winzer/elwig/issues/50
-[i66]: https://git.necronda.net/winzer/elwig/issues/66
+[i66]: https://git.necronda.net/winzer/elwig/issues/60
 [i71]: https://git.necronda.net/winzer/elwig/issues/71
 [i73]: https://git.necronda.net/winzer/elwig/issues/73
 

Elwig/App.xaml

@@ -2,7 +2,8 @@
         x:Class="Elwig.App"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:ctrl="clr-namespace:Elwig.Controls">
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Exit="Application_Exit">
     <Application.Resources>
         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
         <ctrl:WidthToMarginConverter x:Key="WidthToMarginConverter"/>

Elwig/App.xaml.cs

@@ -25,10 +25,9 @@ namespace Elwig {
 
         protected static App CurrentApp;
         public static int NumWindows => CurrentApp.Windows.Count;
-        public static bool ForceShutdown { get; set; } = false;
+        public static bool ForceShutdown { get; private set; } = false;
 
         private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
-        private readonly DispatcherTimer _autoBackupTimer = new() { Interval = TimeSpan.FromMinutes(10) };
         public readonly SerialPortWatcher SerialPortWatcher = new();
 
         public static readonly string DataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
@@ -75,7 +74,7 @@ namespace Elwig {
                 Config = new(Path.GetFullPath(args[1]));
             }
 
-            ContextTimer.Tick += (sender, evt) => {
+            ContextTimer.Tick += (object? sender, EventArgs evt) => {
                 var ch = CurrentLastWrite;
                 if (ch > LastChanged) {
                     LastChanged = ch;
@@ -93,15 +92,11 @@ namespace Elwig {
 
             try {
                 await AppDbUpdater.CheckDb();
-            } catch (FileNotFoundException exc) {
-                InteractionService.ShowException("Datenbank nicht gefunden", "Die Datenbank konnte nicht gefunden werden", exc);
             } catch (Exception exc) {
                 if (Config.UpdateUrl != null && Utils.HasInternetConnectivity()) {
                     await CheckForUpdates();
                 }
-                InteractionService.ShowException("Fehlerhafte Datenbank", "Schwerwiegender Fehler in der Datenbank, unbedingt den Programmierern melden!", exc);
-                if (InteractionService.AskQuestion("Backup wiederherstellen", "Soll die Datenbank aus einem Backup wiederhergestellt werden?\n\nAchtung: Das kann zu Datenverlust führen!", false))
-                    await BackupService.RestoreDatabase();
+                InteractionService.ShowException("Fehlerhafte Datenbank", "Fehlerhafte Datenbank", exc);
                 Shutdown();
                 return;
             }
@@ -111,14 +106,13 @@ namespace Elwig {
 
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
-                branches = await ctx.FetchBranches()
-                    .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));
+                branches = ctx.FetchBranches()
+                    .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) {
-                    InteractionService.ShowException("Fehler", "Fehler beim Laden der Mandantendaten, unbedingt den Programmierern melden!", exc);
-                    if (InteractionService.AskQuestion("Backup wiederherstellen", "Soll die Datenbank aus einem Backup wiederhergestellt werden?\n\nAchtung: Das kann zu Datenverlust führen!", false))
-                        await BackupService.RestoreDatabase();
+                    InteractionService.ShowException("Fehler", "Fehler beim Laden der Mandantendaten", exc);
                     Shutdown();
                     return;
                 }
@@ -130,23 +124,9 @@ namespace Elwig {
                 return Task.CompletedTask;
             });
 
-            Utils.RunBackground("PDF Initialization", async () => Pdf.Init());
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init());
             Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 
-            if (Config.BackupAuto) {
-                Utils.RunBackground("Automatisches Backup", async () => {
-                    Directory.CreateDirectory(Config.BackupPath);
-                    await Task.Delay(500);
-                    await BackupService.TryDatabaseBackup();
-                });
-                _autoBackupTimer.Tick += new EventHandler((sender, evt) => {
-                    Utils.RunBackground("Automatisches Backup", async () => {
-                        await BackupService.TryDatabaseBackup();
-                    });
-                });
-                _autoBackupTimer.Start();
-            }
-
             if (Config.UpdateAuto && Config.UpdateUrl != null) {
                 if (Utils.HasInternetConnectivity()) {
                     Utils.RunBackground("Auto Updater", async () => {
@@ -165,13 +145,7 @@ namespace Elwig {
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
                 try {
-                    var scale = Scale.FromConfig(s);
-                    if (s.SyncTime && scale is ICommandScale cmd) {
-                        try {
-                            await cmd.SetDateAndTime(DateTime.Now);
-                        } catch { }
-                    }
-                    list.Add(scale);
+                    list.Add(Scale.FromConfig(s));
                 } catch (Exception exc) {
                     list.Add(new InvalidScale(s.Id));
                     if (s.Required)
@@ -199,7 +173,7 @@ namespace Elwig {
                     Config.WeighingMode = WeighingMode.Net;
                 } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
                     Config.WeighingMode = WeighingMode.Box;
-                } else if (Client.IsBaden || Client.IsGrInzersdorf || Client.IsPamhagen) {
+                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
                     Config.WeighingMode = WeighingMode.Gross;
                 }
             }
@@ -210,21 +184,12 @@ namespace Elwig {
             window.Show();
         }
 
-        public async Task OnClosing() {
-            try {
-                await BackupService.TryDatabaseBackup();
-            } catch (Exception exc) {
-                InteractionService.ShowException("Automatisches Backup", exc);
-            }
-        }
-
-        protected override void OnExit(ExitEventArgs evt) {
+        private async void Application_Exit(object sender, ExitEventArgs evt) {
             SerialPortWatcher.Dispose();
             foreach (var s in EventScales) {
                 s.Dispose();
             }
-            Pdf.Cleanup();
-            base.OnExit(evt);
+            await Pdf.Cleanup();
         }
 
         public static void SetBranch(Branch b) {
@@ -379,10 +344,6 @@ namespace Elwig {
             return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt);
         }
 
-        public static MemberBusinessSharesAdminWindow FocusMemberBusinessSharesWindow(int mgnr) {
-            return FocusWindow<MemberBusinessSharesAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
-        }
-
         public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
             return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
         }

Elwig/Controls/CheckComboBox.cs

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

Elwig/Documents/BusinessDocument.cs

@@ -18,7 +18,6 @@ namespace Elwig.Documents {
     public class BusinessDocument : Document {
 
         public Member Member;
-        public MemberHistoryPoint MemberShares;
         public string? Location;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
@@ -52,7 +51,6 @@ namespace Elwig.Documents {
         public BusinessDocument(string title, Member m, DateOnly? dateFrom, bool includeSender = false) :
             base(title) {
             Member = m;
-            MemberShares = new(m.Shares, m.SharesRed, m.SharesWhite, m.SharesDormant);
             Location = App.BranchLocation;
             IncludeSender = includeSender;
             DateFrom = dateFrom;
@@ -265,7 +263,7 @@ namespace Elwig.Documents {
         }
 
         protected Table NewBucketTable(
-            Season season, Dictionary<string, MemberBucket> buckets, int deliveredWeightRed, int deliveredWeightWhite,
+            Season season, Dictionary<string, MemberBucket> buckets, int deliveredWeight,
             bool includeDelivery = true, bool includePayment = false,
             bool isTiny = false, IEnumerable<string>? filter = null
         ) {
@@ -318,21 +316,9 @@ namespace Elwig.Documents {
                 .Where(b => !fbVars.Contains(b.Key))
                 .OrderBy(b => b.Value.Name);
 
-            if (MemberShares.Shares != 0 || (MemberShares.SharesRed == 0 && MemberShares.SharesWhite == 0)) {
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberShares.Shares * (season.MinKgPerShare ?? 0), MemberShares.Shares * (season.MaxKgPerShare ?? 0),
-                        deliveredWeightRed + deliveredWeightWhite, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-            }
-
-            if (MemberShares.SharesRed != 0 || MemberShares.SharesWhite != 0) {
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA (rot)", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberShares.SharesRed * (season.MinKgPerShareRed ?? season.MinKgPerShare ?? 0), MemberShares.SharesRed * (season.MaxKgPerShareRed ?? season.MaxKgPerShare ?? 0),
-                        deliveredWeightRed, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-
-                tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA (weiß)", isTiny: isTiny));
-                tbl.AddCells(FormatRow(MemberShares.SharesWhite * (season.MinKgPerShareWhite ?? season.MinKgPerShare ?? 0), MemberShares.SharesWhite * (season.MaxKgPerShareWhite ?? season.MaxKgPerShare ?? 0),
-                        deliveredWeightWhite, isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
-            }
+            tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
+            tbl.AddCells(FormatRow(Member.BusinessShares * season.MinKgPerBusinessShare, Member.BusinessShares * season.MaxKgPerBusinessShare,
+                    deliveredWeight, 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

@@ -86,24 +86,19 @@ namespace Elwig.Documents {
             }
 
             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 red = weights.GetValueOrDefault("R", 0);
-                var white = weights.GetValueOrDefault("W", 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);
+                var total = _data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
+                var totalUnderDelivery = total - Member.BusinessShares * season.MinKgPerBusinessShare;
+                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
                 if (total == 0)
-                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerShareNone * (Member.Shares + Member.SharesRed + Member.SharesWhite) ?? 0);
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * Member.BusinessShares ?? 0);
             }
             if (ConsiderAutoBusinessShares) {
+                var fromDate = $"{season.Year}-01-01";
+                var toDate = $"{season.Year}-12-31";
                 MemberAutoBusinessShares = await ctx.MemberHistory
-                    .Where(h => h.ToMgNr == Member.MgNr && h.DeductYear == season.Year)
-                    .SumAsync(h => h.Shares);
+                    .Where(h => h.MgNr == Member.MgNr && h.Type == "auto")
+                    .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
+                    .SumAsync(h => h.BusinessShares);
                 MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
             }
             if (ConsiderContractPenalties) {
@@ -202,7 +197,7 @@ namespace Elwig.Documents {
                 penalty += MemberTotalUnderDelivery;
             }
             if (MemberAutoBusinessSharesAmount != 0) {
-                tbl2.AddCells(FormatRow($"Nachzeichnung von GA ({MemberAutoBusinessShares})", MemberAutoBusinessSharesAmount, add: true));
+                tbl2.AddCells(FormatRow($"Autom. Nachz. von GA ({MemberAutoBusinessShares})", MemberAutoBusinessSharesAmount, add: true));
                 penalty += MemberAutoBusinessSharesAmount;
             }
             if (CustomPayment?.Amount != null) {

Elwig/Documents/DeliveryConfirmation.cs

@@ -18,8 +18,7 @@ namespace Elwig.Documents {
 
         private readonly int _year;
         public Season? Season;
-        public int MemberDeliveredWeightRed;
-        public int MemberDeliveredWeightWhite;
+        public int MemberDeliveredWeight;
         public DeliveryConfirmationDeliveryData? Data;
         public string? Text = App.Client.TextDeliveryConfirmation;
         public Dictionary<string, MemberBucket> MemberBuckets = [];
@@ -37,14 +36,10 @@ namespace Elwig.Documents {
         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
+            MemberDeliveredWeight = await ctx.Deliveries
                 .Where(d => d.Year == Season.Year && d.MgNr == Member.MgNr)
                 .SelectMany(d => d.Parts)
-                .GroupBy(p => p.Variety.Type)
-                .ToDictionaryAsync(g => g.Key, g => g.Sum(p => p.Weight));
-            MemberDeliveredWeightRed = weights.GetValueOrDefault("R", 0);
-            MemberDeliveredWeightWhite = weights.GetValueOrDefault("W", 0);
-            MemberShares = await ctx.GetMemberHistory(Season.Year, Member.MgNr);
+                .SumAsync(p => p.Weight);
             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);
@@ -68,7 +63,7 @@ namespace Elwig.Documents {
             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, MemberDeliveredWeight, includePayment: true)
                 .SetMarginTopMM(10).SetKeepTogether(true));
 
             if (Text != null) {

Elwig/Documents/DeliveryNote.cs

@@ -19,8 +19,7 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public int MemberDeliveredWeightRed;
-        public int MemberDeliveredWeightWhite;
+        public int MemberDeliveredWeight;
         public Dictionary<string, MemberBucket> MemberBuckets = [];
 
         // 0 - none
@@ -60,13 +59,9 @@ namespace Elwig.Documents {
 
         protected override async Task LoadData(AppDbContext ctx) {
             await base.LoadData(ctx);
-            var weights = await ctx.DeliveryParts
+            MemberDeliveredWeight = await ctx.DeliveryParts
                 .Where(d => d.Year == Delivery.Year && d.Delivery.MgNr == Member.MgNr)
-                .GroupBy(p => p.Variety.Type)
-                .ToDictionaryAsync(g => g.Key, g => g.Sum(p => p.Weight));
-            MemberDeliveredWeightRed = weights.GetValueOrDefault("R", 0);
-            MemberDeliveredWeightWhite = weights.GetValueOrDefault("W", 0);
-            MemberShares = await ctx.GetMemberHistory(Delivery.Year, Member.MgNr);
+                .SumAsync(p => p.Weight);
             MemberBuckets = await ctx.GetMemberBuckets(Delivery.Year, Member.MgNr) ?? [];
         }
 
@@ -86,7 +81,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, MemberDeliveredWeight, isTiny: true,
                         filter: DisplayStats > 2 ? null : DisplayStats == 1 ? [] : Delivery.Parts.Select(p => p.SortId).Distinct().ToList())
                     .SetKeepTogether(true)
                     .SetMarginsMM(5, 0, 0, 0));
@@ -147,7 +142,7 @@ namespace Elwig.Documents {
                     .AddCell(NewDeliveryMainTd(part.Quality.Name))
                     .AddCell(NewDeliveryMainTd($"{part.Oe:N0}", center: true))
                     .AddCell(NewDeliveryMainTd($"{part.Kmw:N1}", center: true))
-                    .AddCell(NewDeliveryMainTd($"{part.Weight:N0}", right: true));
+                    .AddCell(NewDeliveryMainTd($"{part.Weight:N0}", center: true));
 
                 if (part.Cultivation != null) {
                     var cult = new KernedParagraph(8);
@@ -181,8 +176,8 @@ namespace Elwig.Documents {
                     }
                 } else {
                     var info = part.WeighingInfo;
-                    weighing.Add(Italic("Waage/Terminal:"))
-                        .Add(Normal(" " + (info.ScaleId ?? "?") + "/" + (part.ScaleTerminalId ?? "?") + ", "))
+                    weighing.Add(Italic("Waage:"))
+                        .Add(Normal(" " + (part.ScaleId ?? "?") + ", "))
                         .Add(Italic("ID:"))
                         .Add(Normal(" " + (info.Id ?? "?")));
                     if (info.Date != null || info.Time != null)

Elwig/Documents/Document.cs

@@ -57,7 +57,7 @@ namespace Elwig.Documents {
         public Document(string title) {
             Title = title;
             Author = App.Client.NameFull;
-            Date = DateOnly.FromDateTime(DateTime.Today);
+            Date = DateOnly.FromDateTime(Utils.Today);
         }
 
         ~Document() {
@@ -252,7 +252,7 @@ namespace Elwig.Documents {
 
         public async Task Print(int copies = 1) {
             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Print(PdfPath, copies, IsDoublePaged);
+            await Pdf.Print(PdfPath, copies, IsDoublePaged);
         }
 
         public void Show() {

Elwig/Documents/MemberDataSheet.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using Elwig.Models;
 using Elwig.Models.Entities;
 using iText.Kernel.Colors;
 using iText.Kernel.Pdf;
@@ -19,9 +18,7 @@ namespace Elwig.Documents {
         public new static string Name => "Stammdatenblatt";
 
         public Season? Season;
-        public int MemberDeliveredWeightRed;
-        public int MemberDeliveredWeightWhite;
-        public List<MemberHistory> MemberHistory = [];
+        public int MemberDeliveredWeight;
         public Dictionary<string, MemberBucket> MemberBuckets = [];
         public List<AreaCom> ActiveAreaCommitments = [];
 
@@ -39,46 +36,30 @@ namespace Elwig.Documents {
         protected override async Task LoadData(AppDbContext ctx) {
             await base.LoadData(ctx);
             Season = await ctx.FetchSeasons().FirstOrDefaultAsync() ?? throw new ArgumentException("Invalid season");
-            MemberHistory = await ctx.MemberHistory
-                .Where(h => h.FromMgNr == Member.MgNr || h.ToMgNr == Member.MgNr)
-                .OrderBy(h => h.DateNoticeString).ThenBy(h => h.HistNr)
-                .ToListAsync();
             MemberBuckets = await ctx.GetMemberBuckets(Utils.CurrentYear, Member.MgNr);
             ActiveAreaCommitments = await Member.ActiveAreaCommitments(ctx)
                 .Include(c => c.Contract).ThenInclude(c => c.Revisions)
                 .ToListAsync();
-            var weights = await ctx.Deliveries
+            MemberDeliveredWeight = 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);
+                .SumAsync(p => p.Weight);
         }
 
         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(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeightRed, MemberDeliveredWeightWhite, includeDelivery: false));
+            doc.Add(NewBucketTable(Season, MemberBuckets, MemberDeliveredWeight, includeDelivery: false));
             if (ActiveAreaCommitments.Count != 0) {
                 bool firstOnPage = false;
                 if (pdf.GetNumberOfPages() == 1) {
                     doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
                     firstOnPage = true;
                 }
-                doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 6, 0));
+                doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 12, 0));
                 doc.Add(NewAreaComTable(ActiveAreaCommitments));
             }
-            if (App.Client.EnableMemberHistory) {
-                bool firstOnPage = false;
-                if (pdf.GetNumberOfPages() == 1) {
-                    doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
-                    firstOnPage = true;
-                }
-                doc.Add(new KernedParagraph(12).Add(Bold($"Verlauf der Geschäftsanteile per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 6, 0));
-                doc.Add(NewMemberBusinessSharesTable(MemberHistory));
-            }
         }
 
         protected Cell NewDataHdr(string title, int colspan) {
@@ -151,9 +132,6 @@ 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))
@@ -165,7 +143,7 @@ namespace Elwig.Documents {
                 .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)
@@ -184,10 +162,10 @@ namespace Elwig.Documents {
             }).OrderByDescending(a => a.Size).ToList();
 
             var tbl = new Table(ColsMM(40, 30, 35, 15, 25, 20), true)
-                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
-                .SetBorder(Border.NO_BORDER)
-                .SetFontSize(10);
+              .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+              .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+              .SetBorder(Border.NO_BORDER)
+              .SetFontSize(10);
 
             tbl.AddHeaderCell(NewTh("Katastralgemeinde", rowspan: 2, left: true))
                 .AddHeaderCell(NewTh("Ried", rowspan: 2, left: true))
@@ -224,142 +202,5 @@ namespace Elwig.Documents {
 
             return tbl;
         }
-
-        protected Cell[] NewBusinessSharesCells(MemberHistoryPoint p, bool isDiff = true) {
-            if (App.Client.HasRedWhite) {
-                return [
-                    NewTd(isDiff ? (p.SharesRed == 0 ? "" : p.SharesRed < 0 ? $"–{-p.SharesRed:N0}" : $"+{p.SharesRed:N0}") : $"{p.SharesRed:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesWhite == 0 ? "" : p.SharesWhite < 0 ? $"–{-p.SharesWhite:N0}" : $"+{p.SharesWhite:N0}") : $"{p.SharesWhite:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesDormant == 0 ? "" : p.SharesDormant < 0 ? $"–{-p.SharesDormant:N0}" : $"+{p.SharesDormant:N0}") : $"{p.SharesDormant:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                ];
-            } else {
-                return [
-                    NewTd(isDiff ? (p.Shares == 0 ? "" : p.Shares < 0 ? $"–{-p.Shares:N0}" : $"+{p.Shares:N0}") : $"{p.Shares:N0}",
-                        right: true, bold: !isDiff, borderTop: !isDiff),
-                    NewTd(isDiff ? (p.SharesDormant == 0 ? "" : p.SharesDormant < 0 ? $"–{-p.SharesDormant:N0}" : $"+{p.SharesDormant:N0}") : $"{p.SharesDormant:N0}",
-                        right : true, bold: !isDiff, borderTop: !isDiff),
-                ];
-            }
-        }
-
-        protected Table NewMemberBusinessSharesTable(IEnumerable<MemberHistory> history) {
-            var tbl = new Table(ColsMM(18, 93, App.Client.HasRedWhite ? 18 : 12, App.Client.HasRedWhite ? 12 : 18, 12, 12), true)
-                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
-                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
-                .SetBorder(Border.NO_BORDER)
-                .SetFontSize(10);
-
-            var tw = App.Client.HasRedWhite ? 1 : 2;
-            tbl.AddHeaderCell(NewTh("Meldung am", rowspan: 2))
-                .AddHeaderCell(NewTh("Text", rowspan: 2, colspan: tw, left: true))
-                .AddHeaderCell(NewTh("Wirksam ab", rowspan: 2))
-                .AddHeaderCell(NewTh("Geschäftsanteile", colspan: App.Client.HasRedWhite ? 3 : 2));
-            if (App.Client.HasRedWhite) {
-                tbl.AddHeaderCell(NewTh("rot"))
-                    .AddHeaderCell(NewTh("weiß"))
-                    .AddHeaderCell(NewTh("ruhend"));
-            } else {
-                tbl.AddHeaderCell(NewTh("normal"))
-                  .AddHeaderCell(NewTh("ruhend"));
-            }
-
-            if (!history.Any() || Member.EntryDate <= history.First().DateNotice) {
-                tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            var recorded = history.Aggregate(new MemberHistoryPoint(), (s, h) => new(
-                s.Shares + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Normal ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Normal ? h.Shares : 0),
-                s.SharesRed + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Red ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Red ? h.Shares : 0),
-                s.SharesWhite + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.White ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.White ? h.Shares : 0),
-                s.SharesDormant + (h.ToMgNr == Member.MgNr && h.ToType == BusinessShareType.Dormant ? h.Shares : 0) - (h.FromMgNr == Member.MgNr && h.FromType == BusinessShareType.Dormant ? h.Shares : 0)));
-            var cur = new MemberHistoryPoint(Member.Shares - recorded.Shares, Member.SharesRed - recorded.SharesRed, Member.SharesWhite - recorded.SharesWhite, Member.SharesDormant - recorded.SharesDormant);
-
-            if (cur.Shares != 0 || cur.SharesRed != 0 || cur.SharesWhite != 0 || cur.SharesDormant != 0) {
-                tbl.AddCell(NewTd())
-                    .AddCell(NewTd("Nicht in Software erfasst", colspan: tw, italic: true))
-                    .AddCell(NewTd())
-                    .AddCells(NewBusinessSharesCells(cur));
-                if (history.Any()) {
-                    tbl.AddCell(NewTd(borderTop: true))
-                        .AddCell(NewTd($"Bis Lese {history.First().DateNotice.Year - 1}", borderTop: true, colspan: tw, bold: true))
-                        .AddCell(NewTd(borderTop: true))
-                        .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-                }
-            }
-
-            DateOnly? lastDate = null;
-            foreach (var row in history) {
-                int s = 0, r = 0, w = 0, d = 0;
-                if (row.FromMgNr == Member.MgNr) {
-                    switch (row.FromType) {
-                        case BusinessShareType.Normal: s -= row.Shares; break;
-                        case BusinessShareType.Red: r -= row.Shares; break;
-                        case BusinessShareType.White: w -= row.Shares; break;
-                        case BusinessShareType.Dormant: d -= row.Shares; break;
-                    }
-                }
-                if (row.ToMgNr == Member.MgNr) {
-                    switch (row.ToType) {
-                        case BusinessShareType.Normal: s += row.Shares; break;
-                        case BusinessShareType.Red: r += row.Shares; break;
-                        case BusinessShareType.White: w += row.Shares; break;
-                        case BusinessShareType.Dormant: d += row.Shares; break;
-                    }
-                }
-
-                if (lastDate < Member.EntryDate && row.DateNotice <= Member.EntryDate) {
-                    tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                        .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                        .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                        .AddCells(NewBusinessSharesCells(new()));
-                }
-                if (lastDate != null && row.DateNotice.Year != lastDate?.Year) {
-                    tbl.AddCell(NewTd(borderTop: true))
-                        .AddCell(NewTd(lastDate?.Year == row.DateNotice.Year - 1 ? $"Lese {lastDate?.Year}" : $"Lese {lastDate?.Year}–{row.DateNotice.Year - 1}", borderTop: true, colspan: tw, bold: true))
-                        .AddCell(NewTd(borderTop: true))
-                        .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-                }
-                if (lastDate < Member.ExitDate && row.DateNotice <= Member.ExitDate) {
-                    tbl.AddCell(NewTd($"{Member.ExitDate:dd.MM.yyyy}"))
-                        .AddCell(NewTd("Austritt", colspan: tw, bold: true))
-                        .AddCell(NewTd($"31.12.{Member.ExitDate.Value.Year + 1}"))  // FIXME
-                        .AddCells(NewBusinessSharesCells(new()));
-                }
-                cur = new(cur.Shares + s, cur.SharesRed + r, cur.SharesWhite + w, cur.SharesDormant + d);
-
-                tbl.AddCell(NewTd($"{row.DateNotice:dd.MM.yyyy}"))
-                    .AddCell(NewTd(row.FormatReasonPhrase(Member.MgNr), colspan: tw))
-                    .AddCell(NewTd($"{row.DateEffective:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new(s, r, w, d)));
-                lastDate = row.DateNotice;
-            }
-
-            if (Member.EntryDate != null && history.Any() && Member.EntryDate > lastDate) {
-                tbl.AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Eintritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"{Member.EntryDate:dd.MM.yyyy}"))
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            if (Member.ExitDate != null && (!history.Any() || Member.ExitDate > lastDate)) {
-                tbl.AddCell(NewTd($"{Member.ExitDate:dd.MM.yyyy}"))
-                    .AddCell(NewTd("Austritt", colspan: tw, bold: true))
-                    .AddCell(NewTd($"31.12.{Member.ExitDate.Value.Year + 1}"))  // FIXME
-                    .AddCells(NewBusinessSharesCells(new()));
-            }
-
-            tbl.AddCell(NewTd(borderTop: true))
-                .AddCell(NewTd(lastDate == null ? "Aktuell" : $"Ab Lese {lastDate?.Year}", borderTop: true, colspan: tw, bold: true))
-                .AddCell(NewTd(borderTop: true))
-                .AddCells(NewBusinessSharesCells(cur, isDiff: false));
-
-            return tbl;
-        }
     }
 }

Elwig/Documents/MemberList.cs

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

Elwig/Documents/PaymentVariantSummary.cs

@@ -139,7 +139,7 @@ namespace Elwig.Documents {
 
                 .AddCell(NewSectionTh("Datum/Überw.:", overflow: true))
                 .AddCell(NewTd($"{Variant.Date:dd.MM.yyyy} / {Variant.TransferDate:dd.MM.yyyy}", colspan: 4, center: true))
-                .AddCell(NewSectionTh("(Automatische) Nachzeichnung von GA:", colspan: 2, borderLeft: true))
+                .AddCell(NewSectionTh("Automatische Nachzeichnung der GA:", colspan: 2, borderLeft: true))
                 .AddCell(NewTd(BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein", center: true))
 
                 .AddCell(NewSectionTh("Berechnung:"))

Elwig/Elwig.csproj

@@ -9,10 +9,10 @@
     <UseWindowsForms>true</UseWindowsForms>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.1.2.1</Version>
+    <Version>1.0.5.6</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <ApplicationManifest>App.manifest</ApplicationManifest>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,21 +23,21 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="bblanchon.PDFium.Win32" Version="154.0.8021" />
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="151.0.7906" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageReference Include="itext" Version="9.7.0" />
-    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.7.0" />
+    <PackageReference Include="itext" Version="9.6.0" />
+    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.6.0" />
     <PackageReference Include="LinqKit" Version="1.3.11" />
     <PackageReference Include="MailKit" Version="4.17.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.11" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.9" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4022.49" />
     <PackageReference Include="NJsonSchema" Version="11.6.1" />
     <PackageReference Include="ScottPlot.WPF" Version="5.1.59" />
-    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.11" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.11" />
-    <PackageReference Include="System.Management" Version="10.0.11" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.3" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.9" />
+    <PackageReference Include="System.Management" Version="10.0.9" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -14,7 +14,6 @@ using System.Threading.Tasks;
 
 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);
@@ -69,8 +68,7 @@ namespace Elwig.Helpers {
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVarietyRowSingle> MemberDeliveryPerVariantRows { get; private set; }
-        public DbSet<MemberAreaComTotalsRowSingle> MemberAreaComTotalsRows { get; private set; }
-        public DbSet<MemberAreaComsRow> MemberAreaComsRows { get; private set; }
+        public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
         public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; }
@@ -148,7 +146,6 @@ namespace Elwig.Helpers {
                 .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 = [];
@@ -198,7 +195,6 @@ namespace Elwig.Helpers {
             modelBuilder.Entity<PostalDest>().Navigation(p => p.AtPlz).AutoInclude();
             modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.AtPlz).AutoInclude();
             modelBuilder.Entity<AT_PlzDest>().Navigation(p => p.Ort).AutoInclude();
-            modelBuilder.Entity<Member>().Navigation(m => m.Branch).AutoInclude();
             modelBuilder.Entity<Member>().Navigation(m => m.DefaultWbKg).AutoInclude();
             modelBuilder.Entity<Member>().Navigation(m => m.Country).AutoInclude();
             modelBuilder.Entity<Member>().Navigation(m => m.PostalDest).AutoInclude();
@@ -234,9 +230,6 @@ namespace Elwig.Helpers {
             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() {
@@ -316,10 +309,6 @@ namespace Elwig.Helpers {
             return (await DeliverySchedules.Where(s => s.Year == year).Select(v => (int?)v.DsNr).MaxAsync() ?? 0) + 1;
         }
 
-        public async Task<int> NextHistNr() {
-            return (await MemberHistory.Select(c => (int?)c.HistNr).MaxAsync() ?? 0) + 1;
-        }
-
         public IAsyncEnumerable<Branch> FetchBranches(string? zwstid = null, bool includeWithoutMembers = true) {
             return _compiledQueryBranches.Invoke(this, zwstid, includeWithoutMembers);
         }
@@ -408,22 +397,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();
@@ -514,12 +487,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);

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,48 +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 = 41;
+        public static readonly int RequiredSchemaVersion = 39;
 
         private static int VersionOffset = 0;
 
         public static async Task<Version> CheckDb() {
-            if (!File.Exists(App.Config.DatabaseFile))
-                throw new FileNotFoundException($"Die Datei \"{App.Config.DatabaseFile}\" exisitiert nicht");
+            using var cnx = AppDbContext.Connect();
 
-            long? applId, schemaVers;
-            using (var cnx = await AppDbContext.ConnectAsync()) {
+            var applId = (long?)await cnx.ExecuteScalar("PRAGMA application_id") ?? 0;
+            if (applId != 0x454C5747) throw new Exception($"Invalid application_id in database (0x{applId:X08})");
 
-                await cnx.QuickCheck();
-
-                applId = (long?)await cnx.ExecuteScalar("PRAGMA application_id") ?? 0;
-                if (applId != 0x454C5747)
-                    throw new FileFormatException($"Invalid application_id in database (0x{applId:X08})");
-
-                schemaVers = (long?)await cnx.ExecuteScalar("PRAGMA schema_version") ?? 0;
-                VersionOffset = (int)(schemaVers % 100);
-                if (VersionOffset != 0) {
-                    // schema was modified manually/externally
-                    // TODO issue warning
-                }
+            var schemaVers = (long?)await cnx.ExecuteScalar("PRAGMA schema_version") ?? 0;
+            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;
-            using (var cnx = await AppDbContext.ConnectAsync()) {
-                var userVers = (long?)await cnx.ExecuteScalar("PRAGMA user_version") ?? 0;
-                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}");
-                }
+            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) {
@@ -60,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");
-            File.Copy(App.Config.DatabaseFile, backup, true);
-            try {
-                using var cnx = await AppDbContext.ConnectAsync();
-                await cnx.ExecuteBatch("PRAGMA locking_mode = EXCLUSIVE");
-
-                await cnx.IntegrityCheck();
-                await cnx.ForeignKeyCheck();
-
-                foreach (var script in toExecute) {
-                    await cnx.ExecuteEmbeddedScript(asm, script);
-                }
-
-                await cnx.IntegrityCheck();
-                await cnx.ForeignKeyCheck();
-
-                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);
+            await cnx.ExecuteBatch("""
+                PRAGMA locking_mode = EXCLUSIVE;
+                BEGIN EXCLUSIVE;
+                """);
+            foreach (var script in toExecute) {
+                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
+                    .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

@@ -50,29 +50,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) {
-            if (addMinShares < 1) addMinShares = 1;
+        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) {
+            if (addMinBs < 1) addMinBs = 1;
             using var cnx = await AppDbContext.ConnectAsync();
             await cnx.ExecuteBatch($"""
-                DELETE FROM member_history WHERE source = 'elwig' AND reason = '{MemberHistory.REASON_PRESCRIPTION}' AND deduct_year = {Year};
-                INSERT INTO member_history (histnr, from_mgnr, from_type, to_mgnr, to_type, date_notice, date_effective, reason, source, deduct_year, shares, value_per_share, currency, comment)
-                SELECT COALESCE((SELECT MAX(histnr) AS histnr FROM member_history), 0) + ROW_NUMBER() OVER(ORDER BY m.mgnr),
-                       NULL, NULL, u.mgnr, 1, '{date:yyyy-MM-dd}', '{date:yyyy-MM-dd}', '{MemberHistory.REASON_PRESCRIPTION}', 'elwig', s.year,
-                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerShare}.0 * u.shares) / s.max_kg_per_share
-                            - {allowanceShares.ToString(CultureInfo.InvariantCulture)}
-                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.shares) AS adjust_shares,
-                       s.share_value / POW(10, s.precision - 2), s.currency, 'durch automatische Nachzeichnung'
+                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;
+
+                INSERT INTO member_history (mgnr, date, type, business_shares)
+                SELECT u.mgnr,
+                       '{date:yyyy-MM-dd}',
+                       'auto',
+                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs
+                            - {allowanceBs.ToString(CultureInfo.InvariantCulture)}
+                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
                 FROM v_total_under_delivery u
                     JOIN season s ON s.year = u.year
                     JOIN member m ON m.mgnr = u.mgnr
-                WHERE s.year = {Year} AND adjust_shares >= {addMinShares} AND m.active
+                WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
+                ON CONFLICT DO UPDATE
+                SET business_shares = excluded.business_shares;
+
+                UPDATE member
+                SET business_shares = member.business_shares + h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr;
                 """);
         }
 
         public async Task UnAdjustBusinessShares() {
             using var cnx = await AppDbContext.ConnectAsync();
             await cnx.ExecuteBatch($"""
-                DELETE FROM member_history WHERE source = 'elwig' AND reason = '{MemberHistory.REASON_PRESCRIPTION}' AND deduct_year = {Year};
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
                 """);
         }
 

Elwig/Helpers/Billing/BillingVariant.cs

@@ -76,7 +76,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
@@ -137,11 +137,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,
-                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.weight_total, b.weight_total)) > 0 AS allowed
+                                 ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline,
+                                 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 +150,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

Elwig/Helpers/ClientParameters.cs

@@ -56,10 +56,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 +75,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)) { }
 
@@ -116,15 +112,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 +176,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 +189,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 +235,9 @@ namespace Elwig.Helpers {
                 case 1: exportEbicsAddress = "LINES"; break;
                 case 2: exportEbicsAddress = "FULL"; break;
             }
-            string autoAdjust = $"{AutoAdjustShares.AllowanceKg};{AutoAdjustShares.AllowanceShares?.ToString(CultureInfo.InvariantCulture)};" +
-                                $"{AutoAdjustShares.AllowanceKgPerShare};{AutoAdjustShares.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
-                                $"{AutoAdjustShares.MinShares}";
+            string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.MinBs}";
             return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -274,8 +256,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/Config.cs

@@ -17,11 +17,10 @@ namespace Elwig.Helpers {
         public string? Filling;
         public string? Limit;
         public bool Required;
-        public bool SyncTime;
         public string? Log;
         public string? _Log;
 
-        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, bool? required, bool? syncTime, string? log) {
+        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, bool? required, string? log) {
             Id = id;
             Type = type;
             Model = model;
@@ -30,7 +29,6 @@ namespace Elwig.Helpers {
             Filling = filling;
             Limit = limit;
             Required = required ?? true;
-            SyncTime = syncTime ?? true;
             _Log = log;
             Log = log != null ? Path.Combine(App.DataPath, log) : null;
         }
@@ -39,30 +37,19 @@ namespace Elwig.Helpers {
     public class Config {
 
         private static readonly string[] TrueValues = ["1", "true", "yes", "on"];
-        private static readonly string[] FalseValues = ["0", "false", "no", "off"];
 
         private readonly string FileName;
 
         public bool Debug;
-        public string DatabaseFile = Path.Combine(App.DataPath, "database.sqlite3");
+        public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
         public WeighingMode? WeighingMode;
-
-        public bool BackupAuto = true;
-        public string BackupPath = Path.Combine(App.DataPath, "backups");
-        public int BackupRetainHours = 36;
-        public int BackupRetainDays = 8;
-        public int BackupRetainWeeks = 6;
-        public int BackupRetainMonths = 18;
-
         public string? UpdateUrl = null;
         public bool UpdateAuto = false;
-
         public string? SyncUrl = null;
         public string SyncUsername = "";
         public string SyncPassword = "";
-        public bool SyncMain = false;
 
         public string? SmtpHost = null;
         public int? SmtpPort = null;
@@ -70,10 +57,9 @@ namespace Elwig.Helpers {
         public string? SmtpUsername = null;
         public string? SmtpPassword = null;
         public string? SmtpFrom = null;
-        public double SmtpWait = 0;
-        public (string Host, int Port, string Mode, string Username, string Password, string From, double Wait)? Smtp =>
+        public (string Host, int Port, string Mode, string Username, string Password, string From)? Smtp =>
             SmtpHost == null || SmtpPort == null || SmtpMode == null || SmtpUsername == null || SmtpPassword == null || SmtpFrom == null ?
-            null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom, SmtpWait);
+            null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom);
 
         public IList<ScaleConfig> Scales;
         private readonly List<ScaleConfig> ScaleList = [];
@@ -94,21 +80,11 @@ namespace Elwig.Helpers {
             Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
             var weighing = config["general:weighing"];
             WeighingMode = weighing != null && Enum.TryParse<WeighingMode>(weighing, true, out var w) ? w : null;
-
-            BackupAuto = !FalseValues.Contains(config["backup:auto"]?.ToLower());
-            BackupPath = Path.Combine(Path.GetDirectoryName(DatabaseFile) ?? App.DataPath, config["backup:path"] ?? "backups");
-            BackupRetainHours = int.TryParse(config["backup:retain_hours"], out var hours) ? hours : 36;
-            BackupRetainDays = int.TryParse(config["backup:retain_days"], out var days) ? days : 8;
-            BackupRetainWeeks = int.TryParse(config["backup:retain_weeks"], out var weeks) ? weeks : 6;
-            BackupRetainMonths = int.TryParse(config["backup:retain_months"], out var months) ? months : 18;
-
             UpdateUrl = config["update:url"];
             UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
-
             SyncUrl = config["sync:url"];
             SyncUsername = config["sync:username"] ?? "";
             SyncPassword = config["sync:password"] ?? "";
-            SyncMain = TrueValues.Contains(config["sync:main"]?.ToLower());
 
             SmtpHost = config["smtp:host"];
             SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null;
@@ -116,7 +92,6 @@ namespace Elwig.Helpers {
             SmtpUsername = config["smtp:username"];
             SmtpPassword = config["smtp:password"];
             SmtpFrom = config["smtp:from"];
-            SmtpWait = double.TryParse(config["smtp:wait"], out var res) ? res : 0;
 
             var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order();
             ScaleList.Clear();
@@ -126,7 +101,6 @@ namespace Elwig.Helpers {
                     s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
                     config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"],
                     config[$"scale.{s}:required"] != null ? TrueValues.Contains(config[$"scale.{s}:required"]?.ToLower()) : null,
-                    config[$"scale.{s}:synctime"] != null ? !FalseValues.Contains(config[$"scale.{s}:synctime"]?.ToLower()) : null,
                     config[$"scale.{s}:log"]
                 ));
             }

Elwig/Helpers/Export/Bki.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace Elwig.Helpers.Export {
 
-    using Row = Tuple<(string?, string?, string?, string?, string, int, string, bool, int), (string, int, string, string, string, int, string, double, double)>;
+    using Row = Tuple<(string?, string?, string?, string?, string, int, string, int), (string, int, string, string, string, int, string, double, double)>;
 
     public class Bki : Csv<Row> {
 
@@ -29,7 +29,7 @@ namespace Elwig.Helpers.Export {
             using var cnx = await AppDbContext.ConnectAsync();
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, vollablieferer, area,
+                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area,
                        date, weight, type, sortid, qualid, year, hkid, kmw, oe
                 FROM v_bki_delivery
                 WHERE year = {year}
@@ -38,8 +38,8 @@ namespace Elwig.Helpers.Export {
             List<Row> rows = [];
             while (await r.ReadAsync()) {
                 rows.Add(new(
-                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetBoolean(7), r.GetInt32(8)),
-                    (r.GetString(9), r.GetInt32(10), r.GetString(11), r.GetString(12), r.GetString(13), r.GetInt32(14), r.GetString(15), r.GetDouble(16), r.GetDouble(17))
+                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
+                    (r.GetString(8), r.GetInt32(9), r.GetString(10), r.GetString(11), r.GetString(12), r.GetInt32(13), r.GetString(14), r.GetDouble(15), r.GetDouble(16))
                 ));
             }
 
@@ -52,14 +52,14 @@ namespace Elwig.Helpers.Export {
 
         public override string FormatRow(Row row) {
             var (member, delivery) = row;
-            var (lfBisNr, familyName, name, billingName, address, plz, ort, vollablieferer, area) = member;
+            var (lfBisNr, familyName, name, billingName, address, plz, ort, area) = member;
             var (date, weight, type, sortid, qualid, year, hkid, kmw, oe) = delivery;
 
             var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
             var (a1, a2) = Utils.SplitAddress(address);
             var memberData = $"{lfBisNr};{n1};{n2};{a1};\t{a2};{plz};{ort}";
             var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
-            var vollData = $"{(vollablieferer ? "J" : "N")};{(vollablieferer ? area / 10_000.0 : null):N4};{(vollablieferer ? area / 10_000.0 : null):N4};{area / 10_000.0:N4}";
+            var vollData = $"N;;;{area / 10_000.0}";
 
             return $"{_clientData};{memberData};{deliveryData};{vollData}";
         }

Elwig/Helpers/Export/Database.cs

@@ -18,85 +18,73 @@ namespace Elwig.Helpers.Export {
         }
 
         public static async Task ExportSqlite(string filename, bool zipFile) {
-            var tmp = filename + ".tmp";
-            try {
-                File.Delete(tmp);
-                if (zipFile) {
-                    using var zip = ZipFile.Open(tmp, ZipArchiveMode.Create);
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
 
-                    var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
-                    using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                        await writer.WriteAsync("elwig:1");
-                    }
-
-                    var (applId, userVers, schemaVers, size) = await GetMeta();
-                    var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
-                    using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
-                        var obj = new JsonObject {
-                            ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
-                            ["zwstid"] = App.ZwstId,
-                            ["device"] = Environment.MachineName,
-                            ["database"] = new JsonObject {
-                                ["application_id"] = applId,
-                                ["user_version"] = userVers,
-                                ["schema_version"] = schemaVers,
-                                ["file_size"] = size,
-                            },
-                        };
-                        await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
-                    }
-
-                    var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
-                } else {
-                    File.Copy(App.Config.DatabaseFile, tmp);
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
                 }
-                File.Move(tmp, filename, true);
-            } finally {
-                File.Delete(tmp);
+
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
+            } else {
+                File.Copy(App.Config.DatabaseFile, filename, true);
             }
         }
 
         public static async Task ExportSql(string filename, bool zipFile) {
-            var tmp = filename + ".tmp";
-            try {
-                File.Delete(tmp);
-                if (zipFile) {
-                    using var zip = ZipFile.Open(tmp, ZipArchiveMode.Create);
+            if (zipFile) {
+                File.Delete(filename);
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
 
-                    var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
-                    using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
-                        await writer.WriteAsync("elwig:1");
-                    }
+                var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                    await writer.WriteAsync("elwig:1");
+                }
 
-                    var (applId, userVers, schemaVers, size) = await GetMeta();
-                    var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
-                    using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
-                        var obj = new JsonObject {
-                            ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
-                            ["zwstid"] = App.ZwstId,
-                            ["device"] = Environment.MachineName,
-                            ["database"] = new JsonObject {
-                                ["application_id"] = applId,
-                                ["user_version"] = userVers,
-                                ["schema_version"] = schemaVers,
-                                ["file_size"] = size,
-                            },
-                        };
-                        await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
-                    }
+                var (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
 
-                    var sql = zip.CreateEntry("database.sql", CompressionLevel.SmallestSize);
-                    using (var writer = new StreamWriter(sql.Open(), Utils.UTF8)) {
-                        await ExportSql(writer);
-                    }
-                } else {
-                    using var stream = File.OpenWrite(tmp);
-                    using var writer = new StreamWriter(stream, Utils.UTF8);
+                var sql = zip.CreateEntry("database.sql", CompressionLevel.SmallestSize);
+                using (var writer = new StreamWriter(sql.Open(), Utils.UTF8)) {
                     await ExportSql(writer);
                 }
-                File.Move(tmp, filename, true);
-            } finally {
-                File.Delete(tmp);
+            } else {
+                using var stream = File.OpenWrite(filename);
+                using var writer = new StreamWriter(stream, Utils.UTF8);
+                await ExportSql(writer);
             }
         }
 

Elwig/Helpers/Export/ElwigData.cs

@@ -1,4 +1,3 @@
-using Elwig.Models;
 using Elwig.Models.Entities;
 using Elwig.Services;
 using Microsoft.EntityFrameworkCore;
@@ -35,16 +34,14 @@ namespace Elwig.Helpers.Export {
         public static async Task Import(IEnumerable<string> filenames, ImportMode mode) {
             try {
                 Dictionary<string, Branch> branches;
-                Dictionary<int, AT_Kg> kgs;
                 Dictionary<int, int> currentDids;
                 Dictionary<string, int> currentLsNrs;
                 Dictionary<int, List<WbRd>> currentWbRde;
-                Dictionary<int, WbKg> currentWbKgs;
+                Dictionary<int, AT_Kg> kgs;
                 List<WbGl> currentWbGls;
 
                 using (var ctx = new AppDbContext()) {
                     branches = await ctx.FetchBranches().ToDictionaryAsync(b => b.ZwstId);
-                    kgs = await ctx.Katastralgemeinden.ToDictionaryAsync(k => k.KgNr);
                     currentDids = await ctx.Deliveries
                         .GroupBy(d => d.Year)
                         .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
@@ -53,8 +50,8 @@ namespace Elwig.Helpers.Export {
                     currentWbRde = await ctx.WbRde
                         .GroupBy(r => r.KgNr)
                         .ToDictionaryAsync(g => g.Key, g => g.ToList());
-                    currentWbKgs = await ctx.WbKgs.ToDictionaryAsync(k => k.KgNr);
                     currentWbGls = await ctx.WbGls.ToListAsync();
+                    kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
                 }
 
                 var data = new List<(
@@ -62,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,
@@ -80,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"] = [],
@@ -123,7 +119,6 @@ namespace Elwig.Helpers.Export {
                                 var obj = JsonNode.Parse(line)!.AsObject();
                                 var (k, g) = obj.ToWbKg(currentWbGls);
                                 r.WbKgs.Add(k);
-                                currentWbKgs[k.KgNr] = k;
                                 if (g != null) {
                                     currentWbGls[g.GlNr] = g;
                                     r.WbGls.Add(g);
@@ -137,7 +132,7 @@ namespace Elwig.Helpers.Export {
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs, currentWbKgs);
+                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
                                 r.Members.Add(m);
                                 if (b != null) r.BillingAddresses.Add(b);
                                 r.TelephoneNumbers.AddRange(telNrs);
@@ -147,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) {
@@ -165,7 +149,7 @@ namespace Elwig.Helpers.Export {
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaCom, wbrd, timestamps) = obj.ToAreaCom(kgs, currentWbKgs, currentWbRde);
+                                var (contract, areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
                                 r.Contracts.Add(contract);
                                 r.AreaCommitments.Add(areaCom);
                                 if (wbrd != null) {
@@ -184,7 +168,7 @@ namespace Elwig.Helpers.Export {
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (contract, areaComs, wbrd, timestamps) = obj.ToAreaComContract(kgs, currentWbKgs, currentWbRde);
+                                var (contract, areaComs, wbrd, timestamps) = obj.ToAreaComContract(currentWbRde);
                                 r.Contracts.Add(contract);
                                 r.AreaCommitments.AddRange(areaComs.Select(v => v.Item1));
                                 if (wbrd != null) {
@@ -205,7 +189,7 @@ namespace Elwig.Helpers.Export {
                             string? line;
                             while ((line = await reader.ReadLineAsync()) != null) {
                                 var obj = JsonNode.Parse(line)!.AsObject();
-                                var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbKgs, currentWbRde);
+                                var (d, parts, mods, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
                                 r.Deliveries.Add(d);
                                 r.DeliveryParts.AddRange(parts.Select(p => p.Item1));
                                 r.Modifiers.AddRange(mods);
@@ -238,13 +222,11 @@ namespace Elwig.Helpers.Export {
                 var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
                 var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string? Filters)>();
 
-                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, history, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, contracts, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
                     var branch = branches[meta.ZwstId];
                     var device = meta.Device;
 
                     using var ctx = new AppDbContext();
-                    var tx = await ctx.Database.BeginTransactionAsync();
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
 
                     var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
                     var duplicateKgNrs = await ctx.WbKgs
@@ -252,12 +234,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))
@@ -347,11 +323,6 @@ 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.UpdateRange(contracts.Where(c => duplicateFbNrs.Contains(c.FbNr)));
@@ -409,8 +380,6 @@ namespace Elwig.Helpers.Export {
                     }
 
                     await ctx.SaveChangesAsync();
-                    await ctx.Database.ExecuteSqlAsync($"UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_MEMBER_HISTORY_TRIGGERS'");
-                    await tx.CommitAsync();
 
                     var primaryKeys = new Dictionary<string, string>() {
                         ["member"] = "mgnr, 0, 0",
@@ -473,18 +442,16 @@ namespace Elwig.Helpers.Export {
                 $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?", true);
         }
 
-        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);
@@ -500,7 +467,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; }
 
@@ -520,21 +486,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(),
@@ -565,13 +527,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);
@@ -630,10 +585,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,
-                ["shares_red"] = m.SharesRed,
-                ["shares_white"] = m.SharesWhite,
-                ["shares_dormant"] = m.SharesDormant,
+                ["business_shares"] = m.BusinessShares,
                 ["accounting_nr"] = m.AccountingNr,
                 ["zwstid"] = m.ZwstId,
                 ["lfbis_nr"] = m.LfbisNr,
@@ -682,11 +634,11 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs) {
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
             var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
             var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
-            if (kgnr != null && !currentWbKgs.Values.Any(k => k.KgNr == kgnr)) {
-                throw new KeyNotFoundException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten \u2192 Herkunftshierarchie)");
+            if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
+                throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
             }
             var createdAt = json["created_at"]?.AsValue().GetValue<string>();
             var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
@@ -702,10 +654,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,
-                SharesRed = json["shares_red"]?.AsValue().GetValue<int>() ?? 0,
-                SharesWhite = json["shares_white"]?.AsValue().GetValue<int>() ?? 0,
-                SharesDormant = json["shares_dormant"]?.AsValue().GetValue<int>() ?? 0,
+                BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
                 AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(),
                 ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
                 LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
@@ -750,46 +699,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?.ToString().ToLower(),
-                ["to_mgnr"] = h.ToMgNr,
-                ["to_type"] = h.ToType?.ToString().ToLower(),
-                ["date_notice"] = h.DateNoticeString,
-                ["date_effective"] = h.DateEffectiveString,
-                ["reason"] = h.Reason,
-                ["source"] = h.Source,
-                ["shares"] = h.Shares,
-                ["signed"] = h.MemberHasSigned,
-                ["value_per_share"] = h.ValuePerShare,
-                ["currency"] = h.CurrencyCode,
-                ["deduct_year"] = h.DeductYear,
-                ["comment"] = h.Comment,
-            };
-        }
-
-        public static MemberHistory ToMemberHistory(this JsonNode json) {
-            return new MemberHistory {
-                HistNr = json["histnr"]!.AsValue().GetValue<int>(),
-                FromMgNr = json["from_mgnr"]?.AsValue().GetValue<int>(),
-                FromType = Enum.TryParse<BusinessShareType>(json["from_type"]?.AsValue().GetValue<string>(), true, out var from) ? from : null,
-                ToMgNr = json["to_mgnr"]?.AsValue().GetValue<int>(),
-                ToType = Enum.TryParse<BusinessShareType>(json["to_type"]?.AsValue().GetValue<string>(), true, out var to) ? to : null,
-                DateNoticeString = json["date_notice"]!.AsValue().GetValue<string>(),
-                DateEffectiveString = json["date_effective"]!.AsValue().GetValue<string>(),
-                Reason = json["reason"]!.AsValue().GetValue<string>(),
-                Source = json["source"]!.AsValue().GetValue<string>(),
-                Shares = json["shares"]!.AsValue().GetValue<int>(),
-                MemberHasSigned = json["signed"]?.AsValue().GetValue<bool>() ?? false,
-                ValuePerShare = json["value_per_share"]?.AsValue().GetValue<decimal>(),
-                CurrencyCode = json["currency"]?.AsValue().GetValue<string>(),
-                DeductYear = json["deduct_year"]?.AsValue().GetValue<int>(),
-                Comment = json["comment"]?.AsValue().GetValue<string>(),
-            };
-        }
-
         public static JsonObject ToJson(this AreaComContract c) {
             return new JsonObject {
                 ["fbnr"] = c.FbNr,
@@ -817,13 +726,10 @@ namespace Elwig.Helpers.Export {
             };
         }
 
-        public static (AreaComContract, List<(AreaCom, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaComContract(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaComContract, List<(AreaCom, (DateTime CreatedAt, DateTime ModifiedAt)?)>, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaComContract(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
             var fbnr = json["fbnr"]!.AsValue()!.GetValue<int>();
-            if (!currentWbKgs.Values.Any(k => k.KgNr == kgnr)) {
-                throw new KeyNotFoundException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten \u2192 Herkunftshierarchie)");
-            }
             WbRd? rd = null;
             bool newRd = false;
             if (ried != null) {
@@ -871,12 +777,9 @@ namespace Elwig.Helpers.Export {
              DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
         }
 
-        public static (AreaComContract, AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaComContract, AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
             var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
             var ried = json["ried"]?.AsValue().GetValue<string>();
-            if (!currentWbKgs.Values.Any(k => k.KgNr == kgnr)) {
-                throw new KeyNotFoundException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten \u2192 Herkunftshierarchie)");
-            }
             WbRd? rd = null;
             bool newRd = false;
             if (ried != null) {
@@ -959,13 +862,13 @@ namespace Elwig.Helpers.Export {
             if (p.Unloading != null) obj["unloading"] = p.Unloading;
             if (p.Temperature != null) obj["temperature"] = p.Temperature;
             if (p.Acid != null) obj["acid"] = p.Acid;
-            if (p.ScaleTerminalId != null) obj["scale_terminal"] = p.ScaleTerminalId;
+            if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
             if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
             if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
             return obj;
         }
 
-        public static (Delivery, List<(DeliveryPart, (DateTime CreatedAt, DateTime ModifiedAt)?)>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, WbKg> currentWbKgs, Dictionary<int, List<WbRd>> riede) {
+        public static (Delivery, List<(DeliveryPart, (DateTime CreatedAt, DateTime ModifiedAt)?)>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
             var year = json["year"]!.AsValue().GetValue<int>();
             var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
             var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
@@ -991,9 +894,6 @@ namespace Elwig.Helpers.Export {
             }, [.. json["parts"]!.AsArray().Select(p => p!.AsObject()).Select<JsonObject, (DeliveryPart, (DateTime, DateTime)?)>(p => {
                 var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
                 var ried = p["ried"]?.AsValue().GetValue<string>();
-                if (kgnr != null && !currentWbKgs.Values.Any(k => k.KgNr == kgnr)) {
-                    throw new KeyNotFoundException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten \u2192 Herkunftshierarchie)");
-                }
                 WbRd? rd = null;
                 if (ried != null && kgnr != null) {
                     var rde = riede.GetValueOrDefault(kgnr.Value, []);
@@ -1033,7 +933,7 @@ namespace Elwig.Helpers.Export {
                     Unloading = p["unloading"]?.AsValue().GetValue<string>() ?? ((p["lesewagen"]?.AsValue().GetValue<bool>() ?? false) ? DeliveryPart.Pumped : null),
                     Temperature = p["temperature"]?.AsValue().GetValue<double>(),
                     Acid = p["acid"]?.AsValue().GetValue<double>(),
-                    ScaleTerminalId = p["scale_terminal"]?.AsValue().GetValue<string>() ?? p["scale_id"]?.AsValue().GetValue<string>(),
+                    ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
                     WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
                     WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
                 }, createdAt == null || modifiedAt == null ? null :

Elwig/Helpers/Extensions.cs

@@ -1,18 +1,14 @@
 using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.IO.Hashing;
-using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
 
 namespace Elwig.Helpers {
     public static partial class Extensions {
@@ -135,39 +131,11 @@ namespace Elwig.Helpers {
             return await cmd.ExecuteScalarAsync();
         }
 
-        public static async Task QuickCheck(this SqliteConnection cnx) {
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = "PRAGMA quick_check";
-            using var reader = await cmd.ExecuteReaderAsync();
-            var list = new List<string>();
-            while (await reader.ReadAsync()) {
-                list.Add(reader.GetString(0));
-            }
-
-            if (list.Count != 1 || list[0] != "ok") {
-                throw new FileFormatException($"Integrity problems ({list.Count}):\n" + string.Join("\n", list.Take(50)));
-            }
-        }
-
-        public static async Task IntegrityCheck(this SqliteConnection cnx) {
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = "PRAGMA integrity_check";
-            using var reader = await cmd.ExecuteReaderAsync();
-            var list = new List<string>();
-            while (await reader.ReadAsync()) {
-                list.Add(reader.GetString(0));
-            }
-
-            if (list.Count != 1 || list[0] != "ok") {
-                throw new FileFormatException($"Integrity problems ({list.Count}):\n" + string.Join("\n", list.Take(50)));
-            }
-        }
-
-        public static async Task ForeignKeyCheck(this SqliteConnection cnx) {
+        public static async Task<(string Table, long RowId, string Parent, long FkId)[]> ForeignKeyCheck(this SqliteConnection cnx) {
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = "PRAGMA foreign_key_check";
             using var reader = await cmd.ExecuteReaderAsync();
-            var list = new List<(string Table, long RowId, string Parent, long FkId)>();
+            var list = new List<(string, long, string, long)>();
             while (await reader.ReadAsync()) {
                 var table = reader.GetString(0);
                 var rowid = reader.GetInt64(1);
@@ -175,41 +143,7 @@ namespace Elwig.Helpers {
                 var fkid = reader.GetInt64(3);
                 list.Add((table, rowid, parent, fkid));
             }
-
-            if (list.Count > 0) {
-                throw new InvalidDataException($"Foreign key violations ({list.Count}):\n" + string.Join("\n", list.Take(50)
-                    .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}")));
-            }
-        }
-
-        public static IEnumerable<T> Join<T>(this IEnumerable<T> src, Func<T> separatorFactory) {
-            var srcArr = src.ToArray();
-            for (int i = 0; i < srcArr.Length; i++) {
-                yield return srcArr[i];
-                if (i < srcArr.Length - 1) {
-                    yield return separatorFactory();
-                }
-            }
-        }
-
-        public static void AddToolTipCell(this Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
-            var tb = new TextBlock() {
-                Text = text,
-                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
-                Margin = new(0, 12 * row, 0, 0),
-                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
-            };
-            tb.SetValue(Grid.ColumnProperty, col);
-            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
-            grid.Children.Add(tb);
-        }
-
-        public static (int Year, int Week) GetYearAndWeek(this DateTime date) {
-            return (ISOWeek.GetYear(date), ISOWeek.GetWeekOfYear(date));
-        }
-
-        public static (int Year, int Tertial) GetYearAndTertial(this DateTime date) {
-            return (date.Month <= 7 ? date.Year - 1 : date.Year, date.Month == 12 || date.Month <= 3 ? 2 : date.Month <= 7 ? 3 : 1);
+            return [.. list];
         }
     }
 }

Elwig/Helpers/Printing/Pdf.cs

@@ -1,17 +1,21 @@
 using Elwig.Services;
 using Elwig.Windows;
 using System;
+using System.Drawing.Printing;
+using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        public static void Init(Action? evtHandler = null) {
+        public static Task Init(Action? evtHandler = null) {
             PdfiumNative.FPDF_InitLibrary();
             evtHandler?.Invoke();
+            return Task.CompletedTask;
         }
 
-        public static void Cleanup() {
+        public static Task Cleanup() {
             PdfiumNative.FPDF_DestroyLibrary();
+            return Task.CompletedTask;
         }
 
         public static void Show(TempFile file, string title) {
@@ -28,13 +32,24 @@ namespace Elwig.Helpers.Printing {
             });
         }
 
-        public static void Print(string path, int copies = 1, bool doublePaged = false) {
+        public static async Task Print(string path, int copies = 1, bool doublePaged = false) {
+            await Print(path, new() {
+                Copies = (short)copies,
+                Collate = true,
+                Duplex = doublePaged ? Duplex.Vertical : Duplex.Simplex,
+            });
+        }
+
+        public static Task Print(string path, PrinterSettings settings) {
             try {
-                var printer = new PdfPrinter();
-                printer.Print(path, copies, doublePaged);
+                using var printDoc = new PdfPrintDocument(path) {
+                    PrinterSettings = settings,
+                };
+                printDoc.Print();
             } catch (Exception exc) {
                 InteractionService.ShowException("Fehler beim Drucken", "Beim Drucken ist ein Fehler aufgetreten", exc);
             }
+            return Task.CompletedTask;
         }
     }
 }

Elwig/Helpers/Printing/PdfPrintDocument.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Printing;
+using System.Runtime.InteropServices;
+
+namespace Elwig.Helpers.Printing {
+    public class PdfPrintDocument : PrintDocument {
+
+        private readonly IntPtr _handle;
+        private readonly int _pageCount;
+        private readonly double _dpi;
+
+        private int _currentPage;
+
+        public PdfPrintDocument(string path, string? password = null, double dpi = 300.0) :
+            base() {
+            _handle = PdfiumNative.FPDF_LoadDocument(path, password);
+            _pageCount = PdfiumNative.FPDF_GetPageCount(_handle);
+            _dpi = dpi;
+        }
+
+        protected override void Dispose(bool disposing) {
+            PdfiumNative.FPDF_CloseDocument(_handle);
+            base.Dispose(disposing);
+        }
+
+        protected override void OnBeginPrint(PrintEventArgs evt) {
+            _currentPage = (PrinterSettings.FromPage != 0) ? (PrinterSettings.FromPage - 1) : 0;
+            base.OnBeginPrint(evt);
+        }
+
+        protected override void OnPrintPage(PrintPageEventArgs evt) {
+            if (_currentPage < _pageCount) {
+                IntPtr page = PdfiumNative.FPDF_LoadPage(_handle, _currentPage);
+                double width = PdfiumNative.FPDF_GetPageWidth(page);
+                double height = PdfiumNative.FPDF_GetPageHeight(page);
+                int pixelWidth = (int)(width / 72.0 * _dpi);
+                int pixelHeight = (int)(height / 72.0 * _dpi);
+
+                IntPtr bitmap = PdfiumNative.FPDFBitmap_Create(pixelWidth, pixelHeight, 1);
+                PdfiumNative.FPDF_RenderPageBitmap(bitmap, page, 0, 0, pixelWidth, pixelHeight, 0, 0);
+
+                IntPtr buffer = PdfiumNative.FPDFBitmap_GetBuffer(bitmap);
+                int stride = PdfiumNative.FPDFBitmap_GetStride(bitmap);
+                using (var bmp = new Bitmap(pixelWidth, pixelHeight, stride, PixelFormat.Format32bppArgb, buffer)) {
+                    evt.Graphics?.DrawImage(bmp, evt.PageBounds);
+                }
+                _currentPage++;
+
+                PdfiumNative.FPDFBitmap_Destroy(bitmap);
+                PdfiumNative.FPDF_ClosePage(page);
+            }
+            evt.HasMorePages = _currentPage < ((PrinterSettings.ToPage == 0) ? _pageCount : Math.Min(PrinterSettings.ToPage, _pageCount));
+            base.OnPrintPage(evt);
+        }
+    }
+
+    internal partial class PdfiumNative {
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_InitLibrary();
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_DestroyLibrary();
+
+        [LibraryImport("pdfium.dll", StringMarshalling = StringMarshalling.Utf8)]
+        public static partial IntPtr FPDF_LoadDocument(string filePath, string? password);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_CloseDocument(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDF_GetPageCount(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDF_LoadPage(IntPtr document, int pageIndex);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_ClosePage(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageWidth(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageHeight(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_Create(int width, int height, int alpha);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDFBitmap_Destroy(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_GetBuffer(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDFBitmap_GetStride(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_RenderPageBitmap(IntPtr bitmap, IntPtr page, int start_x, int start_y, int size_x, int size_y, int rotate, int flags);
+    }
+}

Elwig/Helpers/Printing/PdfPrinter.cs

@@ -1,83 +0,0 @@
-using System;
-using System.IO;
-using System.Printing;
-
-namespace Elwig.Helpers.Printing {
-    public class PdfPrinter {
-
-        public string PrinterName { get; init; }
-
-        public PdfPrinter(string? printerName = null) {
-            PrinterName = printerName ?? GetDefaultPrinterName() ?? throw new InvalidOperationException("No default Windows printer is configured.");
-        }
-
-        public void Print(string pdfPath, int copies = 1, bool doublePaged = false) {
-            if (!File.Exists(pdfPath)) throw new FileNotFoundException("PDF file not found.", pdfPath);
-
-            IntPtr document = PdfiumNative.FPDF_LoadDocument(pdfPath, null);
-            if (document == IntPtr.Zero) throw new InvalidOperationException("PDFium could not open the PDF.");
-
-            try {
-                int pageCount = PdfiumNative.FPDF_GetPageCount(document);
-                if (pageCount <= 0)
-                    return;
-
-                using var printer = new Win32Printer.Printer(PrinterName);
-                printer.TrySetDuplex(doublePaged ? Duplexing.TwoSidedLongEdge : Duplexing.OneSided);
-                printer.StartDocument(Path.GetFileName(pdfPath));
-                bool documentStarted = true;
-                try {
-                    for (int i = 0; i < copies; i++) {
-                        for (int j = 0; j < pageCount; j++) {
-                            PrintPage(document, printer, j);
-                        }
-                    }
-                    printer.EndDocument();
-                    documentStarted = false;
-                } finally {
-                    if (documentStarted) printer.AbortDocument();
-                }
-            } finally {
-                PdfiumNative.FPDF_CloseDocument(document);
-            }
-        }
-
-        private static void PrintPage(IntPtr document, Win32Printer.Printer printer, int pageIndex) {
-            if (!PdfiumNative.FPDF_GetPageSizeByIndex(document, pageIndex, out double pageWidthPt, out double pageHeightPt)) {
-                throw new InvalidOperationException($"Unable to obtain PDF page {pageIndex} size.");
-            }
-
-            IntPtr page = PdfiumNative.FPDF_LoadPage(document, pageIndex);
-            if (page == IntPtr.Zero)
-                throw new InvalidOperationException($"Unable to load PDF page {pageIndex}.");
-
-            try {
-                int renderWidth = (int)Math.Round(pageWidthPt / 72.0 * printer.DpiX);
-                int renderHeight = (int)Math.Round(pageHeightPt / 72.0 * printer.DpiY);
-                int offsetX = (printer.PrintableWidth - renderWidth) / 2;
-                int offsetY = (printer.PrintableHeight - renderHeight) / 2;
-
-                printer.StartPage();
-                try {
-                    PdfiumNative.FPDF_RenderPage(printer.Hdc, page, offsetX, offsetY, renderWidth, renderHeight, 0, PdfiumNative.FPDF_PRINTING | PdfiumNative.FPDF_ANNOT);
-                } finally {
-                    printer.EndPage();
-                }
-            } finally {
-                PdfiumNative.FPDF_ClosePage(page);
-            }
-        }
-
-        private static string? GetDefaultPrinterName() {
-            using var key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows NT\CurrentVersion\Windows");
-            string? printer = key?.GetValue("Device") as string;
-            if (string.IsNullOrWhiteSpace(printer))
-                return null;
-
-            // Device has the form:
-            // Printer Name,winspool,PORT
-            int comma = printer.IndexOf(',');
-            return comma >= 0 ? printer[..comma] : printer;
-        }
-    }
-}

Elwig/Helpers/Printing/PdfiumNative.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-
-namespace Elwig.Helpers.Printing {
-    internal partial class PdfiumNative {
-
-        public const int FPDF_ANNOT = 0x01;
-        public const int FPDF_PRINTING = 0x800;
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_InitLibrary();
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_DestroyLibrary();
-
-        [LibraryImport("pdfium.dll", StringMarshalling = StringMarshalling.Utf8)]
-        public static partial IntPtr FPDF_LoadDocument(string filePath, string? password);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_CloseDocument(IntPtr document);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial int FPDF_GetPageCount(IntPtr document);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial IntPtr FPDF_LoadPage(IntPtr document, int pageIndex);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_ClosePage(IntPtr page);
-
-        [LibraryImport("pdfium.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static partial bool FPDF_GetPageSizeByIndex(IntPtr document, int pageIndex, out double width, out double height);
-
-        [LibraryImport("pdfium.dll")]
-        public static partial void FPDF_RenderPage(IntPtr hdc, IntPtr page, int startX, int startY, int sizeX, int sizeY, int rotate, int flags);
-    }
-}

Elwig/Helpers/Printing/Win32Printer.cs

@@ -1,239 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Printing;
-using System.Runtime.InteropServices;
-
-namespace Elwig.Helpers.Printing {
-    public partial class Win32Printer {
-
-        private const int DM_OUT_BUFFER = 2;
-
-        private const int HORZRES = 8;
-        private const int VERTRES = 10;
-        private const int LOGPIXELSX = 88;
-        private const int LOGPIXELSY = 90;
-        private const int PHYSICALWIDTH = 110;
-        private const int PHYSICALHEIGHT = 111;
-        private const int PHYSICALOFFSETX = 112;
-        private const int PHYSICALOFFSETY = 113;
-
-        private const int DM_DUPLEX = 0x1000;
-        private const short DMDUP_SIMPLEX = 1;
-        private const short DMDUP_VERTICAL = 2;
-        private const short DMDUP_HORIZONTAL = 3;
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private struct DOCINFO {
-            public int cbSize;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszDocName;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszOutput;
-
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string? lpszDatatype;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private struct DEVMODE {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string dmDeviceName;
-
-            public short dmSpecVersion;
-            public short dmDriverVersion;
-            public short dmSize;
-            public short dmDriverExtra;
-            public int dmFields;
-
-            public short dmOrientation;
-            public short dmPaperSize;
-            public short dmPaperLength;
-            public short dmPaperWidth;
-            public short dmScale;
-            public short dmCopies;
-            public short dmDefaultSource;
-            public short dmPrintQuality;
-            public short dmColor;
-            public short dmDuplex;
-            public short dmYResolution;
-            public short dmTTOption;
-            public short dmCollate;
-
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string dmFormName;
-
-            public short dmLogPixels;
-            public int dmBitsPerPel;
-            public int dmPelsWidth;
-            public int dmPelsHeight;
-            public int dmDisplayFlags;
-            public int dmDisplayFrequency;
-            public int dmICMMethod;
-            public int dmICMIntent;
-            public int dmMediaType;
-            public int dmDitherType;
-            public int dmReserved1;
-            public int dmReserved2;
-            public int dmPanningWidth;
-            public int dmPanningHeight;
-        }
-
-        [DllImport("winspool.drv", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern bool OpenPrinter(string pPrinterName, out IntPtr phPrinter, IntPtr pDefault);
-
-        [DllImport("winspool.drv", SetLastError = true)]
-        private static extern bool ClosePrinter(IntPtr hPrinter);
-
-        [DllImport("winspool.drv", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern int DocumentProperties(IntPtr hwnd, IntPtr hPrinter, string pDeviceName, IntPtr pDevModeOutput, IntPtr pDevModeInput, int fMode);
-
-        [DllImport("gdi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr CreateDC(string? pDriver, string? pDevice, string? pOutput, IntPtr pInitData);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern bool DeleteDC(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int GetDeviceCaps(IntPtr hdc, int index);
-
-        [DllImport("gdi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern int StartDoc(IntPtr hdc, ref DOCINFO lpdi);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int EndDoc(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int AbortDoc(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int StartPage(IntPtr hdc);
-
-        [DllImport("gdi32.dll", SetLastError = true)]
-        private static extern int EndPage(IntPtr hdc);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr GlobalAlloc(uint uFlags, UIntPtr dwBytes);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr GlobalFree(IntPtr hMem);
-
-        [DllImport("kernel32.dll")]
-        private static extern IntPtr GlobalLock(IntPtr hMem);
-
-        [DllImport("kernel32.dll")]
-        private static extern bool GlobalUnlock(IntPtr hMem);
-
-        public class Printer : IDisposable {
-            private readonly string _printerName;
-            private readonly IntPtr _printerHandle;
-            private readonly IntPtr _devMode;
-            private readonly IntPtr _hdc;
-
-            public IntPtr Hdc => _hdc;
-
-            public int PrintableWidth => GetDeviceCaps(_hdc, HORZRES);
-            public int PrintableHeight => GetDeviceCaps(_hdc, VERTRES);
-            public int DpiX => GetDeviceCaps(_hdc, LOGPIXELSX);
-            public int DpiY => GetDeviceCaps(_hdc, LOGPIXELSY);
-            public int PhysicalWidth => GetDeviceCaps(_hdc, PHYSICALWIDTH);
-            public int PhysicalHeight => GetDeviceCaps(_hdc, PHYSICALHEIGHT);
-            public int PhysicalOffsetX => GetDeviceCaps(_hdc, PHYSICALOFFSETX);
-            public int PhysicalOffsetY => GetDeviceCaps(_hdc, PHYSICALOFFSETY);
-
-            public Printer(string printerName) {
-                _printerName = printerName;
-
-                if (!OpenPrinter(_printerName, out _printerHandle, IntPtr.Zero)) {
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), $"Unable to open printer '{printerName}'.");
-                }
-
-                try {
-                    _devMode = CreateDevMode();
-                    _hdc = CreateDC(null, _printerName, null, _devMode);
-                    if (_hdc == IntPtr.Zero)
-                        throw new Win32Exception(Marshal.GetLastWin32Error(), $"Unable to create printer DC for '{_printerName}'.");
-                } catch {
-                    if (_devMode != IntPtr.Zero) Marshal.FreeHGlobal(_devMode);
-                    ClosePrinter(_printerHandle);
-                    throw;
-                }
-            }
-
-            public bool TrySetDuplex(Duplexing duplex) {
-                var devMode = Marshal.PtrToStructure<DEVMODE>(_devMode);
-                switch (duplex) {
-                    case Duplexing.OneSided: devMode.dmDuplex = DMDUP_SIMPLEX; break;
-                    case Duplexing.TwoSidedShortEdge: devMode.dmDuplex = DMDUP_HORIZONTAL; break;
-                    case Duplexing.TwoSidedLongEdge: devMode.dmDuplex = DMDUP_VERTICAL; break;
-                }
-                if ((devMode.dmFields & DM_DUPLEX) != 0) {
-                    Marshal.StructureToPtr(devMode, _devMode, false);
-                    return true;
-                } else {
-                    devMode.dmFields |= DM_DUPLEX;
-                    Marshal.StructureToPtr(devMode, _devMode, false);
-                    return false;
-                }
-            }
-
-            private IntPtr CreateDevMode() {
-                int size = DocumentProperties(IntPtr.Zero, _printerHandle, _printerName, IntPtr.Zero, IntPtr.Zero, 0);
-                if (size <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "DocumentProperties failed.");
-
-                IntPtr devMode = Marshal.AllocHGlobal(size);
-                int result = DocumentProperties(IntPtr.Zero, _printerHandle, _printerName, devMode, IntPtr.Zero, DM_OUT_BUFFER);
-                if (result < 0) {
-                    Marshal.FreeHGlobal(devMode);
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "Unable to obtain printer DEVMODE.");
-                }
-
-                return devMode;
-            }
-
-            public void StartDocument(string documentName) {
-                var docInfo = new DOCINFO {
-                    cbSize = Marshal.SizeOf<DOCINFO>(),
-                    lpszDocName = documentName,
-                    lpszDatatype = null,
-                    lpszOutput = null
-                };
-
-                if (StartDoc(_hdc, ref docInfo) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "StartDoc failed.");
-            }
-
-            public void StartPage() {
-                if (Win32Printer.StartPage(_hdc) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "StartPage failed.");
-            }
-
-            public void EndPage() {
-                if (Win32Printer.EndPage(_hdc) <= 0)
-                    throw new Win32Exception(Marshal.GetLastWin32Error(), "EndPage failed.");
-            }
-
-            public void EndDocument() {
-                if (EndDoc(_hdc) <= 0)
-                    throw new Win32Exception( Marshal.GetLastWin32Error(), "EndDoc failed.");
-            }
-
-            public void AbortDocument() {
-                AbortDoc(_hdc);
-            }
-
-            public void Dispose() {
-                if (_hdc != IntPtr.Zero)
-                    DeleteDC(_hdc);
-
-                if (_devMode != IntPtr.Zero)
-                    Marshal.FreeHGlobal(_devMode);
-
-                if (_printerHandle != IntPtr.Zero)
-                    ClosePrinter(_printerHandle);
-            }
-        }
-    }
-}

Elwig/Helpers/Utils.cs

@@ -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 {
@@ -45,6 +44,7 @@ namespace Elwig.Helpers {
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 6 ? 1 : 0);
         public static int FollowingSeason => DateTime.Now.Year + (DateTime.Now.Month >= 11 ? 1 : 0);
+        public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
         [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedSerialRegex();
@@ -209,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) {
                     InteractionService.ShowException(title, exc);
                 }
             });
         }
 
-        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]);
         }
@@ -456,7 +443,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));
@@ -515,7 +502,7 @@ namespace Elwig.Helpers {
         public static async Task<SmtpClient?> GetSmtpClient() {
             if (App.Config.Smtp == null)
                 return null;
-            var (host, port, mode, username, password, _, _) = App.Config.Smtp.Value;
+            var (host, port, mode, username, password, _) = App.Config.Smtp.Value;
             var client = new SmtpClient();
             await client.ConnectAsync(host, port, mode == "starttls" ? SecureSocketOptions.StartTls : SecureSocketOptions.None);
             await client.AuthenticateAsync(username, password);
@@ -535,7 +522,6 @@ namespace Elwig.Helpers {
                     msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
                     msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
                     msg.Subject = subject;
-                    msg.Date = DateTime.Now;
                     var body = new Multipart("mixed") {
                         new TextPart("plain") { Text = text }
                     };
@@ -546,10 +532,10 @@ namespace Elwig.Helpers {
                     msg.Body = body;
                     await client!.SendAsync(msg);
                     await AddSentMails([(
-                        "email", member.MgNr, member.AdministrativeName,
-                        member.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
-                        subject, docs.Select(d => d.Title).ToArray()
-                    )]);
+                            "email", member.MgNr, member.AdministrativeName,
+                            member.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
+                            subject, docs.Select(d => d.Title).ToArray()
+                        )]);
                 } catch (Exception exc) {
                     InteractionService.ShowException(exc);
                     return false;
@@ -593,7 +579,7 @@ namespace Elwig.Helpers {
                         await doc.Generate(ctx);
                     }
                     doc.SaveTo(filename);
-                    if (!App.Config.Debug) Process.Start("explorer.exe", filename);
+                    Process.Start("explorer.exe", filename);
                 }
             } else {
                 using (var ctx = new AppDbContext()) {

Elwig/Helpers/Validator.cs

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

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -9,8 +9,9 @@ namespace Elwig.Helpers.Weighing {
     public class AveryEventScale : Scale, IEventScale, IDisposable {
 
         public string Manufacturer => "Avery";
+        public int InternalScaleNr => 1;
         public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
 
@@ -18,11 +19,13 @@ namespace Elwig.Helpers.Weighing {
 
         private bool IsRunning = true;
         private readonly Thread BackgroundThread;
+        private readonly string Connection;
 
         public AveryEventScale(string id, string model, string cnx, string? log = null, bool required = true) :
             base(cnx, null, null, null, log, true, !required) {
-            ScaleTerminalId = id;
+            ScaleId = id;
             Model = model;
+            Connection = cnx;
             IsReady = true;
             HasFillingClearance = false;
             Stream.WriteTimeout = -1;

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -5,17 +5,18 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class GassnerEnqScale : Scale, ICommandScale {
+    public class GassnerScale : Scale, ICommandScale {
 
         public string Manufacturer => "Gassner";
+        public int InternalScaleNr => 1;
         public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
 
-        public GassnerEnqScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+        public GassnerScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
           base(cnx, empty, filling, limit, log) {
-            ScaleTerminalId = id;
+            ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
@@ -23,9 +24,10 @@ namespace Elwig.Helpers.Weighing {
             Stream.ReadTimeout = 11000;
         }
 
-        protected Task SendCommand(string command) => SendCommand(Encoding.ASCII.GetBytes(command));
+        protected Task SendCommand(char command) => SendCommand(Convert.ToByte(command));
 
-        protected async Task SendCommand(byte[] cmd) {
+        protected async Task SendCommand(byte command) {
+            byte[] cmd = [command];
             await Stream.WriteAsync(cmd);
             if (LogPath != null) await File.AppendAllTextAsync(LogPath, Encoding.ASCII.GetString(cmd));
         }
@@ -51,15 +53,15 @@ namespace Elwig.Helpers.Weighing {
             return line[1..^1];
         }
 
-        protected async Task<WeighingResult> Weigh(int? internalScaleNr, bool incIdentNr, bool retry = true) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
             string record;
             try {
-                await SendCommand(incIdentNr ? "\x05" : "?");
+                await SendCommand(incIdentNr ? '\x05' : '?');
                 record = await ReceiveResponse();
             } catch (IOException) {
                 if (!retry || Tcp == null) throw;
                 ReconnectTcp();
-                return await Weigh(internalScaleNr, incIdentNr, false);
+                return await Weigh(incIdentNr, false);
             }
             if (record.Length != 45)
                 throw new FormatException("Invalid response from scale: Received record has invalid size");
@@ -78,7 +80,6 @@ namespace Elwig.Helpers.Weighing {
                 GrossWeight = int.Parse(brutto),
                 TareWeight = int.Parse(tara),
                 NetWeight = int.Parse(netto),
-                ScaleId = scaleNr,
                 WeighingId = identNr,
                 FullWeighingId = identNr,
                 Date = DateOnly.TryParseExact(date, "yyyyMMdd", out var d) ? d : null,
@@ -86,12 +87,12 @@ namespace Elwig.Helpers.Weighing {
             };
         }
 
-        public async Task<WeighingResult> Weigh(int? scaleNr = null) {
-            return await Weigh(scaleNr, true);
+        public async Task<WeighingResult> Weigh() {
+            return await Weigh(true);
         }
 
-        public async Task<WeighingResult> GetCurrentWeight(int? scaleNr = null) {
-            return await Weigh(scaleNr, false);
+        public async Task<WeighingResult> GetCurrentWeight() {
+            return await Weigh(false);
         }
 
         public async Task Empty() {
@@ -125,9 +126,8 @@ namespace Elwig.Helpers.Weighing {
             await SetFillingClearance(false);
         }
 
-        public async Task SetDateAndTime(DateTime dateTime) {
-            await SendCommand($"C{dateTime:yyyyMMddHHmmss}\r");
-            await ReceiveResponse();
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
         }
     }
 }

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -10,13 +10,13 @@ namespace Elwig.Helpers.Weighing {
         /// Get the current weight on the scale without performing a weighing process
         /// </summary>
         /// <returns>Result of the weighing process (probably without a weighing id)</returns>
-        Task<WeighingResult> GetCurrentWeight(int? scaleNr = null);
+        Task<WeighingResult> GetCurrentWeight();
 
         /// <summary>
         /// Perform a weighing process
         /// </summary>
         /// <returns>Result of the weighing process (including a weighing id)</returns>
-        Task<WeighingResult> Weigh(int? scaleNr = null);
+        Task<WeighingResult> Weigh();
 
         /// <summary>
         /// Empty the scale container or grant clearance to do so

Elwig/Helpers/Weighing/IScale.cs

@@ -18,7 +18,12 @@ namespace Elwig.Helpers.Weighing {
         /// <summary>
         /// Unique identificator of the scale
         /// </summary>
-        string ScaleTerminalId { get; }
+        string ScaleId { get; }
+
+        /// <summary>
+        /// Internal identifying number of the scale in its system
+        /// </summary>
+        int InternalScaleNr { get; }
 
         /// <summary>
         /// Indicates if the scale is currently processing a request or not

Elwig/Helpers/Weighing/InvalidScale.cs

@@ -5,7 +5,8 @@ namespace Elwig.Helpers.Weighing {
 
         public string Manufacturer => "NONE";
         public string Model => "NONE";
-        public string ScaleTerminalId => id;
+        public string ScaleId => id;
+        public int InternalScaleNr => 0;
         public bool IsReady => false;
         public bool HasFillingClearance => false;
         public int? WeightLimit => null;

Elwig/Helpers/Weighing/Scale.cs

@@ -28,10 +28,10 @@ namespace Elwig.Helpers.Weighing {
             int? limit = config.Limit != null ? int.Parse(config.Limit) : null;
             if (config.Type == "SysTec-IT") {
                 return new SysTecITScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
-            } else if (config.Type == "Gassner-Enq" || config.Type == "Gassner") {
-                return new GassnerEnqScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
-            } else if (config.Type == "Avery-Event" || config.Type == "Avery-Async") {
+            } else if (config.Type == "Avery-Async") {
                 return new AveryEventScale(config.Id, config.Model!, config.Connection!, config.Log, config.Required);
+            } else if (config.Type == "Gassner") {
+                return new GassnerScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
             } else {
                 throw new ArgumentException($"Invalid scale type: \"{config.Type}\"");
             }

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -8,14 +8,15 @@ namespace Elwig.Helpers.Weighing {
     public class SysTecITScale : Scale, ICommandScale {
 
         public string Manufacturer => "SysTec";
+        public int InternalScaleNr => 1;
         public string Model { get; private set; }
-        public string ScaleTerminalId { get; private set; }
+        public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
 
         public SysTecITScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
             base(cnx, empty, filling, limit, log) {
-            ScaleTerminalId = id;
+            ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
@@ -73,15 +74,15 @@ namespace Elwig.Helpers.Weighing {
             return line[1..^3];
         }
 
-        protected async Task<WeighingResult> Weigh(int internalScalNr, bool incIdentNr, bool retry = true) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
             string record;
             try {
-                await SendCommand(incIdentNr ? $"RN{internalScalNr}" : $"RM{internalScalNr}");
+                await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
                 record = await ReceiveResponse();
             } catch (IOException) {
                 if (!retry || Tcp == null) throw;
                 ReconnectTcp();
-                return await Weigh(internalScalNr, incIdentNr, false);
+                return await Weigh(incIdentNr, false);
             }
             if (record.Length != 62)
                 throw new FormatException("Invalid response from scale: Received record has invalid size");
@@ -113,7 +114,6 @@ namespace Elwig.Helpers.Weighing {
                 GrossWeight = int.Parse(brutto),
                 TareWeight = int.Parse(tara),
                 NetWeight = int.Parse(netto),
-                ScaleId = scaleNr,
                 WeighingId = identNr,
                 FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
                 Date = parsedDate,
@@ -121,12 +121,12 @@ namespace Elwig.Helpers.Weighing {
             };
         }
 
-        public async Task<WeighingResult> Weigh(int? scaleNr = 1) {
-            return await Weigh(scaleNr ?? 1, true);
+        public async Task<WeighingResult> Weigh() {
+            return await Weigh(true);
         }
 
-        public async Task<WeighingResult> GetCurrentWeight(int? scaleNr = 1) {
-            return await Weigh(scaleNr ?? 1, false);
+        public async Task<WeighingResult> GetCurrentWeight() {
+            return await Weigh(false);
         }
 
         public async Task Empty() {

Elwig/Helpers/Weighing/WeighingResult.cs

@@ -21,11 +21,6 @@ namespace Elwig.Helpers.Weighing {
         /// </summary>
         public int? NetWeight;
 
-        /// <summary>
-        /// Reported id of the scale
-        /// </summary>
-        public string? ScaleId;
-
         /// <summary>
         /// Weighing id (or IdentNr) provided by the scale
         /// </summary>
@@ -49,12 +44,11 @@ namespace Elwig.Helpers.Weighing {
         /// <returns>&lt;[GrossWeight-TaraWeight=]NetWeight/WeighingId/Date/Time&gt;</returns>
         public override readonly string ToString() {
             var w = NetWeight != null ? (GrossWeight != null && TareWeight != null ? $"{GrossWeight}-{TareWeight}=" : "") + $"{NetWeight}kg" : "";
-            return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm:ss}>";
+            return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
         }
 
         public readonly JsonObject ToJson() {
             var obj = new JsonObject();
-            if (ScaleId != null) obj["scale"] = ScaleId;
             if (FullWeighingId != null) obj["id"] = FullWeighingId;
             if (WeighingId != null) obj["nr"] = int.Parse(WeighingId);
             if (Date != null) obj["date"] = $"{Date:yyyy-MM-dd}";

Elwig/Models/BusinessShareType.cs

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

Elwig/Models/Dtos/CreditNoteData.cs

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

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -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/MemberAreaComTotalsData.cs

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

Elwig/Models/Dtos/MemberAreaComsData.cs

@@ -14,49 +14,73 @@ namespace Elwig.Models.Dtos {
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
-            ("SortId", "Sorte", null, 12),
-            ("AttrId", "Attribut", null, 16),
-            ("CultId", "Bewirt.", null, 16),
-            ("GstNr", "Parzelle(n)", null, 25),
-            ("Area", "Fläche", "m²", 22),
-            ("MinKg", "Lieferpflicht", "kg", 22),
-            ("MaxKg", "Lieferrecht", "kg", 22),
+            ("SortIds", "Sorte", null, 12),
+            ("AttrIds", "Attribut", null, 16),
+            ("Areas", "Fläche", "m²", 22),
+            ("DeliveryObligations", "Lieferpflicht", "kg", 22),
+            ("DeliveryRights", "Lieferrecht", "kg", 22),
         ];
 
         public MemberAreaComsData(IEnumerable<MemberAreaComsRow> rows, int year) :
             base($"Flächenbindungen", $"Flächenbindungen pro Mitglied {year}", rows, FieldNames) {
         }
 
-        public static async Task<MemberAreaComsData> ForSeason(DbSet<MemberAreaComsRow> table, int year) {
-            return new MemberAreaComsData(await FromDbSet(table, year), year);
+        public static async Task<MemberAreaComsData> ForSeason(DbSet<MemberAreaComsRowSingle> table, int year) {
+            return new MemberAreaComsData(
+               (await FromDbSet(table, year)).GroupBy(
+                   r => r.MgNr,
+                   (k, g) => new MemberAreaComsRow(g)
+             ), year);
         }
 
-        private static async Task<IEnumerable<MemberAreaComsRow>> FromDbSet(DbSet<MemberAreaComsRow> table, int year) {
+        private static async Task<IEnumerable<MemberAreaComsRowSingle>> FromDbSet(DbSet<MemberAreaComsRowSingle> table, int year) {
             return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
                            COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                            p.plz, o.name AS ort, m.address,
-                           t.sortid, t.attrid, c.cultid,
-                           c.gstnr, c.area,
-                           CAST(ROUND(area * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
-                           CAST(ROUND(area * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg
-                    FROM v_virtual_season s, area_commitment c
-                        JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                        LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+                           c.bucket, c.area, c.min_kg, c.max_kg
+                    FROM v_area_commitment_bucket_strict c
                         LEFT JOIN member m ON m.mgnr = c.mgnr
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                         LEFT JOIN AT_ort o ON o.okz = p.okz
-                    WHERE s.year = {year} AND
-                          (year_from IS NULL OR year_from <= s.year) AND
-                          (year_to IS NULL OR year_to >= s.year)
-                    ORDER BY c.mgnr, t.sortid, t.attrid, c.cultid, c.gstnr;
+                    WHERE c.year = {year}
+                    ORDER BY m.mgnr, c.bucket
                     """).ToListAsync();
         }
     }
 
-    [Keyless]
     public class MemberAreaComsRow {
+        public int MgNr;
+        public string Name1;
+        public string? Name2;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] SortIds;
+        public string[] AttrIds;
+        public int[] Areas;
+        public int[] DeliveryObligations;
+        public int[] DeliveryRights;
+
+        public MemberAreaComsRow(IEnumerable<MemberAreaComsRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name1 = f.Name1;
+            Name2 = f.Name2;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
+            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            DeliveryObligations = rows.Select(r => r.MinKg).ToArray();
+            DeliveryRights = rows.Select(r => r.MaxKg).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class MemberAreaComsRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("name_1")]
@@ -69,14 +93,8 @@ namespace Elwig.Models.Dtos {
         public int Plz { get; set; }
         [Column("ort")]
         public required string Locality { get; set; }
-        [Column("sortid")]
-        public required string SortId { get; set; }
-        [Column("attrid")]
-        public string? AttrId { get; set; }
-        [Column("cultid")]
-        public string? CultId { get; set; }
-        [Column("gstnr")]
-        public required string GstNr { get; set; }
+        [Column("bucket")]
+        public required string VtrgId { get; set; }
         [Column("area")]
         public int Area { get; set; }
         [Column("min_kg")]

Elwig/Models/Dtos/MemberDeliveryData.cs

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

Elwig/Models/Dtos/MemberListData.cs

@@ -19,7 +19,7 @@ namespace Elwig.Models.Dtos {
             ("Locality", "Ort", null, 60),
             ("DefaultKg", "Stammgemeinde", null, 60),
             ("Branch", "Zweigstelle", null, 40),
-            ("SharesActive", "GA", null, 10),
+            ("BusinessShares", "GA", null, 10),
             ("BillingName", "Rechnungsname", null, 60),
             ("BillingAddress", "Rechnungsadresse", null, 60),
             ("BillingPlz", "PLZ", null, 10),
@@ -66,10 +66,7 @@ namespace Elwig.Models.Dtos {
         public string? Name2;
         public string? DefaultKg;
         public string? Branch;
-        public int Shares;
-        public int SharesRed;
-        public int SharesWhite;
-        public int SharesActive;
+        public int BusinessShares;
         public string Address;
         public int Plz;
         public string Locality;
@@ -101,10 +98,7 @@ namespace Elwig.Models.Dtos {
             Name2 = m.AdministrativeName2;
             DefaultKg = m.DefaultKg?.Name;
             Branch = m.Branch?.Name;
-            Shares = m.Shares;
-            SharesRed = m.SharesRed;
-            SharesWhite = m.SharesWhite;
-            SharesActive = Shares + SharesRed + SharesWhite;
+            BusinessShares = m.BusinessShares;
             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) :
-            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) {
+        public static async Task<OverUnderDeliveryData> 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,
-                       h.shares * COALESCE(s.min_kg_per_share, 0) AS min_kg,
-                       h.shares * COALESCE(s.max_kg_per_share, 0) AS max_kg,
-                       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,
-                       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
+                       p.plz, o.name AS ort, m.address, m.business_shares,
+                       m.business_shares * s.min_kg_per_bs AS min_kg,
+                       m.business_shares * s.max_kg_per_bs AS max_kg,
+                       COALESCE(SUM(d.weight), 0) AS sum
                 FROM 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_stat_member d ON (d.year, d.mgnr) = (s.year, m.mgnr)
-                WHERE s.year = {year} AND (m.active = TRUE OR d.weight_total > 0)
-                ORDER BY 100.0 * weight_total / (max_kg + max_kg_red + max_kg_white), m.mgnr
+                    LEFT JOIN v_delivery d ON (d.year, d.mgnr) = (s.year, m.mgnr)
+                WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
+                GROUP BY s.year, 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")]
-        public int Shares { get; set; }
-        [Column("shares_red")]
-        public int SharesRed { get; set; }
-        [Column("shares_white")]
-        public int SharesWhite { get; set; }
+        [Column("business_shares")]
+        public int BusinessShares { 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) :
-            WeightTotal > DeliveryRight ? (WeightTotal - DeliveryRight, WeightTotal * 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; }
+            Weight < DeliveryObligation ? (Weight - DeliveryObligation, Weight * 100.0 / DeliveryObligation - 100.0) :
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100.0) : (null, null);
     }
 }

Elwig/Models/Entities/DeliveryPart.cs

@@ -118,18 +118,17 @@ namespace Elwig.Models.Entities {
         [Column("acid")]
         public double? Acid { get; set; }
 
-        [Column("scale_terminal")]
-        public string? ScaleTerminalId { get; set; }
+        [Column("scale_id")]
+        public string? ScaleId { get; set; }
 
         [Column("weighing_data")]
         public string? WeighingData { get; set; }
         [NotMapped]
-        public (string? ScaleId, string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
+        public (string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo {
             get {
                 try {
                     var obj = JsonNode.Parse(WeighingData!)!.AsObject();
                     return (
-                        obj["scale"]?.AsValue().GetValue<string>(),
                         obj["id"]?.AsValue().GetValue<string>(),
                         obj["gross_weight"]?.AsValue().GetValue<int>(),
                         obj["tare_weight"]?.AsValue().GetValue<int>(),
@@ -138,7 +137,7 @@ namespace Elwig.Models.Entities {
                         TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue<string>(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null
                     );
                 } catch {
-                    return (null, null, null, null, null, null, null);
+                    return (null, null, null, null, null, null);
                 }
             }
         }

Elwig/Models/Entities/Member.cs

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

Elwig/Models/Entities/MemberHistory.cs

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

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

Elwig/Resources/Sql/40-41.sql

@@ -1,37 +0,0 @@
--- schema version 40 to 41
-
-PRAGMA writable_schema = ON;
-
-UPDATE sqlite_schema SET sql = REPLACE(sql, 'scale_id      ', 'scale_terminal')
-WHERE type = 'table' AND name = 'delivery_part';
-
-DROP VIEW v_bki_delivery;
-DROP VIEW v_bki_member;
-
-CREATE VIEW v_bki_member AS
-SELECT s.year, m.mgnr, m.lfbis_nr, m.name,
-       (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names,
-       a.name AS billing_name, COALESCE(a.address, m.address) AS address,
-       COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest,
-       m.volllieferant AS vollablieferer,
-       SUM(COALESCE(IIF((c.year_from IS NULL OR c.year_from <= s.year) AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, NULL), 0)) AS area
-FROM season s, member m
-    LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
-    LEFT JOIN area_commitment c ON c.mgnr = m.mgnr
-GROUP BY s.year, m.mgnr;
-
-CREATE VIEW v_bki_delivery AS
-SELECT m.lfbis_nr, m.name, m.other_names, m.billing_name,
-       m.address, plz.plz, IIF(INSTR(o.name, ',') = 0, o.name, SUBSTR(o.name, 1, INSTR(o.name, ',') - 1)) AS ort,
-       d.date, d.weight, v.type, v.sortid, d.qualid, d.year, d.hkid, d.kmw, d.oe,
-       m.vollablieferer, m.area
-FROM v_delivery d
-    JOIN v_bki_member m ON (m.year, m.mgnr) = (d.year, d.mgnr)
-    JOIN postal_dest pd ON (pd.country, pd.id) = (m.country, m.postal_dest)
-    LEFT JOIN AT_plz_dest ap ON (ap.country, ap.id) = (pd.country, pd.id)
-    LEFT JOIN AT_plz plz ON plz.plz = ap.plz
-    LEFT JOIN AT_ort o ON o.okz = ap.okz
-    JOIN wine_variety v ON v.sortid = d.sortid
-ORDER BY d.date, d.time;
-
-PRAGMA writable_schema = OFF;

Elwig/Services/AreaComService.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using System.Windows;
 
 namespace Elwig.Services {
     public static class AreaComService {
@@ -114,7 +115,7 @@ namespace Elwig.Services {
                 using var ctx = new AppDbContext();
                 var c = new AreaComContract {
                     FbNr = oldFbNr ?? newFbNr,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                     KgNr = vm.Kg!.KgNr,
                     RdNr = vm.Rd?.RdNr,
                 };
@@ -157,13 +158,25 @@ namespace Elwig.Services {
             });
         }
 
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int area, int? min, int? max) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, bold: bold);
-            grid.AddToolTipCell($"{area:N0} m²", row, 2, bold: bold, alignRight: true);
-            grid.AddToolTipCell(min == null ? "" : $"{min:N0} kg", row, 3, bold: bold, alignRight: true);
-            grid.AddToolTipCell(max == null ? "" : $"{max:N0} kg", row, 4, bold: bold, alignRight: true);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{area:N0} m²", row, 2, 1, bold, true);
+            AddToolTipCell(grid, min == null ? "" : $"{min:N0} kg", row, 3, 1, bold, true);
+            AddToolTipCell(grid, max == null ? "" : $"{max:N0} kg", row, 4, 1, bold, true);
         }
 
         public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
@@ -242,8 +255,8 @@ namespace Elwig.Services {
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
             grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.AddToolTipCell("Lieferpflicht", 0, 3, alignCenter: true);
-            grid.AddToolTipCell("Lieferrecht", 0, 4, 1, alignCenter: true);
+            AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
+            AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
             int rowNum = 1;
             foreach (var row in data) {
                 if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;

Elwig/Services/BackupService.cs

@@ -1,133 +0,0 @@
-using Elwig.Helpers;
-using Elwig.Helpers.Export;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Elwig.Services {
-    public static class BackupService {
-
-        public static bool IsAnyBackupUpToDate {
-            get {
-                var lastDbWrite = File.GetLastWriteTime(App.Config.DatabaseFile);
-                lastDbWrite += new TimeSpan(0, 0, -1);
-                return Directory.GetFiles(App.Config.BackupPath, "????-??-??_??-??-??.*.zip")
-                    .Any(n => DateTime.ParseExact(Path.GetFileName(n)[..19], "yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.None) >= lastDbWrite);
-            }
-        }
-
-        public static async Task TryDatabaseBackup() {
-            if (IsAnyBackupUpToDate) return;
-            await BackupDatabase();
-            PruneBackups();
-        }
-
-        public static async Task BackupDatabase() {
-            await Database.ExportSql(Path.Combine(App.Config.BackupPath, $"{File.GetLastWriteTime(App.Config.DatabaseFile):yyyy-MM-dd_HH-mm-ss}.sql.zip"), true);
-        }
-
-        public static void PruneBackups() {
-            var retain = new HashSet<string>();
-            var backups = Directory.GetFiles(App.Config.BackupPath, "????-??-??_??-??-??.*.zip")
-                .Select(n => (FileName: n, Timestamp: DateTime.ParseExact(Path.GetFileName(n)[..19], "yyyy-MM-dd_HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.None)))
-                .OrderByDescending(t => t.Timestamp).ToArray();
-
-            DateTime now;
-
-            // retain hourly backups
-            now = DateTime.Now;
-            for (int i = 0; i < App.Config.BackupRetainHours; i++, now = now.AddHours(-1)) {
-                foreach (var b in backups) {
-                    if (b.Timestamp.Date == now.Date && b.Timestamp.Hour == now.Hour) {
-                        retain.Add(b.FileName);
-                        break;
-                    }
-                }
-            }
-
-            // retain daily backups
-            now = DateTime.Now;
-            for (int i = 0; i < App.Config.BackupRetainDays; i++, now = now.AddDays(-1)) {
-                foreach (var b in backups) {
-                    if (b.Timestamp.Date == now.Date) {
-                        retain.Add(b.FileName);
-                        break;
-                    }
-                }
-            }
-
-            // retain weekly backups
-            now = DateTime.Now;
-            for (int i = 0; i < App.Config.BackupRetainWeeks; i++, now = now.AddDays(-7)) {
-                foreach (var b in backups) {
-                    if (b.Timestamp.GetYearAndWeek() == now.GetYearAndWeek()) {
-                        retain.Add(b.FileName);
-                        break;
-                    }
-                }
-            }
-
-            // retain monthly backups
-            now = DateTime.Now;
-            for (int i = 0; i < App.Config.BackupRetainMonths; i++, now = now.AddMonths(-1)) {
-                foreach (var b in backups) {
-                    if (b.Timestamp.Year == now.Year && b.Timestamp.Month == now.Month) {
-                        retain.Add(b.FileName);
-                        break;
-                    }
-                }
-            }
-
-            // retain tertial backups
-            now = new DateTime(DateTime.Now.Year + 1, 3, 1);
-            for (int i = 0; i < 600; i++, now = now.AddMonths(-4)) {
-                foreach (var b in backups) {
-                    if (b.Timestamp.GetYearAndTertial() == now.GetYearAndTertial()) {
-                        retain.Add(b.FileName);
-                        break;
-                    }
-                }
-            }
-
-            // delete non-retained files
-            foreach (var b in backups) {
-                if (retain.Contains(b.FileName)) continue;
-                try {
-                    File.Delete(b.FileName);
-                } catch { }
-            }
-            // delete temp files
-            foreach (var f in Directory.GetFiles(App.Config.BackupPath, "*.tmp")) {
-                try {
-                    File.Delete(f);
-                } catch { }
-            }
-        }
-
-        public static async Task RestoreDatabase() {
-            try {
-                var d = new OpenFileDialog() {
-                    Title = "Datenbank wiederherstellen - Elwig",
-                    DefaultDirectory = App.Config.BackupPath,
-                    InitialDirectory = App.Config.BackupPath,
-                    DefaultExt = "sql.zip",
-                    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?"))
-                        return;
-                    Mouse.OverrideCursor = Cursors.Wait;
-                    await App.ReplaceDatabase(d.FileName);
-                }
-            } catch (Exception exc) {
-                InteractionService.ShowException(exc);
-            }
-            Mouse.OverrideCursor = null;
-        }
-    }
-}

Elwig/Services/DeliveryAncmtService.cs

@@ -8,6 +8,8 @@ using Microsoft.EntityFrameworkCore;
 using Elwig.Documents;
 using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
+using System.Windows.Input;
+using System.Windows;
 using System;
 using LinqKit;
 using System.Windows.Controls;
@@ -45,8 +47,7 @@ namespace Elwig.Services {
                 deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == s.Year && a.DsNr == s.DsNr);
                 filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}");
             } else {
-                var today = DateTime.Today;
-                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0));
+                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0));
                 filterNames.Add($"{vm.FilterSeason}");
             }
 
@@ -261,30 +262,54 @@ namespace Elwig.Services {
             if (mode == ExportMode.SaveList) {
                 var filename = InteractionService.SaveFile(DeliveryAncmtList.Name, DeliveryAncmtList.Name, "ods");
                 if (filename != null) {
-                    await Utils.RunForeground(async () => {
-                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                        using var ods = new OdsFile(filename);
-                        await ods.AddTable(data);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                            using var ods = new OdsFile(filename);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else {
-                await Utils.RunForeground(async () => {
-                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
-                    await Utils.ExportDocument(doc, mode);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                        using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{weight:N0} kg", row, 2, bold: bold, alignRight: true);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
             if (total1 != null && total1 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 3, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
             if (total2 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 4, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
         }
 
         public static async Task<(string Text, (string?, string?, int, int?, int)[] Grid)> GenerateToolTipData(IQueryable<DeliveryAncmt> deliveryAncmts) {

Elwig/Services/DeliveryScheduleService.cs

@@ -49,9 +49,8 @@ namespace Elwig.Services {
                 filterNames.Add($"{vm.FilterSeason}");
             }
             if (vm.FilterOnlyUpcoming) {
-                var today = DateTime.Today;
-                deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0);
-                filterNames.Add($"ab {today:dd.MM.yyyy}");
+                deliveryScheduleQuery = deliveryScheduleQuery.Where(s => s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0);
+                filterNames.Add($"ab {Utils.Today:dd.MM.yyyy}");
             }
 
             var filterVar = new List<string>();

Elwig/Services/DeliveryService.cs

@@ -6,6 +6,8 @@ using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Windows;
 using System;
 using Elwig.ViewModels;
 using LinqKit;
@@ -22,6 +24,15 @@ namespace Elwig.Services {
             FromFilters, FromToday, FromSeason, FromSeasonAndBranch, Selected,
         };
 
+        public static async Task<Member?> GetMemberAsync(int mgnr) {
+            using var ctx = new AppDbContext();
+            return await ctx.FetchMembers(mgnr).SingleOrDefaultAsync();
+        }
+
+        public static Member? GetMember(int mgnr) {
+            return GetMemberAsync(mgnr).GetAwaiter().GetResult();
+        }
+
         public static void ClearInputs(this DeliveryAdminViewModel vm) {
         }
 
@@ -67,50 +78,11 @@ namespace Elwig.Services {
             vm.IsGebunden = p.IsGebunden;
             vm.Unloading = p.Unloading;
 
-            vm.ScaleTerminalId = p.ScaleTerminalId;
+            vm.ScaleId = p.ScaleId;
             vm.WeighingData = p.WeighingData;
             vm.ManualWeighingReason = p.WeighingReason;
         }
 
-        public static (DateTime From, DateTime To)? GetFilterToday(DateTime today, IEnumerable<DateTime> timestamps) {
-            var filtered = timestamps.Where(t => t >= today.AddDays(-1) && t < today.AddDays(1)).Order().ToArray();
-            if (filtered.Length == 0) return null;
-
-            var latest = filtered.Last();
-            var since = filtered.Cast<DateTime>().Reverse().Aggregate(latest, (s, c) => s.Subtract(c).TotalHours <= 6 ? c : s);
-            latest += new TimeSpan(0, 1, -latest.Minute, -latest.Second, -latest.Millisecond, -latest.Microsecond);
-            since += new TimeSpan(0, 0, -since.Minute, -since.Second, -since.Millisecond, -since.Microsecond);
-
-            if (since.Subtract(today) <= new TimeSpan(-6, 0, 0) && latest.Subtract(today) < new TimeSpan(0, 0, 0))
-                return null;
-
-            return (since, latest);
-        }
-
-        private static async Task<(Expression<Func<Delivery, bool>>, string)> GetFilterToday(AppDbContext ctx) {
-            var today = DateTime.Today;
-            var timestamps = (await ctx.Deliveries
-                   .Where(d => d.DateString.CompareTo(today.AddDays(-1).ToString("yyyy-MM-dd")) >= 0)
-                   .OrderBy(d => d.DateString).ThenBy(d => d.TimeString)
-                   .Select(d => d.DateString + " " + d.TimeString)
-                   .ToListAsync())
-                   .Select(s => DateTime.TryParseExact(s, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out var dt) ? (DateTime?)dt : null)
-                   .Where(t => t.HasValue)
-                   .Cast<DateTime>()
-                   .ToArray();
-
-            var res = GetFilterToday(today, timestamps);
-            if (!res.HasValue) {
-                return (_ => false, today.ToString("dd.MM.yyyy"));
-            } else {
-                var from = res.Value.From;
-                var to = res.Value.To;
-                return (d => (d.DateString == from.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo(from.ToString("HH:mm:ss")) >= 0)) ||
-                             (d.DateString.CompareTo(from.ToString("yyyy-MM-dd")) > 0),
-                        from.Date == to.Date ? from.ToString("dd.MM.yyyy") : $"{from:dd.MM.yyyy \\a\\b HH:mm} / {to:dd.MM.yyyy \\b\\i\\s HH:mm}");
-            }
-        }
-
         public static async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, Predicate<DeliveryPart>, List<string>)> GetFilters(this DeliveryAdminViewModel vm, AppDbContext ctx) {
             List<string> filterNames = [];
             IQueryable<Delivery> deliveryQuery = ctx.Deliveries;
@@ -123,9 +95,10 @@ namespace Elwig.Services {
                 filterNames.Add(vm.FilterMember.AdministrativeName);
             }
             if (vm.FilterTodayOnly) {
-                var (pred, name) = await GetFilterToday(ctx);
-                deliveryQuery = deliveryQuery.Where(pred);
-                filterNames.Add(name);
+                deliveryQuery = deliveryQuery
+                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") > 0)) ||
+                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && (d.TimeString == null || d.TimeString.CompareTo("03:00:00") <= 0)));
+                filterNames.Add(Utils.Today.ToString("dd.MM.yyyy"));
             } else if (!vm.FilterAllSeasons) {
                 deliveryQuery = deliveryQuery.Where(d => d.Year == vm.FilterSeason);
                 filterNames.Add($"{vm.FilterSeason}");
@@ -514,7 +487,7 @@ namespace Elwig.Services {
                 if (partNew && timeIsDefault) {
                     newTimeString = DateTime.Now.ToString("HH:mm:ss");
                 } else if (partNew || timeHasChanged) {
-                    newTimeString = string.IsNullOrWhiteSpace(vm.Time) ? null : vm.Time + ":00";
+                    newTimeString = string.IsNullOrEmpty(vm.Time) ? null : vm.Time + ":00";
                 }
 
                 var d = new Delivery {
@@ -526,7 +499,7 @@ namespace Elwig.Services {
                     ZwstId = vm.Branch!.ZwstId,
                     LsNr = newLsNr ?? vm.LsNr!,
                     MgNr = vm.MgNr!.Value,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                 };
 
                 p = new DeliveryPart {
@@ -549,11 +522,11 @@ namespace Elwig.Services {
                     Unloading = vm.Unloading,
                     Temperature = vm.Temperature,
                     Acid = vm.Acid,
-                    Comment = string.IsNullOrWhiteSpace(vm.PartComment) ? null : vm.PartComment,
+                    Comment = string.IsNullOrEmpty(vm.PartComment) ? null : vm.PartComment,
 
                     Weight = vm.Weight!.Value,
                     IsManualWeighing = vm.IsManualWeighing,
-                    ScaleTerminalId = vm.ScaleTerminalId,
+                    ScaleId = vm.ScaleId,
                     WeighingData = vm.WeighingData,
                     WeighingReason = vm.ManualWeighingReason,
                 };
@@ -753,10 +726,16 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            await Utils.RunForeground(async () => {
-                using var doc = await DeliveryNote.Initialize(year, did);
-                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}"));
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    using var doc = await DeliveryNote.Initialize(year, did);
+                    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}"));
+                } catch (Exception exc) {
+                    InteractionService.ShowException(exc);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateDeliveryJournal(this DeliveryAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -768,9 +747,10 @@ namespace Elwig.Services {
                 query = q;
                 filterNames.AddRange(f);
             } else if (subject == ExportSubject.FromToday) {
-                var (pred, name) = await GetFilterToday(ctx);
-                query = ctx.Deliveries.Where(pred).SelectMany(d => d.Parts);
-                filterNames.Add(name);
+                var date = $"{Utils.Today:yyyy-MM-dd}";
+                query = ctx.DeliveryParts
+                    .Where(p => p.Delivery.DateString == date);
+                filterNames.Add($"{Utils.Today:dd.MM.yyyy}");
             } else if (subject == ExportSubject.FromSeasonAndBranch) {
                 query = ctx.DeliveryParts
                     .Where(p => p.Year == Utils.CurrentLastSeason && p.Delivery.ZwstId == App.ZwstId);
@@ -794,42 +774,62 @@ namespace Elwig.Services {
             if (mode == ExportMode.SaveList) {
                 var filename = InteractionService.SaveFile(DeliveryJournal.Name, DeliveryJournal.Name, "ods");
                 if (filename != null) {
-                    await Utils.RunForeground(async () => {
-                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                        using var ods = new OdsFile(filename);
-                        await ods.AddTable(data);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                            using var ods = new OdsFile(filename);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    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");
                 if (filename != null) {
                     if (!filename.EndsWith(".elwig.zip")) filename += ".elwig.zip";
-                    await Utils.RunForeground(async () => {
-                        var list = await query
-                            .Select(p => p.Delivery)
-                            .Distinct()
-                            .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
-                            .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(filename, list, wbKgs, filterNames);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var list = await query
+                                .Select(p => p.Delivery)
+                                .Distinct()
+                                .Include(d => d.Parts).ThenInclude(p => p.PartModifiers)
+                                .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(filename, list, wbKgs, filterNames);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    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 () => {
-                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                    using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
-                    await Utils.ExportDocument(doc, mode);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -842,18 +842,25 @@ namespace Elwig.Services {
                 query = q;
                 filterNames.AddRange(f);
             } else if (subject == ExportSubject.FromToday) {
-                var (pred, name) = await GetFilterToday(ctx);
-                query = ctx.Deliveries.Where(pred).SelectMany(d => d.Parts);
-                filterNames.Add(name);
+                var date = $"{Utils.Today:yyyy-MM-dd}";
+                query = ctx.DeliveryParts
+                    .Where(p => p.Delivery.DateString == date);
+                filterNames.Add($"{Utils.Today:dd.MM.yyyy}");
             } else {
                 throw new ArgumentException("Invalid value for ExportSubject");
             }
 
-            await Utils.RunForeground(async () => {
-                var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
-                using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
-                await Utils.ExportDocument(doc, mode);
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
+                    using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
+                    await Utils.ExportDocument(doc, mode);
+                } catch (Exception exc) {
+                    InteractionService.ShowException(exc);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateLocalityStatistics(this DeliveryAdminViewModel vm, ExportSubject subject) {
@@ -871,11 +878,17 @@ namespace Elwig.Services {
 
             var filename = InteractionService.SaveFile("Lieferstatistik pro Ort", $"Lieferstatistik-{vm.FilterSeason ?? Utils.CurrentLastSeason}", "ods");
             if (filename != null) {
-                await Utils.RunForeground(async () => {
-                    using var ods = new OdsFile(filename);
-                    var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
-                    await ods.AddTable(tbl);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ods = new OdsFile(filename);
+                        var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
+                        await ods.AddTable(tbl);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -908,26 +921,38 @@ namespace Elwig.Services {
             if (mode == ExportMode.SaveList) {
                 var filename = InteractionService.SaveFile(DeliveryDepreciationList.Name, $"{DeliveryDepreciationList.Name}-{vm.FilterSeason ?? Utils.CurrentLastSeason}", "ods");
                 if (filename != null) {
-                    await Utils.RunForeground(async () => {
-                        using var ods = new OdsFile(filename);
-                        var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
-                        tblTotal.FullName = DeliveryDepreciationList.Name;
-                        tblTotal.Name = "Gesamt";
-                        await ods.AddTable(tblTotal);
-                        foreach (var branch in await ctx.FetchBranches().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);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            using var ods = new OdsFile(filename);
+                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
+                            tblTotal.FullName = DeliveryDepreciationList.Name;
+                            tblTotal.Name = "Gesamt";
+                            await ods.AddTable(tblTotal);
+                            foreach (var branch in await ctx.FetchBranches().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) {
+                            InteractionService.ShowException(exc);
                         }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else {
-                await Utils.RunForeground(async () => {
-                    var data = await DeliveryJournalData.FromQuery(query, filterNames);
-                    using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
-                    await Utils.ExportDocument(doc, mode);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
+                        using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -956,34 +981,52 @@ namespace Elwig.Services {
 
             var filename = InteractionService.SaveFile("Liefermengen", "Liefermengen", "ods");
             if (filename != null) {
-                await Utils.RunForeground(async () => {
-                    using var ods = new OdsFile(filename);
-                    var tblTotal = await MemberDeliveryData.FromQuery(query, filterNames);
-                    var tbl = await MemberDeliveryPerVarietyData.FromQuery(query, filterNames);
-                    await ods.AddTable(tblTotal);
-                    await ods.AddTable(tbl);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ods = new OdsFile(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) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
         private static void AddWeightToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, 1, bold);
-            grid.AddToolTipCell($"{weight:N0} kg", row, 2, bold: bold, alignRight: true);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
             if (total1 != null && total1 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total1:N1} %", row, 3, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
             if (total2 != 0)
-                grid.AddToolTipCell($"{weight * 100.0 / total2:N1} %", row, 4, bold: bold, alignRight: true);
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
         }
 
         private static void AddGradationToolTipRow(Grid grid, int row, string? h1, string? h2, double min, double avg, double max) {
             var bold = h2 == null;
-            if (h1 != null) grid.AddToolTipCell(h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
-            if (h2 != null) grid.AddToolTipCell(h2 + ":", row, 1, bold: bold);
-            grid.AddToolTipCell($"{min:N1}°", row, 2, bold: bold, alignRight: true);
-            grid.AddToolTipCell($"{avg:N1}°", row, 3, bold: bold, alignRight: true);
-            grid.AddToolTipCell($"{max:N1}°", row, 4, bold: bold, alignRight: true);
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{min:N1}°", row, 2, 1, bold, true);
+            AddToolTipCell(grid, $"{avg:N1}°", row, 3, 1, bold, true);
+            AddToolTipCell(grid, $"{max:N1}°", row, 4, 1, bold, true);
         }
 
         public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
@@ -1112,9 +1155,9 @@ namespace Elwig.Services {
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
             gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.AddToolTipCell("Min.", 0, 2, alignCenter: true);
-            gGrid.AddToolTipCell("⌀", 0, 3, alignCenter: true);
-            gGrid.AddToolTipCell("Max.", 0, 4, alignCenter: true);
+            AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
+            AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
+            AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
             rowNum = 1;
             foreach (var row in gradationData) {
                 if (rowNum != 1 && row.Item2 == null) rowNum++;
@@ -1153,7 +1196,8 @@ namespace Elwig.Services {
                     $"Soll wirklich für {dids.Length:N0} Teillieferung(en) das Attribut\n'{attributeName}' gesetz werden?"))
                     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}
@@ -1164,6 +1208,8 @@ namespace Elwig.Services {
                 });
             } catch (Exception exc) {
                 InteractionService.ShowException(exc);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -1180,7 +1226,8 @@ namespace Elwig.Services {
                     $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' hinzugefügt werden?"))
                     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)
@@ -1192,6 +1239,8 @@ namespace Elwig.Services {
                 });
             } catch (Exception exc) {
                 InteractionService.ShowException(exc);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -1208,7 +1257,8 @@ namespace Elwig.Services {
                     $"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' entfernt werden?"))
                     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
@@ -1219,6 +1269,8 @@ namespace Elwig.Services {
                 });
             } catch (Exception exc) {
                 InteractionService.ShowException(exc);
+            } finally {
+                Mouse.OverrideCursor = null;
             }
         }
     }

Elwig/Services/InteractionService.cs

@@ -1,4 +1,4 @@
-using Microsoft.Win32;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Windows;
@@ -7,13 +7,6 @@ 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",
@@ -26,10 +19,7 @@ namespace Elwig.Services {
         };
 
         public static void ShowInformation(string title, string text) {
-            if (NextInformation != null) {
-                NextInformation(title, text);
-                NextInformation = null;
-            } else if (Override != null) {
+            if (Override != null) {
                 Override("information", title, text);
             } else {
                 MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Information);
@@ -37,36 +27,15 @@ namespace Elwig.Services {
         }
 
         public static bool AskContinue(string title, string text) {
-            if (NextContinue != null) {
-                var r = NextContinue(title, text);
-                NextContinue = null;
-                return r;
-            } else if (Override != null) {
+            if (Override != null) {
                 return Override("continue", title, text) != null;
             } else {
                 return MessageBox.Show(text, title, MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel) == MessageBoxResult.OK;
             }
         }
 
-        public static bool? AskContinueYesNo(string title, string text) {
-            if (NextContinue != null) {
-                var r = NextContinue(title, text);
-                NextContinue = null;
-                return r;
-            } else if (Override != null) {
-                return Override("continue", title, text) != null;
-            } else {
-                var r = MessageBox.Show(text, title, MessageBoxButton.YesNoCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
-                return r == MessageBoxResult.Yes ? true : r == MessageBoxResult.No ? false : null;
-            }
-        }
-
         public static bool AskConfirmation(string title, string text) {
-            if (NextConfirmation != null) {
-                var r = NextConfirmation(title, text);
-                NextConfirmation = null;
-                return r;
-            } else if (Override != null) {
+            if (Override != null) {
                 return Override("confirm", title, text) != null;
             } else {
                 return MessageBox.Show(text, title, MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) == MessageBoxResult.Yes;
@@ -74,11 +43,7 @@ namespace Elwig.Services {
         }
 
         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) {
+            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;
@@ -86,10 +51,7 @@ namespace Elwig.Services {
         }
 
         public static void ShowWarning(string title, string text) {
-            if (NextWarning != null) {
-                NextWarning(title, text);
-                NextWarning = null;
-            } else if (Override != null) {
+            if (Override != null) {
                 Override("warning", title, text);
             } else {
                 MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Warning);
@@ -97,10 +59,7 @@ namespace Elwig.Services {
         }
 
         public static void ShowError(string title, string text) {
-            if (NextError != null) {
-                NextError(title, text);
-                NextError = null;
-            } else if (Override != null) {
+            if (Override != null) {
                 Override("error", title, text);
             } else {
                 MessageBox.Show(text, title, MessageBoxButton.OK, MessageBoxImage.Error);
@@ -112,7 +71,7 @@ namespace Elwig.Services {
         }
 
         public static void ShowException(string title, Exception exc, bool showExcType = false, bool isError = true) {
-            ShowException(title, null, exc, showExcType, isError);
+            ShowException(title, exc, showExcType, isError);
         }
 
         public static void ShowException(string title, string? text, Exception exc, bool showExcType = false, bool isError = true) {
@@ -142,11 +101,7 @@ namespace Elwig.Services {
         }
 
         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) {
+            if (Override != null) {
                 return Override("save", title, $"{defaultFileName}.{extension}");
             } else {
                 var d = new SaveFileDialog() {

Elwig/Services/MemberBusinessSharesService.cs

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

Elwig/Services/MemberService.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace Elwig.Services {
     public static class MemberService {
@@ -126,15 +127,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.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.BusinessShares = m.BusinessShares;
             vm.AccountingNr = m.AccountingNr;
             vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, m.ZwstId);
             vm.DefaultKg = (AT_Kg?)ControlUtils.GetItemFromSourceWithPk(vm.DefaultKgSource, m.DefaultKgNr);
@@ -397,29 +390,47 @@ namespace Elwig.Services {
         }
 
         public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            await Utils.RunForeground(async () => {
-                 using var doc = new MemberDataSheet(m);
-                 await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    using var doc = new MemberDataSheet(m);
+                    await Utils.ExportDocument(doc, mode, emailData: (m, MemberDataSheet.Name, "Im Anhang finden Sie das aktuelle Stammdatenblatt"));
+                } catch (Exception exc) {
+                    InteractionService.ShowException(exc);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            await Utils.RunForeground(async () => {
-                var b = await Billing.Create(year);
-                await b.FinishSeason();
-                await b.CalculateBuckets();
-                App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    var b = await Billing.Create(year);
+                    await b.FinishSeason();
+                    await b.CalculateBuckets();
+                    App.HintContextChange();
 
-                using var doc = new DeliveryConfirmation(year, m, null);
-                await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
+                    using var doc = new DeliveryConfirmation(year, m, null);
+                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{DeliveryConfirmation.Name} {year}", $"Im Anhang finden Sie die Anlieferungsbestätigung {year}"));
+                } catch (Exception exc) {
+                    InteractionService.ShowException(exc);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
-            await Utils.RunForeground(async () => {
-                using var doc = await CreditNote.Initialize(year, avnr, m.MgNr, null);
-                await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {doc.Payment.Variant.Name}", $"Im Anhang finden Sie die Traubengutschrift {doc.Payment.Variant.Name}"));
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
+                try {
+                    using var doc = await CreditNote.Initialize(year, avnr, m.MgNr, null);
+                    await Utils.ExportDocument(doc, mode, emailData: (m, $"{CreditNote.Name} {doc.Payment.Variant.Name}", $"Im Anhang finden Sie die Traubengutschrift {doc.Payment.Variant.Name}"));
+                } catch (Exception exc) {
+                    InteractionService.ShowException(exc);
+                }
             });
+            Mouse.OverrideCursor = null;
         }
 
         public static async Task GenerateMemberList(this MemberAdminViewModel vm, ExportSubject subject, ExportMode mode) {
@@ -466,70 +477,86 @@ namespace Elwig.Services {
             if (mode == ExportMode.SaveList) {
                 var filename = InteractionService.SaveFile(MemberList.Name, MemberList.Name, "ods");
                 if (filename != null) {
-                    await Utils.RunForeground(async () => {
-                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
-                        using var ods = new OdsFile(filename);
-                        await ods.AddTable(data);
+                    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(filename);
+                            await ods.AddTable(data);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    Mouse.OverrideCursor = null;
                 }
             } else if (mode == ExportMode.Vcf) {
                 var filename = InteractionService.SaveFile("Kontakte", "Mitglieder", "vcf");
                 if (filename != null) {
-                    await Utils.RunForeground(async () => {
-                        var members = await query
-                            .OrderBy(m => m.MgNr)
-                            .Include(m => m.TelephoneNumbers)
-                            .Include(m => m.EmailAddresses)
-                            .ToListAsync();
-                        using var exporter = new VCard(filename);
-                        await exporter.ExportAsync(members);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var members = await query
+                                .OrderBy(m => m.MgNr)
+                                .Include(m => m.TelephoneNumbers)
+                                .Include(m => m.EmailAddresses)
+                                .ToListAsync();
+                            using var exporter = new VCard(filename);
+                            await exporter.ExportAsync(members);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    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");
                 if (filename != null) {
                     if (!filename.EndsWith(".elwig.zip")) filename += ".elwig.zip";
-                    await Utils.RunForeground(async () => {
-                        var members = await query
-                            .OrderBy(m => m.MgNr)
-                            .Include(m => m.TelephoneNumbers)
-                            .Include(m => m.EmailAddresses)
-                            .ToListAsync();
-                        var history1 = await query.IgnoreAutoIncludes()
-                            .SelectMany(m => m.HistoryFrom)
-                            .ToListAsync();
-                        var history2 = await query.IgnoreAutoIncludes()
-                            .SelectMany(m => m.HistoryTo)
-                            .ToListAsync();
-                        var history = history1.Union(history2)
-                            .DistinctBy(h => h.HistNr)
-                            .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
-                            .ToList();
-                        var areaComs = await query
-                            .SelectMany(m => m.AreaCommitments)
-                            .Select(c => c.Contract).Distinct()
-                            .Include(c => c.Revisions)
-                            .ToListAsync();
-                        var wbKgs = members
-                            .Where(m => m.DefaultWbKg != null)
-                            .Select(m => m.DefaultWbKg!)
-                            .Union(areaComs.Select(c => c.Kg))
-                            .Distinct()
-                            .OrderBy(k => k.KgNr)
-                            .ToList();
-                        await ElwigData.Export(filename, members, history, areaComs, wbKgs, filterNames);
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var members = await query
+                                .OrderBy(m => m.MgNr)
+                                .Include(m => m.TelephoneNumbers)
+                                .Include(m => m.EmailAddresses)
+                                .ToListAsync();
+                            var areaComs = await query
+                                .SelectMany(m => m.AreaCommitments)
+                                .Select(c => c.Contract).Distinct()
+                                .Include(c => c.Revisions)
+                                .ToListAsync();
+                            var wbKgs = members
+                                .Where(m => m.DefaultWbKg != null)
+                                .Select(m => m.DefaultWbKg!)
+                                .Union(areaComs.Select(c => c.Kg))
+                                .Distinct()
+                                .OrderBy(k => k.KgNr)
+                                .ToList();
+                            await ElwigData.Export(filename, members, areaComs, wbKgs, filterNames);
+                        } catch (Exception exc) {
+                            InteractionService.ShowException(exc);
+                        }
                     });
+                    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 () => {
-                    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);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
+                        using var doc = new MemberList(string.Join(" / ", filterNames), data);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -544,33 +571,30 @@ namespace Elwig.Services {
                 Name = vm.Name!,
                 Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
                 ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrWhiteSpace(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
                 IsDeceased = vm.IsDeceased,
                 CountryNum = 40,  // Austria AT AUT
                 PostalDestId = vm.Ort!.Id,
                 Address = vm.Address!,
 
-                Iban = string.IsNullOrWhiteSpace(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrWhiteSpace(vm.Bic) ? null : vm.Bic,
+                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
 
-                UstIdNr = string.IsNullOrWhiteSpace(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrWhiteSpace(vm.LfbisNr) ? null : vm.LfbisNr,
+                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
                 IsBuchführend = vm.IsBuchführend,
                 IsOrganic = vm.IsOrganic,
 
-                EntryDateString = string.IsNullOrWhiteSpace(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrWhiteSpace(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                Shares = App.Client.HasRedWhite ? 0 : vm.BusinessShares1 ?? 0,
-                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.IsNullOrWhiteSpace(vm.AccountingNr) ? null : vm.AccountingNr,
+                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                BusinessShares = (int)vm.BusinessShares!,
+                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
                 IsActive = vm.IsActive,
                 IsVollLieferant = vm.IsVollLieferant,
                 IsFunktionär = vm.IsFunktionär,
                 ZwstId = vm.Branch?.ZwstId,
                 DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                 ContactViaPost = vm.ContactViaPost,
                 ContactViaEmail = vm.ContactViaEmail,
             };

Elwig/Services/PaymentVariantService.cs

@@ -12,6 +12,7 @@ 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 {
@@ -191,17 +192,29 @@ namespace Elwig.Services {
                 var filename = InteractionService.SaveFile($"Variantendaten {v.Name}", $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}", "ods");
                 if (filename == null)
                     return;
-                await Utils.RunForeground(async () => {
-                    using var ctx = new AppDbContext();
-                    var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                    using var ods = new OdsFile(filename);
-                    await ods.AddTable(data);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
+                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                        using var ods = new OdsFile(filename);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             } else {
-                await Utils.RunForeground(async () => {
-                    using var doc = await PaymentVariantSummary.Initialize(v.Year, v.AvNr);
-                    await Utils.ExportDocument(doc, mode);
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var doc = await PaymentVariantSummary.Initialize(v.Year, v.AvNr);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -224,22 +237,34 @@ namespace Elwig.Services {
 
             var filename = InteractionService.SaveFile("Überweisungsdaten", $"{App.Client.NameToken}-Überweisungsdaten-{v.Year}-{v.Name.Trim().Replace(' ', '-')}", Ebics.FileExtension);
             if (filename != null) {
-                await Utils.RunForeground(async () => {
-                    using var e = new Ebics(v, filename, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
-                    await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var e = new Ebics(v, filename, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
+                        await e.ExportAsync(Transaction.FromPaymentVariant(v));
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                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");
             if (filename != null) {
-                await Utils.RunForeground(async () => {
-                    using var ctx = new AppDbContext();
-                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, year, avnr);
-                    using var ods = new OdsFile(filename);
-                    await ods.AddTable(tbl);
+                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(filename);
+                        await ods.AddTable(tbl);
+                    } catch (Exception exc) {
+                        InteractionService.ShowException(exc);
+                    }
                 });
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -300,7 +325,7 @@ namespace Elwig.Services {
                     TransferDate = vm.TransferDate,
                     TestVariant = vm.SelectedPaymentVariant?.TestVariant ?? true,
                     CalcTimeUnix = vm.SelectedPaymentVariant?.CalcTimeUnix,
-                    Comment = string.IsNullOrWhiteSpace(vm.Comment) ? null : vm.Comment,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
                     Data = JsonSerializer.Serialize(d.Data),
                 };
                 avnr = v.AvNr;

Elwig/Services/SyncService.cs

@@ -27,16 +27,6 @@ namespace Elwig.Services {
                     .Include(m => m.TelephoneNumbers)
                     .Include(m => m.EmailAddresses)
                     .ToListAsync();
-                var history1 = await query.IgnoreAutoIncludes()
-                    .SelectMany(m => m.HistoryFrom)
-                    .ToListAsync();
-                var history2 = await query.IgnoreAutoIncludes()
-                    .SelectMany(m => m.HistoryTo)
-                    .ToListAsync();
-                var history = history1.Union(history2)
-                    .DistinctBy(h => h.HistNr)
-                    .OrderBy(h => h.DateNotice).ThenBy(h => h.HistNr)
-                    .ToList();
                 var areaComs = await query
                     .SelectMany(m => m.AreaCommitments)
                     .Select(c => c.Contract).Distinct()
@@ -54,7 +44,7 @@ namespace Elwig.Services {
                     InteractionService.ShowError("Mitglieder hochladen", "Es wurden keine Mitglieder zum Hochladen ausgewählt!");
                 } 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!");
@@ -214,7 +204,7 @@ namespace Elwig.Services {
             ];
         }
 
-        public static async Task Download(string url, string username, string password, bool confirmImports) {
+        public static async Task Download(string url, string username, string password) {
             try {
                 var import = await GetFilesToImport(url, username, password);
                 var paths = new List<string>();
@@ -226,7 +216,7 @@ namespace Elwig.Services {
                         paths.Add(filename);
                     }
                 }
-                await ElwigData.Import(paths, confirmImports ? ElwigData.ImportMode.Interactively : ElwigData.ImportMode.FromBranches);
+                await ElwigData.Import(paths, ElwigData.ImportMode.FromBranches);
             } catch (HttpRequestException exc) {
                 InteractionService.ShowException("Daten herunterladen", "Eventuell Internetverbindung prüfen!", exc);
             } catch (TaskCanceledException exc) {
@@ -264,14 +254,5 @@ namespace Elwig.Services {
                 return false;
             }
         }
-
-        public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password, int? year = null) {
-            try {
-                year ??= Utils.CurrentLastSeason;
-                return await ctx.Deliveries.Where(d => d.ZwstId == App.ZwstId && d.Year == year).Where(ChangedDeliveries).AnyAsync() || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
-            } catch {
-                return false;
-            }
-        }
     }
 }

Elwig/ViewModels/DeliveryAdminViewModel.cs

@@ -25,7 +25,7 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _manualWeighingReason;
         [ObservableProperty]
-        private string? _scaleTerminalId;
+        private string? _scaleId;
         [ObservableProperty]
         private string? _weighingData;
 

Elwig/ViewModels/MemberAdminViewModel.cs

@@ -6,7 +6,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Documents;
 
 namespace Elwig.ViewModels {
     public partial class MemberAdminViewModel : ObservableObject {
@@ -125,22 +124,10 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _exitDate;
         [ObservableProperty]
-        private string? _businessShares1String;
-        public int? BusinessShares1 {
-            get => int.TryParse(BusinessShares1String, out var shares) ? shares : null;
-            set => BusinessShares1String = $"{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}";
+        private string? _businessSharesString;
+        public int? BusinessShares {
+            get => int.TryParse(BusinessSharesString, out var bs) ? bs : null;
+            set => BusinessSharesString = $"{value}";
         }
         [ObservableProperty]
         private string? _accountingNr;
@@ -201,7 +188,9 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string? _statusMembersToolTip;
         [ObservableProperty]
-        private TextBlock? _statusBusinessShares;
+        private string _statusBusinessShares = "-";
+        [ObservableProperty]
+        private string? _statusBusinessSharesToolTip;
         [ObservableProperty]
         private string _statusDeliveriesLastSeason = "-";
         [ObservableProperty]

Elwig/ViewModels/MemberBusinessSharesViewModel.cs

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

Elwig/Windows/AdministrationWindow.cs

@@ -164,10 +164,10 @@ namespace Elwig.Windows {
                 } else if (input is TextBox tb && tb.Text.Length == 0) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
-                } else if (input is ComboBox cb && cb.SelectedItem == null && cb.HasItems) {
+                } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
-                } else if (input is ListBox lb && lb.SelectedItem == null && lb.HasItems) {
+                } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) {
                     ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
                 } else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) {
@@ -285,13 +285,8 @@ namespace Elwig.Windows {
                 var binding = cb.GetBindingExpression(ComboBox.SelectedItemProperty);
                 binding?.UpdateSource();
             }
-            foreach (var lb in ListBoxInputs) {
-                if (lb.SelectionMode == SelectionMode.Single) {
-                    lb.SelectedItem = null;
-                } else {
-                    lb.SelectedItems.Clear();
-                }
-            }
+            foreach (var lb in ListBoxInputs)
+                lb.SelectedItems.Clear();
             foreach (var cb in CheckBoxInputs) {
                 cb.IsChecked = cb.IsThreeState ? null : false;
                 var binding = cb.GetBindingExpression(CheckBox.IsCheckedProperty);

Elwig/Windows/BaseDataWindow.xaml

@@ -453,13 +453,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 +468,13 @@
                                                   Width="80" Margin="65,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                                 <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                                   Width="68" Margin="150,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerShareInput" Unit="€/GA" TextChanged="SeasonPenaltyPerShareInput_TextChanged"
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
                                                   Width="100" Margin="222,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                                 <Label Content="Zzgl. bei Nicht-Lieferung:" Margin="10,40,0,10"/>
                                 <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                                   Width="68" Margin="150,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerShareNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerShareInput_TextChanged"
+                                <ctrl:UnitTextBox x:Name="SeasonPenaltyPerBsNoneInput" Unit="€/GA" TextChanged="SeasonPenaltyPerBsInput_TextChanged"
                                                   Width="100" Margin="222,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                             </Grid>
                         </GroupBox>
@@ -541,21 +541,6 @@
             </TabItem>
             <TabItem Header="Parameter">
                 <StackPanel>
-                    <GroupBox x:Name="ParameterBusinessShare" Header="Geschäftsanteile" Margin="10,10,10,0" VerticalAlignment="Top">
-                        <Grid>
-                            <Label Content="Modus:" Margin="10,10,10,10"/>
-                            <ComboBox x:Name="ParameterBusinessShareModeInput" Margin="160,10,10,10" Width="100"
-                                      HorizontalAlignment="Left">
-                                <ComboBoxItem IsSelected="True">Normal</ComboBoxItem>
-                                <ComboBoxItem>Rot/weiß</ComboBoxItem>
-                            </ComboBox>
-
-                            <Label Content="Mitgliederbewegungen:" Margin="10,40,10,10"/>
-                            <CheckBox x:Name="ParameterBusinessShareHistoryInput"  Content="Mit Elwig erfassen" Margin="160,45,10,15"
-                                      HorizontalAlignment="Left"
-                                      Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-                        </Grid>
-                    </GroupBox>
                     <GroupBox x:Name="ParameterAreaComGroup" Header="Berechnung Flächenbindungen (aktuelle Saison)" Margin="10,10,10,0" VerticalAlignment="Top">
                         <Grid>
                             <CheckBox x:Name="ParameterAllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -47,26 +47,26 @@ namespace Elwig.Windows {
             if (!_actChanged || _actList == null || _acts == null || _actIds == null)
                 return;
 
-            // delete
-            var delete = _acts.Where(a => a.Value == null).Select(a => a.Key).ToList();
-            await ctx.AreaCommitmentTypes.Where(v => delete.Contains(v.VtrgId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_actList
-                .Where(_actIds.ContainsKey)
-                .Select(t => {
-                    t.VtrgId = _actIds[t];
-                    ctx.Entry(t).State = EntityState.Added;
-                    return t;
-                }));
+            foreach (var (vtrgid, _) in _acts.Where(a => a.Value == null)) {
+                ctx.Remove(ctx.AreaCommitmentTypes.Find(vtrgid)!);
+            }
+            foreach (var (attr, old) in _actIds) {
+                attr.VtrgId = old;
+            }
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
+                ctx.Update(ctx.AreaCommitmentTypes.Find(old)!);
+            }
             await ctx.SaveChangesAsync();
-            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null && a.Key != a.Value)) {
+
+            foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = {vtrgid} WHERE vtrgid = {old}");
             }
+            await ctx.SaveChangesAsync();
 
-            // insert
-            ctx.AddRange(_actList
-                .Where(t => !_actIds.ContainsKey(t) && t.VtrgId != null));
+            foreach (var type in _actList.Where(a => !_actIds.ContainsKey(a))) {
+                if (type.VtrgId == null) continue;
+                ctx.Add(type);
+            }
             await ctx.SaveChangesAsync();
         }
 
@@ -125,7 +125,7 @@ namespace Elwig.Windows {
             var id = AreaCommitmentTypeIdInput.Text;
             if (old != null) _acts[old] = id;
             attr.VtrgId = id;
-            attr.SortId = v?.SortId ?? "";
+            attr.SortId = v?.SortId;
             attr.AttrId = a?.AttrId;
             attr.MinKgPerHa = AreaCommitmentTypeMinKgPerHaInput.Text.Length > 0 ? int.Parse(AreaCommitmentTypeMinKgPerHaInput.Text) : null;
             attr.PenaltyPerKg = AreaCommitmentTypePenaltyPerKgInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyPerKgInput.Text) : null;

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -41,26 +41,25 @@ namespace Elwig.Windows {
             if (!_branchChanged || _branchList == null || _branches == null || _branchIds == null)
                 return;
 
-            // delete
             var deleteZwstIds = _branches.Where(b => b.Value == null).Select(b => b.Key).ToList();
             await ctx.Branches.Where(b => deleteZwstIds.Contains(b.ZwstId)).ExecuteDeleteAsync();
 
-            // update
-            ctx.UpdateRange(_branchList
-                .Where(_branchIds.ContainsKey)
-                .Select(b => {
-                    b.ZwstId = _branchIds[b];
-                    ctx.Entry(b).State = EntityState.Added;
-                    return b;
-                }));
+            foreach (var (branch, old) in _branchIds) {
+                branch.ZwstId = old;
+            }
+            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
+                ctx.Update(ctx.Branches.Find(old)!);
+            }
             await ctx.SaveChangesAsync();
-            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null && b.Key != b.Value)) {
+
+            foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE branch SET zwstid = {zwstid} WHERE zwstid = {old}");
             }
 
-            // insert
-            ctx.AddRange(_branchList
-                .Where(b => !_branchIds.ContainsKey(b) && b.ZwstId != null));
+            foreach (var branch in _branchList.Where(b => !_branchIds.ContainsKey(b))) {
+                if (branch.ZwstId == null) continue;
+                ctx.Add(branch);
+            }
             await ctx.SaveChangesAsync();
         }
 

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -48,30 +48,30 @@ namespace Elwig.Windows {
             if (!_modChanged || _modList == null || _mods == null || _modIds == null)
                 return;
 
-            var year = (SeasonList.SelectedItem as Season)?.Year;
             int i = 0;
             foreach (var mod in _modList) mod.Ordering = ++i;
 
-            // delete
-            var deleteModIds = _mods.Where(b => b.Value == null).Select(b => b.Key).ToList();
-            await ctx.Modifiers.Where(b => b.Year == year && deleteModIds.Contains(b.ModId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_modList
-                .Where(_modIds.ContainsKey)
-                .Select(m => {
-                    m.ModId = _modIds[m];
-                    ctx.Entry(m).State = EntityState.Added;
-                    return m;
-                }));
+            var year = (SeasonList.SelectedItem as Season)?.Year;
+            foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
+                ctx.Remove(ctx.Modifiers.Find(year, modid)!);
+            }
+            foreach (var (mod, old) in _modIds) {
+                mod.ModId = old;
+            }
+            foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
+                ctx.Update(ctx.Modifiers.Find(year, old)!);
+            }
             await ctx.SaveChangesAsync();
+
             foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE modifier SET modid = {modid} WHERE (year, modid) = ({year}, {old})");
             }
+            await ctx.SaveChangesAsync();
 
-            // insert
-            ctx.AddRange(_modList
-                .Where(m => !_modIds.ContainsKey(m) && m.ModId != null));
+            foreach (var mod in _modList.Where(m => !_modIds.ContainsKey(m))) {
+                if (mod.ModId == null) continue;
+                await ctx.AddAsync(mod);
+            }
             await ctx.SaveChangesAsync();
         }
 

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -47,23 +47,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";
-                SeasonMaxKgPerShareInput.Text = s.MaxKgPerShare?.ToString() ?? s.MaxKgPerShareRed?.ToString() ?? s.MaxKgPerShareWhite?.ToString() ?? "0";
+                SeasonMinKgPerBsInput.Text = s.MinKgPerBusinessShare.ToString();
+                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() ?? "";
-                SeasonPenaltyPerShareNoneInput.Text = s.PenaltyPerShareNone?.ToString() ?? "";
-                SeasonShareValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
+                SeasonPenaltyPerBsInput.Text = s.PenaltyPerBsAmount?.ToString() ?? "";
+                SeasonPenaltyPerBsNoneInput.Text = s.PenaltyPerBsNone?.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";
-                SeasonPenaltyPerShareNoneInput.Unit = $"{sym}/GA";
-                SeasonShareValueInput.Unit = $"{sym}/GA";
+                SeasonPenaltyPerBsInput.Unit = $"{sym}/GA";
+                SeasonPenaltyPerBsNoneInput.Unit = $"{sym}/GA";
+                SeasonBsValueInput.Unit = $"{sym}/GA";
                 AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
                 AreaCommitmentTypePenaltyInput.Unit = sym;
                 AreaCommitmentTypePenaltyNoneInput.Unit = sym;
@@ -74,14 +74,14 @@ namespace Elwig.Windows {
                 SeasonVatFlatrateInput.Text = "";
                 SeasonStartInput.Text = "";
                 SeasonEndInput.Text = "";
-                SeasonMinKgPerShareInput.Text = "";
-                SeasonMaxKgPerShareInput.Text = "";
+                SeasonMinKgPerBsInput.Text = "";
+                SeasonMaxKgPerBsInput.Text = "";
                 SeasonPenaltyPerKgInput.Text = "";
                 SeasonPenaltyInput.Text = "";
                 SeasonPenaltyNoneInput.Text = "";
-                SeasonPenaltyPerShareInput.Text = "";
-                SeasonPenaltyPerShareNoneInput.Text = "";
-                SeasonShareValueInput.Text = "";
+                SeasonPenaltyPerBsInput.Text = "";
+                SeasonPenaltyPerBsNoneInput.Text = "";
+                SeasonBsValueInput.Text = "";
             }
             _seasonUpdate = false;
         }
@@ -96,28 +96,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) {
-                s.MinKgPerShare = (SeasonMinKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMinKgPerShareInput.Text) : null;
-                s.MaxKgPerShare = (SeasonMaxKgPerShareInput.Text.Length > 0) ? int.Parse(SeasonMaxKgPerShareInput.Text) : null;
-                s.MinKgPerShareRed = null;
-                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;
-            }
-
+            if (SeasonMinKgPerBsInput.Text.Length > 0)
+                s.MinKgPerBusinessShare = int.Parse(SeasonMinKgPerBsInput.Text);
+            if (SeasonMaxKgPerBsInput.Text.Length > 0)
+                s.MaxKgPerBusinessShare = int.Parse(SeasonMaxKgPerBsInput.Text);
             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.PenaltyPerShareNone = (SeasonPenaltyPerShareNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerShareNoneInput.Text) : null;
-            s.BusinessShareValue = (SeasonShareValueInput.Text.Length > 0) ? decimal.Parse(SeasonShareValueInput.Text) : null;
+            s.PenaltyPerBsAmount = (SeasonPenaltyPerBsInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsInput.Text) : null;
+            s.PenaltyPerBsNone = (SeasonPenaltyPerBsNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerBsNoneInput.Text) : null;
+            s.BusinessShareValue = (SeasonBsValueInput.Text.Length > 0) ? decimal.Parse(SeasonBsValueInput.Text) : null;
 
             UpdateButtons();
         }
@@ -143,7 +131,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 +160,13 @@ namespace Elwig.Windows {
                         MaxKgPerHa = s?.MaxKgPerHa ?? 10000,
                         VatNormal = s?.VatNormal ?? 0.10,
                         VatFlatrate = s?.VatFlatrate ?? 0.13,
-                        MinKgPerShare = s?.MinKgPerShare,
-                        MaxKgPerShare = s?.MaxKgPerShare,
+                        MinKgPerBusinessShare = s?.MinKgPerBusinessShare ?? 500,
+                        MaxKgPerBusinessShare = s?.MaxKgPerBusinessShare ?? 1000,
                         PenaltyPerKgValue = s?.PenaltyPerKgValue,
                         PenaltyAmoutValue = s?.PenaltyAmoutValue,
                         PenaltyNoneValue = s?.PenaltyNoneValue,
-                        PenaltyPerShareAmountValue = s?.PenaltyPerShareAmountValue,
-                        PenaltyPerShareNoneValue = s?.PenaltyPerShareNoneValue,
+                        PenaltyPerBsAmountValue = s?.PenaltyPerBsAmountValue,
+                        PenaltyPerBsNoneValue = s?.PenaltyPerBsNoneValue,
                         BusinessShareValueValue = s?.BusinessShareValueValue,
                         CalcMode = s?.CalcMode ?? 0,
                     });
@@ -193,7 +181,6 @@ namespace Elwig.Windows {
                             AbsValue = m.AbsValue * mult / div,
                             RelValue = m.RelValue,
                             IsActive = m.IsActive,
-                            IsRedacted = m.IsRedacted,
                         }));
                     }
                     await ctx.SaveChangesAsync();

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -41,28 +41,26 @@ namespace Elwig.Windows {
             if (!_attrChanged || _attrList == null || _attrs == null || _attrIds == null)
                 return;
 
-            // delete
             var deleteAttrIds = _attrs.Where(a => a.Value == null).Select(a => a.Key).ToList();
             await ctx.WineAttributes.Where(a => deleteAttrIds.Contains(a.AttrId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_attrList
-                .Where(_attrIds.ContainsKey)
-                .Select(a => {
-                    a.AttrId = _attrIds[a];
-                    ctx.Entry(a).State = EntityState.Added;
-                    return a;
-                }));
+            foreach (var (attr, old) in _attrIds) {
+                attr.AttrId = old;
+            }
+            foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
+                ctx.Update(ctx.WineAttributes.Find(old)!);
+            }
             await ctx.SaveChangesAsync();
+
             foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE wine_attribute SET attrid = {attrid} WHERE attrid = {old}");
                 await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = (sortid || COALESCE(attrid, '') || COALESCE(disc, '')) WHERE attrid = {attrid}");
-                await ctx.Database.ExecuteSqlAsync($"UPDATE payment_variant SET data = REPLACE(REPLACE(data, {$"/{old}\""}, {$"/{attrid}\""}), {$"/{old}-"}, {$"/{attrid}-"})");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(REPLACE(data, '/{old}\"', '/{attrid}\"'), '/{old}-', '/{attrid}-')");
             }
 
-            // insert
-            ctx.AddRange(_attrList
-                .Where(a => !_attrIds.ContainsKey(a) && a.AttrId != null));
+            foreach (var attr in _attrList.Where(a => !_attrIds.ContainsKey(a))) {
+                if (attr.AttrId == null) continue;
+                ctx.Add(attr);
+            }
             await ctx.SaveChangesAsync();
         }
 

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -41,27 +41,25 @@ namespace Elwig.Windows {
             if (!_cultChanged || _cultList == null || _cults == null || _cultIds == null)
                 return;
 
-            // delete
             var deleteCultIds = _cults.Where(c => c.Value == null).Select(c => c.Key).ToList();
             await ctx.WineCultivations.Where(c => deleteCultIds.Contains(c.CultId)).ExecuteDeleteAsync();
-
-            // update
-            ctx.UpdateRange(_cultList
-                .Where(_cultIds.ContainsKey)
-                .Select(c => {
-                    c.CultId = _cultIds[c];
-                    ctx.Entry(c).State = EntityState.Added;
-                    return c;
-                }));
+            foreach (var (cult, old) in _cultIds) {
+                cult.CultId = old;
+            }
+            foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
+                ctx.Update(ctx.WineCultivations.Find(old)!);
+            }
             await ctx.SaveChangesAsync();
+
             foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
                 await ctx.Database.ExecuteSqlAsync($"UPDATE wine_cultivation SET cultid = {cultid} WHERE cultid = {old}");
-                await ctx.Database.ExecuteSqlAsync($"UPDATE payment_variant SET data = REPLACE(data, {$"-{old}\""}, {$"-{cultid}\""})");
+                await ctx.Database.ExecuteSqlRawAsync($"UPDATE payment_variant SET data = REPLACE(data, '-{old}\"', '-{cultid}\"')");
             }
 
-            // insert
-            ctx.AddRange(_cultList
-                .Where(c => !_cultIds.ContainsKey(c) && c.CultId != null));
+            foreach (var cult in _cultList.Where(c => !_cultIds.ContainsKey(c))) {
+                if (cult.CultId == null) continue;
+                ctx.Add(cult);
+            }
             await ctx.SaveChangesAsync();
         }
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -12,6 +12,8 @@ using System.Windows.Input;
 namespace Elwig.Windows {
     public partial class BaseDataWindow : AdministrationWindow {
 
+        protected AppDbContext? EditContext;
+
         public BaseDataWindow() {
             InitializeComponent();
             RequiredInputs = [
@@ -30,15 +32,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() { }
@@ -78,19 +79,25 @@ namespace Elwig.Windows {
             SeasonMaxKgPerHaInput.IsReadOnly = true;
             SeasonVatNormalInput.IsReadOnly = true;
             SeasonVatFlatrateInput.IsReadOnly = true;
-            SeasonMinKgPerShareInput.IsReadOnly = true;
-            SeasonMaxKgPerShareInput.IsReadOnly = true;
+            SeasonMinKgPerBsInput.IsReadOnly = true;
+            SeasonMaxKgPerBsInput.IsReadOnly = true;
             SeasonPenaltyPerKgInput.IsReadOnly = true;
             SeasonPenaltyInput.IsReadOnly = true;
             SeasonPenaltyNoneInput.IsReadOnly = true;
-            SeasonPenaltyPerShareInput.IsReadOnly = true;
-            SeasonPenaltyPerShareNoneInput.IsReadOnly = true;
-            SeasonShareValueInput.IsReadOnly = true;
+            SeasonPenaltyPerBsInput.IsReadOnly = true;
+            SeasonPenaltyPerBsNoneInput.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() {
@@ -126,19 +133,25 @@ namespace Elwig.Windows {
             SeasonMaxKgPerHaInput.IsReadOnly = false;
             SeasonVatNormalInput.IsReadOnly = false;
             SeasonVatFlatrateInput.IsReadOnly = false;
-            SeasonMinKgPerShareInput.IsReadOnly = false;
-            SeasonMaxKgPerShareInput.IsReadOnly = false;
+            SeasonMinKgPerBsInput.IsReadOnly = false;
+            SeasonMaxKgPerBsInput.IsReadOnly = false;
             SeasonPenaltyPerKgInput.IsReadOnly = false;
             SeasonPenaltyInput.IsReadOnly = false;
             SeasonPenaltyNoneInput.IsReadOnly = false;
-            SeasonPenaltyPerShareInput.IsReadOnly = false;
-            SeasonPenaltyPerShareNoneInput.IsReadOnly = false;
-            SeasonShareValueInput.IsReadOnly = false;
+            SeasonPenaltyPerBsInput.IsReadOnly = false;
+            SeasonPenaltyPerBsNoneInput.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;
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
@@ -187,30 +200,31 @@ namespace Elwig.Windows {
         }
 
         private async Task InitEditing() {
-            using var ctx = new AppDbContext();
-            await BranchesInitEditing(ctx);
-            await WineAttributesInitEditing(ctx);
-            await WineCultivationsInitEditing(ctx);
-            await AreaCommitmentTypesInitEditing(ctx);
-            await SeasonsInitEditing(ctx);
-            await ModifiersInitEditing(ctx);
+            EditContext = new AppDbContext();
+            await BranchesInitEditing(EditContext);
+            await WineAttributesInitEditing(EditContext);
+            await WineCultivationsInitEditing(EditContext);
+            await AreaCommitmentTypesInitEditing(EditContext);
+            await SeasonsInitEditing(EditContext);
+            await ModifiersInitEditing(EditContext);
         }
 
         private async Task Save() {
             await UpdateClientParameters(App.Client);
             await UpdateParameters(Utils.CurrentLastSeason);
-            using var ctx = new AppDbContext();
-            using var tx = await ctx.Database.BeginTransactionAsync();
-            await BranchesSave(ctx);
-            await WineAttributesSave(ctx);
-            await WineCultivationsSave(ctx);
-            await AreaCommitmentTypesSave(ctx);
-            await SeasonsSave(ctx);
-            await ModifiersSave(ctx);
+            using var tx = await EditContext!.Database.BeginTransactionAsync();
+            await BranchesSave(EditContext!);
+            await WineAttributesSave(EditContext!);
+            await WineCultivationsSave(EditContext!);
+            await AreaCommitmentTypesSave(EditContext!);
+            await SeasonsSave(EditContext!);
+            await ModifiersSave(EditContext!);
             await tx.CommitAsync();
         }
 
         private async Task FinishEditing() {
+            EditContext?.Dispose();
+            EditContext = null;
             using var ctx = new AppDbContext();
             await BranchesFinishEditing(ctx);
             await WineAttributesFinishEditing(ctx);
@@ -345,8 +359,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;
@@ -358,29 +370,27 @@ namespace Elwig.Windows {
 
         private async Task UpdateClientParameters(ClientParameters p) {
             p.Name = ClientNameInput.Text;
-            p.NameSuffix = string.IsNullOrWhiteSpace(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
+            p.NameSuffix = string.IsNullOrEmpty(ClientNameSuffixInput.Text) ? null : ClientNameSuffixInput.Text;
             p.NameType = ClientNameTypeInput.Text;
             p.NameToken = ClientNameTokenInput.Text;
             p.NameShort = ClientNameShortInput.Text;
             p.Address = ClientAddressInput.Text;
             p.Plz = int.Parse(ClientPlzInput.Text);
             p.Ort = ClientOrtInput.Text;
-            p.Iban = string.IsNullOrWhiteSpace(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
-            p.Bic = string.IsNullOrWhiteSpace(ClientBicInput.Text) ? null : ClientBicInput.Text;
-            p.UstIdNr = string.IsNullOrWhiteSpace(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
-            p.LfbisNr = string.IsNullOrWhiteSpace(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
-            p.OrganicAuthority = string.IsNullOrWhiteSpace(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
-            p.PhoneNr = string.IsNullOrWhiteSpace(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
-            p.FaxNr = string.IsNullOrWhiteSpace(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
-            p.EmailAddress = string.IsNullOrWhiteSpace(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
-            p.Website = string.IsNullOrWhiteSpace(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
+            p.Iban = string.IsNullOrEmpty(ClientIbanInput.Text) ? null : ClientIbanInput.Text;
+            p.Bic = string.IsNullOrEmpty(ClientBicInput.Text) ? null : ClientBicInput.Text;
+            p.UstIdNr = string.IsNullOrEmpty(ClientUstIdNrInput.Text) ? null : ClientUstIdNrInput.Text;
+            p.LfbisNr = string.IsNullOrEmpty(ClientLfbisNrInput.Text) ? null : ClientLfbisNrInput.Text;
+            p.OrganicAuthority = string.IsNullOrEmpty(ClientOrganicAuthorityInput.Text) ? null : ClientOrganicAuthorityInput.Text;
+            p.PhoneNr = string.IsNullOrEmpty(ClientPhoneNrInput.Text) ? null : ClientPhoneNrInput.Text;
+            p.FaxNr = string.IsNullOrEmpty(ClientFaxNrInput.Text) ? null : ClientFaxNrInput.Text;
+            p.EmailAddress = string.IsNullOrEmpty(ClientEmailAddressInput.Text) ? null : ClientEmailAddressInput.Text;
+            p.Website = string.IsNullOrEmpty(ClientWebsiteInput.Text) ? null : ClientWebsiteInput.Text;
 
-            p.ModeBusinessShares = ParameterBusinessShareModeInput.SelectedIndex;
-            p.EnableMemberHistory = ParameterBusinessShareHistoryInput.IsChecked ?? false;
-            p.TextDeliveryNote = string.IsNullOrWhiteSpace(TextElementDeliveryNote.Text) ? null : TextElementDeliveryNote.Text;
+            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.IsNullOrWhiteSpace(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
-            p.TextCreditNote = string.IsNullOrWhiteSpace(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
+            p.TextDeliveryConfirmation = string.IsNullOrEmpty(TextElementDeliveryConfirmation.Text) ? null : TextElementDeliveryConfirmation.Text;
+            p.TextCreditNote = string.IsNullOrEmpty(TextElementCreditNote.Text) ? null : TextElementCreditNote.Text;
 
             p.ExportEbicsVersion = ParameterExportEbicsVersion.SelectedIndex + 3;
             p.ExportEbicsAddress = ParameterExportEbicsAddress.SelectedIndex;

Elwig/Windows/ChartWindow.xaml.cs

@@ -26,12 +26,12 @@ namespace Elwig.Windows {
         private bool HasChanged = false;
         private bool Updating = false;
 
-        private Scatter? DataPlot;
+        private Scatter DataPlot;
         private Scatter? GebundenPlot;
-        private Marker? HighlightedPointPlot;
-        private Marker? PrimaryMarkedPointPlot;
-        private Marker? SecondaryMarkedPointPlot;
-        private Text? TooltipPlot;
+        private Marker HighlightedPointPlot;
+        private Marker PrimaryMarkedPointPlot;
+        private Marker SecondaryMarkedPointPlot;
+        private Text TooltipPlot;
 
         private static readonly LegendItem
             UngebundenLegend = new() {
@@ -77,7 +77,7 @@ namespace Elwig.Windows {
             PriceInput.Unit = $"{CurrencySymbol}/kg";
             GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
             PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
-            Title = $"{PaymentVar.Name} - Lese {year} - Elwig";
+            Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
             LockContext = true;
         }
 
@@ -104,10 +104,10 @@ namespace Elwig.Windows {
 
             try {
                 var data = EditBillingData.FromJson(PaymentVar.Data, await Utils.GetVaributes(ctx, Year));
-                var paymentEntries = (await data.GetPaymentGraphEntries(ctx, Season)).ToList();
+                var paymentEntries = await data.GetPaymentGraphEntries(ctx, Season);
                 GraphEntries = [
                     ..paymentEntries,
-                    ..await data.GetQualityGraphEntries(ctx, Season, paymentEntries.Count != 0 ? paymentEntries.Max(e => e.Id) : 0)
+                    ..await data.GetQualityGraphEntries(ctx, Season, paymentEntries.Any() ? paymentEntries.Max(e => e.Id) : 0)
                 ];
             } catch (KeyNotFoundException exc) {
                 var key = exc.Message.Split('\'')[1].Split('\'')[0];
@@ -215,12 +215,10 @@ namespace Elwig.Windows {
                 GebundenPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorGebunden);
             }
 
-            if (SelectedGraphEntry != null) {
-                DataPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry.DataGraph.DataX, SelectedGraphEntry.DataGraph.DataY);
-                DataPlot.LineStyle.Color = ColorUngebunden;
-                DataPlot.Color = ColorUngebunden;
-                DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
-            }
+            DataPlot = OechslePricePlot.Plot.Add.Scatter(SelectedGraphEntry!.DataGraph.DataX, SelectedGraphEntry!.DataGraph.DataY);
+            DataPlot.LineStyle.Color = ColorUngebunden;
+            DataPlot.Color = ColorUngebunden;
+            DataPlot.MarkerStyle = new MarkerStyle(MarkerShape.FilledCircle, 9, ColorUngebunden);
 
             OechslePricePlot.Plot.Axes.SetLimits(Math.Min(GraphEntry.MinX, GraphEntry.MinXGeb) - 1, GraphEntry.MaxX + 1, -0.1, 1.5);
 
@@ -246,10 +244,7 @@ namespace Elwig.Windows {
             SecondaryMarkedPoint = -1;
             ChangeActiveGraph(null);
             HideGradationLines();
-            if (DataPlot != null) {
-                OechslePricePlot.Plot.Remove(DataPlot);
-                DataPlot = null;
-            }
+            OechslePricePlot.Plot.Remove(DataPlot);
             if (GebundenPlot != null) {
                 OechslePricePlot.Plot.Remove(GebundenPlot);
                 GebundenPlot = null;
@@ -259,9 +254,9 @@ namespace Elwig.Windows {
             OechslePricePlot.Refresh();
         }
 
-        private static void ChangeMarker(Marker? point, bool visible, double x = 0, double y = 0) {
-            point?.Location = new Coordinates(x, y);
-            point?.IsVisible = visible;
+        private void ChangeMarker(Marker point, bool visible, double x = 0, double y = 0) {
+            point.Location = new Coordinates(x, y);
+            point.IsVisible = visible;
         }
 
         private void EnableActionButtons() {
@@ -421,7 +416,7 @@ namespace Elwig.Windows {
                 var res = Validator.CheckDecimal(PriceInput, true, 2, Season.Precision);
                 if (res.IsValid && double.TryParse(PriceInput.Text, out double price)) {
                     ActiveGraph.SetPriceAt(PrimaryMarkedPoint, price);
-                    PrimaryMarkedPointPlot?.Location = new Coordinates(PrimaryMarkedPointPlot.Location.X, price);
+                    PrimaryMarkedPointPlot.Location = new Coordinates(PrimaryMarkedPointPlot.Location.X, price);
                     SetHasChanged();
                     OechslePricePlot.Refresh();
                     CheckGebundenTypeFixed();
@@ -497,19 +492,17 @@ namespace Elwig.Windows {
 
                 ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
 
-                if (Highlighted.Graph != null) {
-                    Updating = true;
-                    OechsleInput.Text = Highlighted.Graph.GetOechsleAt(Highlighted.Index).ToString();
-                    GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
-                    PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
-                    Updating = false;
-                }
+                Updating = true;
+                OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
+                GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
+                PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
+                Updating = false;
 
                 EnableActionButtons();
             } else {
                 PrimaryMarkedPoint = -1;
                 SecondaryMarkedPoint = -1;
-                if (SelectedGraphEntry?.GebundenGraph != null) {
+                if (SelectedGraphEntry!.GebundenGraph != null) {
                     ChangeActiveGraph(null);
                 }
                 ChangeMarker(PrimaryMarkedPointPlot, false);
@@ -555,26 +548,21 @@ namespace Elwig.Windows {
 
             if (mouseOnData != null) {
                 ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.X, mouseOnData.Value.Y);
-                HighlightedPointPlot?.IsVisible = true;
+                HighlightedPointPlot.IsVisible = true;
                 HoverChanged = true ^ HoverActive;
                 HoverActive = true;
-                if (SelectedGraphEntry?.DataGraph is Graph g)
-                    HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
             } else if (mouseOnGebunden != null) {
                 ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y);
-                HighlightedPointPlot?.IsVisible = true;
+                HighlightedPointPlot.IsVisible = true;
                 HoverChanged = true ^ HoverActive;
                 HoverActive = true;
-                if (SelectedGraphEntry?.GebundenGraph is Graph g)
-                    HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, g, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
             } else {
                 ChangeMarker(HighlightedPointPlot, false);
                 HoverChanged = false ^ HoverActive;
                 HoverActive = false;
-                if (TooltipPlot != null) {
-                    OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    TooltipPlot = null;
-                }
+                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
                 OechslePricePlot.Refresh();
             }
         }
@@ -589,10 +577,7 @@ namespace Elwig.Windows {
 
         private void HandleTooltip(double pointX, double pointY, int pointIndex, Graph g, Point p, bool force) {
             if (force || LastHighlighted != Highlighted || HoverChanged) {
-                if (TooltipPlot != null) {
-                    OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
-                    TooltipPlot = null;
-                }
+                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
                 if (TooltipInput.IsChecked == true) {
                     Coordinates mouseLocation = GetMouseCoordinates(new(p.X, p.Y - 30));
                     TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)} {CurrencySymbol}/kg", mouseLocation.X, mouseLocation.Y);
@@ -691,7 +676,7 @@ namespace Elwig.Windows {
             }
         }
 
-        private static void DisableTextBox(TextBox u) {
+        private void DisableTextBox(TextBox u) {
             u.IsEnabled = false;
             u.IsReadOnly = true;
         }
@@ -722,8 +707,10 @@ namespace Elwig.Windows {
             ActiveGraph = g;
         }
 
-        private static void ChangeLineWidth(Scatter? p, double lineWidth) {
-            p?.LineWidth = (float)lineWidth;
+        private void ChangeLineWidth(Scatter? p, double lineWidth) {
+            if (p != null) {
+                p.LineWidth = (float)lineWidth;
+            }
         }
 
         private void GraphList_SelectionChanged(object sender, SelectionChangedEventArgs e) {
@@ -765,7 +752,7 @@ namespace Elwig.Windows {
                 }
             }
 
-            SelectedGraphEntry?.Vaributes = [.. VaributeInput.SelectedItems.Cast<Varibute>()];
+            SelectedGraphEntry!.Vaributes = VaributeInput.SelectedItems.Cast<Varibute>().ToList();
             SetHasChanged();
             GraphList.Items.Refresh();
             VaributeInput.Items.Refresh();

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -85,10 +85,10 @@ namespace Elwig.Windows {
                 if (n < 3) WeighingCButton.Visibility = Visibility.Hidden;
                 if (n < 4) WeighingDButton.Visibility = Visibility.Hidden;
                 if (n == 1) WeighingAButton.Content = "Wiegen";
-                if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleTerminalId}";
-                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleTerminalId}";
-                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleTerminalId}";
-                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleTerminalId}";
+                if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleId}";
+                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleId}";
+                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleId}";
+                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleId}";
                 WeighingManualButton.Margin = new Thickness(10, 10 + n * 32, 10, 10);
                 foreach (var s in App.EventScales) {
                     s.WeighingEvent += Scale_Weighing;
@@ -124,8 +124,7 @@ namespace Elwig.Windows {
 
         public DeliveryAdminWindow(int mgnr) :
             this() {
-            using var ctx = new AppDbContext();
-            ViewModel.FilterMember = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
+            ViewModel.FilterMember = DeliveryService.GetMember(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             ViewModel.EnableAllSeasons = true;
         }
@@ -139,7 +138,7 @@ namespace Elwig.Windows {
                 if (await ctx.FetchSeasons(Utils.CurrentYear).SingleOrDefaultAsync() == null) {
                     InteractionService.ShowWarning("Saison noch nicht erstellt",
                         "Die Saison für das aktuelle Jahr wurde noch nicht erstellt. Neue Lieferungen können nicht abgespeichert werden.\n\n" +
-                        "(Stammdaten \u2192 Saisons \u2192 Neu anlegen...)");
+                        "(Stammdaten -> Saisons -> Neu anlegen...)");
                 }
             }
         }
@@ -366,7 +365,7 @@ namespace Elwig.Windows {
         private void InitialInputs() {
             ViewModel.LastScaleError = null;
             ViewModel.WeighingData = null;
-            ViewModel.ScaleTerminalId = null;
+            ViewModel.ScaleId = null;
             ViewModel.ManualWeighingReason = null;
 
             ClearOriginalValues();
@@ -483,7 +482,7 @@ namespace Elwig.Windows {
             await base.OnRenewContext(ctx);
 
             if (ViewModel.FilterMember != null) {
-                if (await ctx.FetchMembers(ViewModel.FilterMember.MgNr).SingleOrDefaultAsync() is not Member m) {
+                if (await DeliveryService.GetMemberAsync(ViewModel.FilterMember.MgNr) is not Member m) {
                     Close();
                     return;
                 }
@@ -651,13 +650,13 @@ namespace Elwig.Windows {
         private void OnWeighingResult(IScale scale, WeighingResult res) {
             if ((res.NetWeight ?? 0) > 0 && res.FullWeighingId != null) {
                 ViewModel.Weight = res.NetWeight;
-                ViewModel.ScaleTerminalId = scale.ScaleTerminalId;
+                ViewModel.ScaleId = scale.ScaleId;
                 ViewModel.WeighingData = res.ToJson().ToJsonString();
                 ViewModel.ManualWeighingReason = null;
                 ManualWeighingInput.IsChecked = false;
             } else {
                 ViewModel.Weight = null;
-                ViewModel.ScaleTerminalId = null;
+                ViewModel.ScaleId = null;
                 ViewModel.WeighingData = null;
             }
             ViewModel.LastScaleError = null;
@@ -685,7 +684,7 @@ namespace Elwig.Windows {
         private async void TodayOnlyInput_Changed(object sender, RoutedEventArgs evt) {
             if (!HasContextLoaded) return;
             if (TodayOnlyInput.IsChecked == true && AllSeasonsInput.IsChecked == false) {
-                ViewModel.FilterSeason = DateTime.Today.Year;
+                ViewModel.FilterSeason = Utils.Today.Year;
                 ViewModel.FilterTodayOnly = true;
             }
             await RefreshList();
@@ -771,7 +770,7 @@ namespace Elwig.Windows {
         }
 
         private void EmptyScale() {
-            var scale = App.Scales.Where(s => s.ScaleTerminalId == ViewModel.ScaleTerminalId).FirstOrDefault();
+            var scale = App.Scales.Where(s => s.ScaleId == ViewModel.ScaleId).FirstOrDefault();
             if (scale is not ICommandScale cs) return;
             cs.Empty();
         }
@@ -953,7 +952,7 @@ namespace Elwig.Windows {
             ViewModel.Weight = res?.Item1;
             ManualWeighingInput.IsChecked = true;
             ViewModel.ManualWeighingReason = res?.Item2;
-            ViewModel.ScaleTerminalId = null;
+            ViewModel.ScaleId = null;
             ViewModel.WeighingData = null;
         }
 
@@ -1201,7 +1200,7 @@ namespace Elwig.Windows {
         }
 
         private async Task UpdateLsNr() {
-            if (string.IsNullOrWhiteSpace(ViewModel.Date) || ViewModel.Branch == null) {
+            if (string.IsNullOrEmpty(ViewModel.Date) || ViewModel.Branch == null) {
                 ViewModel.LsNr = "";
             } else {
                 try {
@@ -1379,7 +1378,7 @@ namespace Elwig.Windows {
                 var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("_")[0];
                 if (ViewModel.IsUnloadingPumped && (kl == 'A' || kl == '_')) {
                     kl = 'B';
-                } else if (ViewModel.IsUnloadingDumper && (kl == 'B' || kl == '_')) {
+                } else if (ViewModel.IsUnloadingDumper && kl == '_') {
                     kl = 'A';
                 } else {
                     kl = '_';

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -91,9 +91,8 @@ namespace Elwig.Windows {
                 .ToListAsync();
             list.ForEach(v => v.Schedule.AnnouncedWeightOverride = v.AnnouncedWeight);
             var deliverySchedules = list.Select(v => v.Schedule).ToList();
-            var today = DateTime.Today;
             ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
-                .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(today.ToString("yyyy-MM-dd")) >= 0)
+                .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
                 .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged);
         }

Elwig/Windows/MailWindow.xaml.cs

@@ -108,7 +108,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 ?? DateTime.Today.Year;
+                Year = year ?? ctx.Seasons.OrderByDescending(s => s.Year).FirstOrDefault()?.Year ?? Utils.Today.Year;
                 Title = $"Rundschreiben - Lese {Year} - Elwig";
             }
 
@@ -150,7 +150,7 @@ namespace Elwig.Windows {
             PostalSender1.Text = App.Client.Sender1;
             PostalSender2.Text = App.Client.Sender2;
             PostalLocation.Text = App.BranchLocation;
-            PostalDate.Text = $"{DateTime.Today:dd.MM.yyyy}";
+            PostalDate.Text = $"{Utils.Today:dd.MM.yyyy}";
             EmailSubjectInput.Text = App.Client.TextEmailSubject ?? "Rundschreiben";
             EmailBodyInput.Text = App.Client.TextEmailBody ?? "Sehr geehrtes Mitglied,\n\nim Anhang finden Sie das aktuelle Rundschreiben.\n\nIhre Winzergenossenschaft\n";
         }
@@ -438,7 +438,7 @@ namespace Elwig.Windows {
 
         private void Date_LostFocus(object sender, RoutedEventArgs evt) {
             var res = Validator.CheckDate((TextBox)sender, true);
-            if (!res.IsValid) ((TextBox)sender).Text = $"{DateTime.Today:dd.MM.yyyy}";
+            if (!res.IsValid) ((TextBox)sender).Text = $"{Utils.Today:dd.MM.yyyy}";
         }
 
         private async Task UpdateRecipients(AppDbContext ctx) {
@@ -937,7 +937,6 @@ namespace Elwig.Windows {
                 Mouse.OverrideCursor = Cursors.Wait;
                 var subject = EmailSubjectInput.Text;
                 var text = EmailBodyInput.Text;
-                var date = DateTime.Now;
                 await Task.Run(async () => {
                     await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
                     foreach (var (m, docs) in EmailDocuments) {
@@ -945,7 +944,6 @@ namespace Elwig.Windows {
                         msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
                         msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
                         msg.Subject = subject;
-                        msg.Date = date;
                         var body = new Multipart("mixed") {
                             new TextPart("plain") { Text = text }
                         };
@@ -960,7 +958,6 @@ namespace Elwig.Windows {
                             m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
                             subject, docs.Select(d => d.Title).ToArray()
                         )]);
-                        await Task.Delay((int)(App.Config.SmtpWait * 1000));
                     }
                 });
 

Elwig/Windows/MainWindow.xaml.cs

@@ -50,27 +50,22 @@ namespace Elwig.Windows {
             _syncTimer.Start();
         }
 
-        private async void Window_Closing(object sender, CancelEventArgs evt) {
-            evt.Cancel = !App.ForceShutdown;
-
+        private void Window_Closing(object sender, CancelEventArgs evt) {
             if (App.NumWindows > 1 && !App.ForceShutdown) {
-                foreach (var w in Application.Current.Windows.Cast<Window>().Where(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                foreach (var w in App.Current.Windows.Cast<Window>().Where(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
                     try {
                         w.Close();
                     } catch { }
                 }
                 Thread.Sleep(100);
-                if (App.NumWindows > 1 && !Application.Current.Windows.Cast<Window>().Any(w => ((w as AdministrationWindow)?.IsEditing ?? false) || ((w as AdministrationWindow)?.IsCreating ?? false))) {
+                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?")) {
-                        return;
+                        evt.Cancel = true;
+                    } else {
+                        Application.Current.Shutdown();
                     }
-                    App.ForceShutdown = true;
                 }
             }
-
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            await (Application.Current as App)!.OnClosing();
-            Application.Current.Shutdown();
         }
 
         private void Menu_Help_About_Click(object sender, RoutedEventArgs evt) {
@@ -167,7 +162,7 @@ namespace Elwig.Windows {
 
         private async void Menu_Database_Backup_Click(object sender, RoutedEventArgs evt) {
             try {
-                var filename = InteractionService.SaveFile("Datenbank-Sicherung", $"database_{DateTime.Today:yyyy-MM-dd}", "sql.zip");
+                var filename = InteractionService.SaveFile("Datenbank-Sicherung", $"database_{Utils.Today:yyyy-MM-dd}", "sql.zip");
                 if (filename != null) {
                     if (!filename.EndsWith(".sql.zip")) filename += ".sql.zip";
                     Mouse.OverrideCursor = Cursors.Wait;
@@ -182,7 +177,22 @@ namespace Elwig.Windows {
         }
 
         private async void Menu_Database_Restore_Click(object sender, RoutedEventArgs evt) {
-            await BackupService.RestoreDatabase();
+            try {
+                var d = new OpenFileDialog() {
+                    Title = "Datenbank wiederherstellen - Elwig",
+                    DefaultExt = "sql.zip",
+                    Filter = "SQLite-Datenbank (*.sqlite3, *.sqlite3.zip, *.sql, *.sql.zip)|*.sqlite3;*.sqlite3.zip;*.sql;*.sql.zip",
+                };
+                if (d.ShowDialog() == true) {
+                    if (!InteractionService.AskContinue("Datenbank wiederherstellen", "Soll die Datenbank wirklich unwiederruflich durch die wiederhergestellte Version ersetzt werden?"))
+                        return;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await App.ReplaceDatabase(d.FileName);
+                }
+            } catch (Exception exc) {
+                InteractionService.ShowException(exc);
+            }
+            Mouse.OverrideCursor = null;
         }
 
         private async void SyncButton_Click(object sender, RoutedEventArgs evt) {
@@ -190,13 +200,8 @@ namespace Elwig.Windows {
                 return;
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
-                if (App.Config.SyncMain) {
-                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, true);
-                    await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                } else {
-                    await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, false);
-                    await SyncService.UploadBranchDeliveries(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                }
+                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
+                await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
             });
             Mouse.OverrideCursor = null;
         }
@@ -206,7 +211,7 @@ namespace Elwig.Windows {
                 return;
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
-                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, App.Config.SyncMain);
+                await SyncService.Download(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
             });
             Mouse.OverrideCursor = null;
         }
@@ -224,10 +229,6 @@ namespace Elwig.Windows {
         private async void Menu_Sync_UploadModified_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.SyncUrl == null)
                 return;
-            if (!App.Config.SyncMain) {
-                InteractionService.ShowInformation("Mitglieder und Lieferungen hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
-                return;
-            }
             Mouse.OverrideCursor = Cursors.Wait;
             await Task.Run(async () => {
                 await SyncService.UploadModified(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
@@ -295,11 +296,6 @@ namespace Elwig.Windows {
             if (App.Config.SyncUrl == null)
                 return;
 
-            if (!App.Config.SyncMain) {
-                InteractionService.ShowInformation("Datenbank hochladen", "Hochladen nicht möglich: Dieses Gerät ist nicht das Hauptgerät!");
-                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!"))
                 return;
 
@@ -371,11 +367,7 @@ namespace Elwig.Windows {
                 await Task.Delay(delay);
                 var ch = false;
                 using (var ctx = new AppDbContext()) {
-                    if (App.Config.SyncMain) {
-                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    } else {
-                        ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword, default);
-                    }
+                    ch = await SyncService.ChangesAvailable(ctx, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                 }
                 await App.MainDispatcher.BeginInvoke(() => {
                     if (ch) {
@@ -468,12 +460,7 @@ namespace Elwig.Windows {
                     var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
                     var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
                     using var ods = new OdsFile(filename);
-                    if (App.Client.HasRedWhite) {
-                        await ods.AddTable(tbl1.Red);
-                        await ods.AddTable(tbl1.White);
-                    } else {
-                        await ods.AddTable(tbl1.Total);
-                    }
+                    await ods.AddTable(tbl1);
                     await ods.AddTable(tbl2);
                 } catch (Exception exc) {
                     InteractionService.ShowException(exc);
@@ -528,11 +515,9 @@ namespace Elwig.Windows {
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
-                    var tbl1 = await MemberAreaComTotalsData.ForSeason(ctx.MemberAreaComTotalsRows, year);
-                    var tbl2 = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
+                    var tbl = await MemberAreaComsData.ForSeason(ctx.MemberAreaComsRows, year);
                     using var ods = new OdsFile(filename);
-                    await ods.AddTable(tbl1);
-                    await ods.AddTable(tbl2);
+                    await ods.AddTable(tbl);
                 } catch (Exception exc) {
                     InteractionService.ShowException(exc);
                 }

Elwig/Windows/MemberAdminWindow.xaml

@@ -233,7 +233,7 @@
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="Nachname" Binding="{Binding Name}" Width="140"/>
                     <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
-                    <DataGridTextColumn Header="GA" Binding="{Binding SharesActive, StringFormat='{}{0} '}" Width="40">
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
@@ -619,26 +619,15 @@
                              Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
                              TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                    <Label Content="BH-Konto:" Margin="10,70,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,70,10,0" Width="63" Grid.Column="1" HorizontalAlignment="Left"
-                             TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BusinessSharesInput" Text="{Binding BusinessSharesString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                    <Label Content="Geschäftsanteile:" Margin="10,95,0,0" Grid.Column="0"/>
-                    <Label x:Name="BusinessSharesLabel" Content="(rot/weiß/ruhend)" Margin="10,108,0,0" Grid.Column="0" FontSize="10"/>
-                    <TextBox x:Name="BusinessShares1Input" Text="{Binding BusinessShares1String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares2Input" Text="{Binding BusinessShares2String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="37,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <TextBox x:Name="BusinessShares3Input" Text="{Binding BusinessShares3String, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="74,100,10,0" Width="32" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="IntegerInput_TextChanged"/>
-                    <Button x:Name="BusinessSharesButton" FontFamily="Segoe MDL2 Assets" Content="&#xEB05;" FontSize="16" Padding="0.5,0,0,0" IsEnabled="{Binding IsMemberSelected}"
-                            Margin="111,100,10,0" Width="25" Height="25" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" VerticalAlignment="Top"
-                            ToolTip="Geschäftsanteile bearbeiten"
-                            Click="BusinessSharesButton_Click"/>
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="AccountingNrInput" Text="{Binding AccountingNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                             Margin="0,100,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
                     <CheckBox x:Name="ActiveInput" Content="Aktiv" IsChecked="{Binding IsActive, Mode=TwoWay}" IsEnabled="False"
                               Checked="ActiveInput_Changed" Unchecked="ActiveInput_Changed"
@@ -667,7 +656,7 @@
 
                     <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
                     <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2" FontSize="12"
+                             Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="TextBox_TextChanged"
                              VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
@@ -706,24 +695,12 @@
                         </TextBlock.ToolTip>
                     </TextBlock>
 
-                    <Button x:Name="DeliveryButton" IsEnabled="{Binding IsMemberSelected}"
+                    <Button x:Name="DeliveryButton" Content="Lieferungen" IsEnabled="{Binding IsMemberSelected}"
                             Click="DeliveryButton_Click"
-                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="160" VerticalAlignment="Bottom" Grid.ColumnSpan="3" HorizontalContentAlignment="Stretch">
-                        <Grid>
-                            <TextBlock Margin="0,0,10,0" TextAlignment="Center">Lieferungen</TextBlock>
-                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                        TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,0,0"/>
-                        </Grid>
-                    </Button>
-                    <Button x:Name="AreaCommitmentButton" IsEnabled="{Binding IsMemberSelected}"
+                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" IsEnabled="{Binding IsMemberSelected}"
                             Click="AreaCommitmentButton_Click"
-                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="160" VerticalAlignment="Bottom" Grid.ColumnSpan="3" HorizontalContentAlignment="Stretch">
-                        <Grid>
-                            <TextBlock Margin="0,0,15,0" TextAlignment="Center">Flächenbindungen</TextBlock>
-                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                       TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,0,0"/>
-                        </Grid>
-                    </Button>
+                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
                 </Grid>
             </GroupBox>
         </Grid>
@@ -735,7 +712,7 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="150"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="200"/>
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="Auto"/>
@@ -752,7 +729,11 @@
                 </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
-            <StatusBarItem Grid.Column="2" Content="{Binding StatusBusinessShares}"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock ToolTip="{Binding StatusBusinessSharesToolTip}">
+                    Geschäftsanteile: <Run Text="{Binding StatusBusinessShares}"/>
+                </TextBlock>
+            </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4">
                 <TextBlock ToolTip="{Binding StatusAreaCommitmentToolTip}">

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -1,21 +1,18 @@
-using Elwig.Dialogs;
-using Elwig.Documents;
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using Elwig.Services;
-using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Threading.Tasks;
+using Elwig.Documents;
+using System.Diagnostics;
+using Elwig.Dialogs;
+using Elwig.Services;
+using Elwig.ViewModels;
+using System.Windows.Data;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -40,20 +37,13 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlO, Menu_List_ShowActive_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_MemberDataSheet_Print_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftO, Menu_List_PrintActive_Click));
-            List<Control> exempt = [
+            ExemptInputs = [
                 SearchInput, ActiveMemberInput, MemberList,
             ];
-            if (App.Client.EnableMemberHistory) {
-                exempt.AddRange([BusinessShares1Input, BusinessShares2Input, BusinessShares3Input]);
-                BusinessShares1Input.IsReadOnly = true;
-                BusinessShares2Input.IsReadOnly = true;
-                BusinessShares3Input.IsReadOnly = true;
-            }
-            ExemptInputs = [.. exempt];
             RequiredInputs = [
                 MgNrInput, GivenNameInput, NameInput,
                 AddressInput, PlzInput, OrtInput, BillingOrtInput,
-                BusinessShares1Input, BusinessShares2Input, BusinessShares3Input, BranchInput, DefaultKgInput
+                BusinessSharesInput, BranchInput, DefaultKgInput
             ];
             EmailAddressInputs = [
                 (EmailAddress1Label, EmailAddress1Input),
@@ -94,29 +84,6 @@ namespace Elwig.Windows {
             Menu_Export_UploadAll.IsEnabled = App.Config.SyncUrl != null;
             ViewModel.ShowOnlyActiveMembers = true;
 
-            if (App.Client.HasRedWhite) {
-                BusinessSharesLabel.Content = "(rot/weiß/ruhend)";
-                //BusinessShares1Input.Background = Brushes.MistyRose;
-                BusinessShares1Input.Foreground = Brushes.DarkRed;
-                BusinessShares1Input.ToolTip = "Geschäftsanteile (rot)";
-                //BusinessShares2Input.Background = Brushes.MintCream;
-                BusinessShares2Input.Foreground = Brushes.DarkGreen;
-                BusinessShares2Input.ToolTip = "Geschäftsanteile (weiß)";
-                BusinessShares3Input.Background = Brushes.WhiteSmoke;
-                BusinessShares3Input.ToolTip = "Geschäftsanteile (ruhend)";
-            } else {
-                BusinessSharesLabel.Content = "(normal/ruhend)";
-                BusinessShares1Input.ToolTip = "Geschäftsanteile (normal)";
-                BusinessShares2Input.Background = Brushes.WhiteSmoke;
-                BusinessShares2Input.ToolTip = "Geschäftsanteile (ruhend)";
-                BusinessShares3Input.Visibility = Visibility.Hidden;
-                BusinessSharesButton.Margin = new(74, 100, 10, 0);
-            }
-
-            if (!App.Client.EnableMemberHistory) {
-                BusinessSharesButton.Visibility = Visibility.Hidden;
-            }
-
             UpdateContactInfoVisibility();
         }
 
@@ -147,7 +114,7 @@ namespace Elwig.Windows {
             var cursor = Mouse.OverrideCursor != null;
             if (!cursor) Mouse.OverrideCursor = Cursors.Wait;
             var query = (vm.SearchQuery, vm.ShowOnlyActiveMembers);
-            var (members, stat) = await Task.Run(async () => {
+            var (members, totalMemberCount, totalBusinessShares) = await Task.Run(async () => {
                 using var ctx = new AppDbContext();
                 var (_, memberQuery, filter) = await vm.GetFilters(ctx);
                 var members = await memberQuery
@@ -174,17 +141,10 @@ namespace Elwig.Windows {
                         .ThenBy(m => m.MgNr)];
                 }
 
-                var stat = (await ctx.Members.GroupBy(m => 1).Select(g => new {
-                    Count = g.Count(),
-                    Shares = g.Sum(m => m.Shares),
-                    SharesRed = g.Sum(m => m.SharesRed),
-                    SharesWhite = g.Sum(m => m.SharesWhite),
-                    SharesDormant = g.Sum(m => m.SharesDormant),
-                    SharesTotal = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant),
-                    SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
-                }).ToListAsync()).Select(g => (g.Count, g.Shares, g.SharesRed, g.SharesWhite, g.SharesDormant, g.SharesTotal, g.SharesActive)).ToList();
+                var totalMemberCount = await ctx.Members.CountAsync();
+                var totalBusinessShares = await ctx.Members.SumAsync(m => m.BusinessShares);
 
-                return (members, stat[0]);
+                return (members, totalMemberCount, totalBusinessShares);
             });
             if (!cursor) Mouse.OverrideCursor = null;
             if (query != (ViewModel.SearchQuery, ViewModel.ShowOnlyActiveMembers)) return;
@@ -194,37 +154,8 @@ namespace Elwig.Windows {
             if (updateSort && MemberList.SelectedItem != null)
                 MemberList.ScrollIntoView(MemberList.SelectedItem);
 
-            ViewModel.StatusMembers = $"{members.Count:N0} ({stat.Count:N0})";
-
-            var sA = members.Sum(m => m.Shares);
-            var rA = members.Sum(m => m.SharesRed);
-            var wA = members.Sum(m => m.SharesWhite);
-            var dA = members.Sum(m => m.SharesDormant);
-            List<(int Count, Brush? Color)> a = [];
-            if (sA > 0) a.Add((sA, null));
-            if (rA > 0) a.Add((rA, Brushes.DarkRed));
-            if (wA > 0) a.Add((wA, Brushes.DarkGreen));
-            if (a.Count == 0) a.Add((0, null));
-
-            List<(int Count, Brush? Color)> b = [];
-            if (stat.Shares > 0) b.Add((stat.Shares, null));
-            if (stat.SharesRed > 0) b.Add((stat.SharesRed, Brushes.DarkRed));
-            if (stat.SharesWhite > 0) b.Add((stat.SharesWhite, Brushes.DarkGreen));
-            if (a.Count == 0) b.Add((0, null));
-
-            Run[] inlines = [
-                new("Geschäftsanteile: "),
-                .. a.Select(i => new Run($"{i.Count:N0}") { Foreground = i.Color ?? Brushes.Black }).Join(() => new("+")),
-                new(" ("),
-                .. b.Select(i => new Run($"{i.Count:N0}") { Foreground = i.Color ?? Brushes.Black }).Join(() => new("+")),
-                new(")")
-            ];
-            if (ViewModel.StatusBusinessShares == null) {
-                ViewModel.StatusBusinessShares = new();
-            } else {
-                ViewModel.StatusBusinessShares.Inlines.Clear();
-            }
-            ViewModel.StatusBusinessShares.Inlines.AddRange(inlines);
+            ViewModel.StatusMembers = $"{members.Count:N0} ({totalMemberCount:N0})";
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({totalBusinessShares:N0})";
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -248,17 +179,6 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
             await ViewModel.InitInputs();
-            if (App.Client.EnableMemberHistory) {
-                BusinessShares1Input.Text = "0";
-                BusinessShares2Input.Text = "0";
-                BusinessShares3Input.Text = "0";
-            } else if (App.Client.HasRedWhite) {
-                BusinessShares3Input.Text = "0";
-                SetDefaultValue(BusinessShares3Input);
-            } else {
-                BusinessShares2Input.Text = "0";
-                SetDefaultValue(BusinessShares2Input);
-            }
             SetDefaultValue(MgNrInput);
             SetDefaultValue(EntryDateInput);
             SetDefaultValue(ActiveInput);
@@ -270,7 +190,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(BranchInput, await ctx.FetchBranches().ToListAsync());
             ControlUtils.RenewItemsSource(DefaultKgInput, await ctx.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync());
 
-            var font = new FontFamily("Segoe MDL2 Assets");
+            var font = new System.Windows.Media.FontFamily("Segoe MDL2 Assets");
             MenuItem? temp = null;
             var seasons = await ctx.Seasons.Include(s => s.PaymentVariants).OrderByDescending(s => s.Year).ToListAsync();
             Menu_DeliveryConfirmation.Items.Clear();
@@ -347,21 +267,10 @@ namespace Elwig.Windows {
 
             await RefreshList();
 
-            var stat = await ctx.Members.GroupBy(m => m.IsActive).Select(g => new {
-                IsActive = g.Key,
-                Count = g.Count(),
-                Shares = g.Sum(m => m.Shares),
-                SharesRed = g.Sum(m => m.SharesRed),
-                SharesWhite = g.Sum(m => m.SharesWhite),
-                SharesDormant = g.Sum(m => m.SharesDormant),
-                SharesTotal = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite + m.SharesDormant),
-                SharesActive = g.Sum(m => m.Shares + m.SharesRed + m.SharesWhite),
-            }).ToDictionaryAsync(g => g.IsActive);
-
             var (s1, s2) = ('\u2007', '\u202f');
-            var mA = $"{stat.GetValueOrDefault(true)?.Count ?? 0:N0}";
-            var mI = $"{stat.GetValueOrDefault(false)?.Count ?? 0:N0}";
-            var mT = $"{stat.Sum(g => g.Value.Count):N0}";
+            var mA = $"{await ctx.Members.CountAsync(m => m.IsActive):N0}";
+            var mI = $"{await ctx.Members.CountAsync(m => !m.IsActive):N0}";
+            var mT = $"{await ctx.Members.CountAsync():N0}";
             var mM = Math.Max(mA.Length, Math.Max(mI.Length, mT.Length));
             var mS = mM > 3;
             if (mS) mM--;
@@ -370,53 +279,16 @@ namespace Elwig.Windows {
                 $"{new string(s1, Math.Max(0, mM - mI.Length))}{(mS && mI.Length < 4 ? s2 : "")}{mI} nicht aktive Mitglieder\n" +
                 $"{new string(s1, Math.Max(0, mM - mT.Length))}{(mS && mT.Length < 4 ? s2 : "")}{mT} Mitglieder gesamt";
 
-            var grid = new Grid();
-            grid.ColumnDefinitions.Add(new() { Width = new(100) });
-            grid.AddToolTipCell("Geschäftsanteile:", 0, 0, bold: true);
-            grid.AddToolTipCell("Aktive Mitglieder", 1, 0);
-            grid.AddToolTipCell("Nicht aktive Mg.", 2, 0);
-            grid.AddToolTipCell("Alle Mitglieder", 3, 0, bold: true);
-            if (App.Client.HasRedWhite) {
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.AddToolTipCell("rot", 0, 1, alignRight: true);
-                grid.AddToolTipCell("weiß", 0, 2, alignRight: true);
-                grid.AddToolTipCell("ruhend", 0, 3, alignRight: true);
-                grid.AddToolTipCell("gesamt", 0, 4, alignRight: true);
-
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesRed ?? 0:N0}", 1, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesWhite ?? 0:N0}", 1, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesDormant ?? 0:N0}", 1, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesTotal ?? 0:N0}", 1, 4, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesRed ?? 0:N0}", 2, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesWhite ?? 0:N0}", 2, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesDormant ?? 0:N0}", 2, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesTotal ?? 0:N0}", 2, 4, alignRight: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesRed):N0}", 3, 1, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesWhite):N0}", 3, 2, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesDormant):N0}", 3, 3, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesTotal):N0}", 3, 4, alignRight: true, bold: true);
-            } else {
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.ColumnDefinitions.Add(new() { Width = new(50) });
-                grid.AddToolTipCell("normal", 0, 1, alignRight: true);
-                grid.AddToolTipCell("ruhend", 0, 2, alignRight: true);
-                grid.AddToolTipCell("gesamt", 0, 3, alignRight: true);
-
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.Shares ?? 0:N0}", 1, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesDormant ?? 0:N0}", 1, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(true)?.SharesTotal ?? 0:N0}", 1, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.Shares ?? 0:N0}", 2, 1, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesDormant ?? 0:N0}", 2, 2, alignRight: true);
-                grid.AddToolTipCell($"{stat.GetValueOrDefault(false)?.SharesTotal ?? 0:N0}", 2, 3, alignRight: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.Shares):N0}", 3, 1, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesDormant):N0}", 3, 2, alignRight: true, bold: true);
-                grid.AddToolTipCell($"{stat.Sum(g => g.Value.SharesTotal):N0}", 3, 3, alignRight: true, bold: true);
-            }
-            ViewModel.StatusBusinessShares?.ToolTip = grid;
+            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.BusinessShares):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--;
+            ViewModel.StatusBusinessSharesToolTip =
+                $"{new string(s1, Math.Max(0, bM - bA.Length))}{(bS && bA.Length < 4 ? s2 : "")}{bA} Geschäftsanteile von aktiven Mitgliedern\n" +
+                $"{new string(s1, Math.Max(0, bM - bI.Length))}{(bS && bI.Length < 4 ? s2 : "")}{bI} Geschäftsanteile von nicht aktiven Mitgliedern\n" +
+                $"{new string(s1, Math.Max(0, bM - bT.Length))}{(bS && bT.Length < 4 ? s2 : "")}{bT} Geschäftsanteile gesamt";
         }
 
         private void SetPhoneNrInputVisible(int nr, bool visible, int? position = null) {
@@ -602,10 +474,6 @@ namespace Elwig.Windows {
             ViewModel.EnableSearchInputs = true;
         }
 
-        private void BusinessSharesButton_Click(object sender, RoutedEventArgs evt) {
-            App.FocusMemberBusinessSharesWindow(ViewModel.SelectedMember!.MgNr);
-        }
-
         private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
             App.FocusMemberAreaComs(ViewModel.SelectedMember!.MgNr);
         }
@@ -848,7 +716,7 @@ namespace Elwig.Windows {
             lastVisible = true;
             for (int i = 0; i < EmailAddressInputs.Length; i++) {
                 var input = EmailAddressInputs[i];
-                var vis = !string.IsNullOrWhiteSpace(input.Address.Text) || (m?.EmailAddresses.Any(a => a.Nr - 1 == i) ?? false);
+                var vis = !string.IsNullOrEmpty(input.Address.Text) || (m?.EmailAddresses.Any(a => a.Nr - 1 == i) ?? false);
                 var cVis = vis || (extra && lastVisible);
                 SetEmailAddressInputVisible(i, cVis, cVis ? num++ : null);
                 lastVisible = vis;
@@ -856,7 +724,7 @@ namespace Elwig.Windows {
             lastVisible = true;
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
                 var input = PhoneNrInputs[i];
-                var vis = !string.IsNullOrWhiteSpace(input.Number.Text) || (m?.TelephoneNumbers.Any(n => n.Nr - 1 == i) ?? false);
+                var vis = !string.IsNullOrEmpty(input.Number.Text) || (m?.TelephoneNumbers.Any(n => n.Nr - 1 == i) ?? false);
                 var cVis = vis || (extra && lastVisible);
                 SetPhoneNrInputVisible(i, cVis, cVis ? num++ : null);
                 lastVisible = vis;
@@ -873,14 +741,6 @@ namespace Elwig.Windows {
 
         new protected void ClearInputs(bool validate = false) {
             ViewModel.ClearInputs();
-            if (App.Client.EnableMemberHistory) {
-                BusinessShares1Input.Text = "";
-                BusinessShares2Input.Text = "";
-                BusinessShares3Input.Text = "";
-                ControlUtils.ClearInputState(BusinessShares1Input);
-                ControlUtils.ClearInputState(BusinessShares2Input);
-                ControlUtils.ClearInputState(BusinessShares3Input);
-            }
             base.ClearInputs(validate);
         }
 
@@ -925,9 +785,9 @@ namespace Elwig.Windows {
 
                 var oldMember = await ctx.FetchMembers(mgnr).SingleAsync();
                 var newName = $"{ViewModel.Name?.Replace('ß', 'ẞ').ToUpper()} " +
-                    $"{ViewModel.Prefix}{(!string.IsNullOrWhiteSpace(ViewModel.Prefix) ? " " : "")}" +
-                    $"{ViewModel.GivenName}{(!string.IsNullOrWhiteSpace(ViewModel.GivenName) ? " " : "")}" +
-                    $"{ViewModel.Suffix}{(!string.IsNullOrWhiteSpace(ViewModel.Suffix) ? " " : "")}";
+                    $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
+                    $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
+                    $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}";
                 var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
                 if (d.ShowDialog() != true)
                     return;

Elwig/Windows/MemberBusinessSharesAdminWindow.xaml

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

Elwig/Windows/MemberBusinessSharesAdminWindow.xaml.cs

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

Elwig/Windows/PaymentAdjustmentWindow.xaml

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

@@ -26,18 +26,18 @@ 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;
-            UnAdjustSharesButton.IsEnabled = !SeasonLocked;
+            AutoAdjustBsButton.IsEnabled = !SeasonLocked;
+            UnAdjustBsButton.IsEnabled = !SeasonLocked;
             SaveCustomButton.IsEnabled = !SeasonLocked;
             RemoveCustomButton.IsEnabled = !SeasonLocked;
             CustomAmountInput.IsEnabled = !SeasonLocked;
             CustomCommentInput.IsEnabled = !SeasonLocked;
 
-            AllowanceKgInput.Text = $"{App.Client.AutoAdjustShares.AllowanceKg}";
-            AllowanceShareInput.Text = $"{App.Client.AutoAdjustShares.AllowanceShares}";
-            AllowanceKgPerShareInput.Text = $"{App.Client.AutoAdjustShares.AllowanceKgPerShare}";
-            AllowancePercentInput.Text = $"{App.Client.AutoAdjustShares.AllowancePercent}";
-            MinSharesInput.Text = $"{App.Client.AutoAdjustShares.MinShares}";
+            AllowanceKgInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKg}";
+            AllowanceBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceBs}";
+            AllowanceKgPerBsInput.Text = $"{App.Client.AutoAdjustBs.AllowanceKgPerBs}";
+            AllowancePercentInput.Text = $"{App.Client.AutoAdjustBs.AllowancePercent}";
+            MinBsInput.Text = $"{App.Client.AutoAdjustBs.MinBs}";
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
@@ -46,36 +46,36 @@ namespace Elwig.Windows {
                     m.MgNr,
                     m.Name,
                     m.GivenName,
-                    m.SharesActive,
+                    m.BusinessShares,
                     m.IsActive,
                 })
                 .ToListAsync();
             var season = await ctx.FetchSeasons(Year).SingleAsync();
             var contracts = await ctx.AreaCommitmentTypes.ToDictionaryAsync(t => t.VtrgId, t => t);
 
-            var (tbl1, _, _) = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
+            var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, Year);
             var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, Year);
-            var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.WeightTotal);
+            var weight = tbl1.Rows.ToDictionary(r => r.MgNr, r => r.Weight);
             var areaComs = tbl2.Rows.ToDictionary(r => r.MgNr, r => r.VtrgIds.Zip(r.UnderDeliveries).ToDictionary(r => r.First, r => r.Second));
             CustomPayments = await ctx.CustomPayments.Where(p => p.Year == Year).ToDictionaryAsync(p => p.MgNr, p => p);
 
             var history = await ctx.MemberHistory
-                .Where(h => h.DeductYear == Year)
-                .GroupBy(h => h.ToMember)
-                .ToDictionaryAsync(h => h.Key.MgNr, h => h.Sum(g => g.Shares));
+                .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.Member)
+                .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),
-                    DeliveryObligation = (m.SharesActive - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerShare,
-                    DeliveryRight = (m.SharesActive - history.GetValueOrDefault(m.MgNr, 0)) * season.MaxKgPerShare,
+                    BusinessShares = m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0),
+                    DeliveryObligation = (m.BusinessShares - history.GetValueOrDefault(m.MgNr, 0)) * season.MinKgPerBusinessShare,
+                    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 +86,12 @@ namespace Elwig.Windows {
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
-                    PenaltyShares = m.OverUnder != null && m.OverUnder < 0 ?
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    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) +
-                        (m.Weight == 0 ? (-season.PenaltyNone ?? 0) + (-season.PenaltyPerShareNone * m.SharesActive ?? 0) : 0)
+                        (season.PenaltyPerBsAmount * Math.Floor(m.OverUnder / season.MinKgPerBusinessShare ?? 0m) ?? 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 +103,30 @@ namespace Elwig.Windows {
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
-                    PenaltyShares = m.PenaltyShares == null || m.PenaltyShares == 0 ? (decimal?)null : Math.Round((decimal)m.PenaltyShares, 2),
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    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,
-                    m.Custom?.ModRel,
+                    ModAbs = m.Custom?.ModAbs,
+                    ModRel = m.Custom?.ModRel,
                 })
                 .Select(m => new {
                     m.MgNr, m.Name, m.GivenName,
-                    m.SharesActive, m.Weight, m.OverUnder,
-                    m.PenaltyShares, 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),
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    m.PenaltyBs, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
+                    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.PenaltyShares, m.PenaltyAc, m.Adjust, m.AdjustAmount, m.CustomAmount, m.ModAbs, m.ModRel,
+                    m.BusinessShares, m.Weight, m.OverUnder,
+                    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,7 +136,7 @@ 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}";
@@ -147,25 +147,25 @@ namespace Elwig.Windows {
             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);
-                int? kgPerShare = AllowanceKgPerShareInput.Text == "" ? null : int.Parse(AllowanceKgPerShareInput.Text);
+                double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.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.AutoAdjustShares.AllowanceShares = shares;
-                App.Client.AutoAdjustShares.AllowanceKgPerShare = kgPerShare;
-                App.Client.AutoAdjustShares.AllowancePercent = percent;
-                App.Client.AutoAdjustShares.MinShares = minShares;
+                App.Client.AutoAdjustBs.AllowanceKg = kg;
+                App.Client.AutoAdjustBs.AllowanceBs = bs;
+                App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
+                App.Client.AutoAdjustBs.AllowancePercent = percent;
+                App.Client.AutoAdjustBs.MinBs = minBs;
 
                 await Task.Run(async () => {
                     await App.Client.UpdateValues();
                     var b = await Billing.Create(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) {
@@ -174,7 +174,7 @@ namespace Elwig.Windows {
             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 () => {
@@ -196,7 +196,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);
         }
 

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -7,7 +7,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="430" MinWidth="850">
+        Title="Auszahlungsvarianten - Elwig" Height="480" Width="850" MinHeight="400" MinWidth="850">
     <Window.DataContext>
         <vm:PaymentVariantsViewModel/>
     </Window.DataContext>
@@ -188,17 +188,18 @@
                       Margin="110,135,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
             <CheckBox x:Name="ConsiderAutoInput" IsChecked="{Binding ConsiderAuto, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
-                      Content="(Automatische) Nachzeichnungen von GA"
+                      Content="Automatische Nachzeichnungen der GA"
                       Margin="110,155,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
             <CheckBox x:Name="ConsiderCustomInput" IsChecked="{Binding ConsiderCustom, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsEnabled}"
                       Content="Benutzerdefinierte Zu-/Abschläge pro Mitglied"
                       Margin="110,175,10,10" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Top"
                       Checked="ConsiderCustomInput_Changed" Unchecked="ConsiderCustomInput_Changed"/>
+            <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" Margin="108,195,10,10"/>
 
             <Grid Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="50,200,10,10">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="130"/>
+                    <ColumnDefinition Width="110"/>
                     <ColumnDefinition Width="27"/>
                     <ColumnDefinition Width="110"/>
                     <ColumnDefinition Width="27"/>
@@ -206,7 +207,7 @@
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="27"/>
-                    <RowDefinition Height="37"/>
+                    <RowDefinition Height="5"/>
                     <RowDefinition Height="27"/>
                     <RowDefinition Height="5"/>
                     <RowDefinition Height="27"/>
@@ -226,23 +227,11 @@
                 </Grid.Resources>
 
                 <Button x:Name="EditButton" IsEnabled="{Binding IsPaymentVariantSelected}"
-                        Grid.Column="0" Grid.Row="2" HorizontalContentAlignment="Stretch"
-                        Click="EditButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,13,0" TextAlignment="Center" Text="{Binding EditText}"/>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                        Content="{Binding EditText}" Grid.Column="0" Grid.Row="2"
+                        Click="EditButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
-                <Button x:Name="ModifierButton" Grid.Column="0" Grid.Row="4" HorizontalContentAlignment="Stretch"
-                        Click="ModifierButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,15,0" TextAlignment="Center">Zu-/Abschläge</TextBlock>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="4"
+                        Click="ModifierButton_Click"/>
                 <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
                     <Label.RenderTransform>
                         <TransformGroup>
@@ -255,14 +244,8 @@
                         Content="Berechnen" Grid.Column="2" Grid.Row="2"
                         Click="CalculateButton_Click"/>
                 <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3"/>
-                <Button x:Name="PaymentAdjustmentButton" Grid.Column="2" Grid.Row="4" HorizontalContentAlignment="Stretch"
-                        Click="PaymentAdjustmentButton_Click">
-                    <Grid>
-                        <TextBlock Margin="0,0,13,0" TextAlignment="Center">Anpassen</TextBlock>
-                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE8A7;"
-                                   TextAlignment="Left" HorizontalAlignment="Right" Padding="0,1.5,0,0" Margin="0,0,5,0"/>
-                    </Grid>
-                </Button>
+                <Button x:Name="PaymentAdjustmentButton" Content="Anpassen" Grid.Column="2" Grid.Row="4"
+                        Click="PaymentAdjustmentButton_Click"/>
                 <Label Content="{Binding Arrow}" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="4" Grid.Column="3" RenderTransformOrigin="0.5,0.5" >
                     <Label.RenderTransform>
                         <TransformGroup>
@@ -278,7 +261,7 @@
                         Content="Freigeben" Grid.Column="4" Grid.Row="2"
                         Click="RevertButton_Click"/>
                 <Button x:Name="SaveButton" IsEnabled="{Binding SaveIsEnabled}"
-                        Content="Speichern" Grid.Column="2" Grid.Row="0"
+                        Content="Speichern" Grid.Column="4" Grid.Row="0"
                         Click="SaveButton_Click"/>
             </Grid>
 

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -5,7 +5,6 @@ using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -240,27 +239,15 @@ namespace Elwig.Windows {
         private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null)
                 return;
-
             Mouse.OverrideCursor = Cursors.Wait;
             try {
                 await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
+                App.HintContextChange();
             } catch (Exception exc) {
                 await ForceContextReload();
                 InteractionService.ShowDbException("Auszahlungsvariante aktualisieren", exc);
             }
-            try {
-                await Task.Run(async () => {
-                    var b = await BillingVariant.Create(v.Year, v.AvNr);
-                    await b.Calculate(false);
-                });
-            } catch (KeyNotFoundException exc) {
-                InteractionService.ShowInformation("Noch nicht alle Preise festgelegt", exc.Message);
-            } catch (Exception exc) {
-                InteractionService.ShowException("Berechnungsfehler", exc);
-            }
-            App.HintContextChange();
             Mouse.OverrideCursor = null;
-
             await EnsureContextRenewed();
             CommentInput_TextChanged(null, null);
             DateInput_TextChanged(null, null);

Elwig/app.manifest

@@ -16,7 +16,14 @@
 
   <dependency>
     <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
     </dependentAssembly>
   </dependency>
 </assembly>

Installer/Files/README.txt

@@ -13,6 +13,5 @@ Data and configuration folder
 C:\ProgramData\Elwig\
 - config.ini       : main configuration file
 - database.sqlite3 : stores all data
-- backups\         : (automatic) backups of the database
 - imported.txt     : list of all imported *.elwig.zip files to not automatically import them again
 - mails\           : sent/outgoing email log

Installer/Files/config.ini

@@ -3,7 +3,6 @@
 ; Only needed, if more than one branch is stored in database
 ;branch = Zweigstelle
 ;debug = true
-;weighing = gross  ; gross/net/box
 
 [database]
 ; Relative or absolute path to database file
@@ -11,14 +10,6 @@ file = database.sqlite3
 ; Enables database logging
 ;log = db.log
 
-[backup]
-;auto = false
-;path = backups
-;retain_hours = 36
-;retain_days = 8
-;retain_weeks = 6
-;retain_months = 18
-
 [update]
 url = https://elwig.at/files/elwig/latest
 auto = true
@@ -35,7 +26,6 @@ auto = true
 ;username = ""
 ;password = ""
 ;from = mail@wg.at
-;wait = 0.5
 
 ;[scale.1]
 ;type = SysTec-IT
@@ -47,8 +37,6 @@ auto = true
 ;limit = 3500
 ; Enables scale logging
 ;log = waage.log
-; Opt-out of auto time synchronization at startup
-;synctime = false
 
 ;[scale.B]
 ;type = Avery-Async

README.md

@@ -13,7 +13,7 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.1.2.1 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.5.6 ([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.1.2.1 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.5.6 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  

Tests/E2ETests/MainWindowTest.cs

@@ -53,7 +53,7 @@ namespace Tests.E2ETests {
                 Session.App.FindElement(By.Name("Rundschreiben")).Click();
                 Thread.Sleep(Utils.WINDOW_OPEN_SLEEP);
                 var window = Session.CreateWindowDriver("MailWindow");
-                Assert.That(window.Title, Is.EqualTo($"Rundschreiben - Lese {DateTime.Today.Year} - Elwig"));
+                Assert.That(window.Title, Is.EqualTo($"Rundschreiben - Lese {Elwig.Helpers.Utils.Today.Year} - Elwig"));
                 window.Close();
             });
         }

Tests/Resources/Sql/BillingInsert.sql

@@ -32,9 +32,9 @@ INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, yea
 ( 2, 1, 101, 'GV', 'KIP', 10000, '123/5', 2025, 2030),
 ( 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 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, NULL, NULL, NULL),
+(2021, 'EUR', 2000, 4000, NULL, NULL, NULL, NULL, NULL);
 
 INSERT INTO modifier (year, modid, ordering, name, abs, rel, active) VALUES
 (2020, 'S', 0, 'Geschädigte Trauben', NULL, -0.1, TRUE),
@@ -45,7 +45,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2020, 1, '2020-10-01', NULL, 'X', 1),
 (101, 2020, 2, '2020-10-01', NULL, 'X', 2),
 (101, 2020, 3, '2020-10-01', NULL, 'X', 3);
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2020, 1, 1, 'GV', 'K',  NULL, 4000, 17, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 1, 2, 'GV', NULL, NULL, 4000, 16, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020, 2, 1, 'GV', NULL, 'B',  4000, 15, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
@@ -60,7 +60,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2021, 1, '2021-10-01', NULL, 'X', 1),
 (101, 2021, 2, '2021-10-01', NULL, 'X', 2),
 (101, 2021, 3, '2021-10-01', NULL, 'X', 3);
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, gebunden, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, gebunden, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2021, 1, 1, 'GV', 'K',  NULL, 4000, 17, 'KAB', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 1, 2, 'GV', NULL, NULL, 4000, 16, 'QUW', 'WLNO', 06109, FALSE, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021, 2, 1, 'GV', NULL, 'B',  4000, 15, 'QUW', 'WLNO', 06109, TRUE,  TRUE, FALSE, FALSE, NULL, NULL, NULL),

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
-(2020, 'EUR', 1000, 2000, NULL, NULL);
+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, 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);
@@ -39,7 +39,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (104, 2020, 11, '2020-10-03', '14:39:22', 'X', 2),
 (104, 2020, 12, '2020-10-03', '15:15:41', 'X', 3);
 
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2020,  1, 1, 'GV', NULL, NULL,  3219, 15.0, 'QUW', 'WLNO', 06109, TRUE, FALSE, FALSE,  '1', '{"id":"321","nr":321,"gross_weight":3219,"tare_weight":0,"net_weight":3219,"date":"2020-10-01","time":"09:02:46"}', NULL),
 (2020,  2, 1, 'GV',  'K', NULL,  2987, 17.5, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2020,  2, 2, 'GV',  'K', NULL,  1873, 17.7, 'KAB', 'WLNO', 06109, TRUE, FALSE, FALSE, NULL, NULL, NULL),

Tests/Resources/Sql/ServiceInsert.sql

@@ -42,10 +42,10 @@ INSERT INTO area_commitment (fbnr, revnr, mgnr, vtrgid, cultid, area, gstnr, yea
 ( 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
-(2021, 'EUR', 2000, 4000, NULL, NULL),
-(2022, 'EUR', 2000, 4000, NULL, NULL),
-(2023, 'EUR', 2000, 4000, NULL, NULL);
+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, NULL, NULL, NULL),
+(2022, 'EUR', 2000, 4000, NULL, NULL, NULL, 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),
@@ -76,7 +76,7 @@ INSERT INTO delivery (mgnr, year, did, date, time, zwstid, lnr) VALUES
 (101, 2023, 18, '2023-10-10', NULL, 'X', 2),
 (101, 2023, 19, '2023-10-10', NULL, 'X', 3);
 
-INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_terminal, weighing_data, weighing_reason) VALUES
+INSERT INTO delivery_part (year, did, dpnr, sortid, attrid, cultid, weight, kmw, qualid, hkid, kgnr, net_weight, manual_weighing, spl_check, scale_id, weighing_data, weighing_reason) VALUES
 (2021,  1, 1, 'GV', NULL, NULL, 3500, 15.0, 'QUW', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021,  2, 1, 'GV', NULL, NULL, 4000, 17.0, 'KAB', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),
 (2021,  2, 2, 'GV', NULL, NULL, 4000, 16.0, 'QUW', 'WLNO', 15224, TRUE, FALSE, FALSE, NULL, NULL, NULL),

Tests/Tests.csproj

@@ -19,11 +19,11 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
     <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
     <PackageReference Include="NUnit" Version="4.6.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="6.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.14.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Tests/UnitTests/DocumentTests/CreditNoteTest.cs

@@ -8,7 +8,7 @@ namespace Tests.UnitTests.DocumentTests {
         public async Task Test_01_VirtualCreditNote() {
             using var doc = await CreditNote.Initialize(2020, 1, 101, null);
             var text = await Utils.GeneratePdfText(doc);
-            using (Assert.EnterMultipleScope()) {
+            Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
                     MUSTERMANN Max
                     Winzerstraße 1
@@ -16,7 +16,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Traubengutschrift Max Mustermann – Probevariante"));
                 Assert.That(text, Contains.Substring("AT81 1234 5678 9012 3457"));
                 Assert.That(text, Contains.Substring("""
@@ -32,7 +32,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("Gesamtbetrag: € 1 000,00"));
                 Assert.That(text, Contains.Substring("Auszahlungsbetrag: € 1 000,00"));
-            }
+            });
         }
     }
 }

Tests/UnitTests/DocumentTests/DeliveryAncmtListTest.cs

@@ -14,7 +14,7 @@ namespace Tests.UnitTests.DocumentTests {
             using var doc = new DeliveryAncmtList(filter, data);
             var text = await Utils.GeneratePdfText(doc, true);
             var table = Utils.ExtractTable(text);
-            using (Assert.EnterMultipleScope()) {
+            Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("Anmeldeliste"));
                 Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
                 Assert.That(table, Is.EqualTo(new string[][] {
@@ -24,7 +24,7 @@ namespace Tests.UnitTests.DocumentTests {
                     ["01.10.2020", "104 WINZER Waltraud",      "Wolkersdorf",      "Grüner Veltliner", "-",  "2 000"],
                     ["Gesamt:",        "Anmeldungen: 4",                                                    "25 000"],
                 }));
-            }
+            });
         }
     }
 }

Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs

@@ -13,7 +13,7 @@ namespace Tests.UnitTests.DocumentTests {
             var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, 2020, m!);
             using var doc = new DeliveryConfirmation(2020, m!, null, data);
             var text = await Utils.GeneratePdfText(doc);
-            using (Assert.EnterMultipleScope()) {
+            Assert.Multiple(() => {
                 Assert.That(text, Contains.Substring("""
                     MUSTERMANN Max
                     Winzerstraße 1
@@ -21,7 +21,7 @@ namespace Tests.UnitTests.DocumentTests {
                     """));
                 Assert.That(text, Contains.Substring("0123463"));  // Betriebsnummer
                 Assert.That(text, Contains.Substring("pauschaliert"));
-                Assert.That(text, Contains.Substring($"Wolkersdorf, am {DateTime.Today:dd.MM.yyyy}"));
+                Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Anlieferungsbestätigung 2020"));
                 Assert.That(text, Contains.Substring("""
                     20201001X001 1 Grüner Veltliner QUW 73 15,0 ungeb.: 3 219 3 219 ☑
@@ -39,7 +39,7 @@ namespace Tests.UnitTests.DocumentTests {
                     Welschriesling 5 382 - 5 382
                     12 442 3 129 15 571
                     """));
-            }
+            });
         }
     }
 }