Bump version to 0.13.0

CHANGELOG.md

@@ -3,6 +3,134 @@ Changelog
 =========
 
 
+[v0.13.0][v0.13.0] (2024-09-25) {#v0.13.0}
+------------------------------------------
+
+> [!NOTE]
+> Ab dieser Version verhält sich die Berechnung der Unterlieferungen bei Flächenbindungen anders.
+
+### Behobene Fehler {#0.13.0-bugfixes}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) war das Extrahieren in eine neue Lieferung seit ca. 6 Monaten (98688168b8) nicht mehr möglich. (8a61747538)
+
+### Sonstiges {#v0.13.0-misc}
+
+* Es werden alle Lieferungen (inkl. `WEI`, `RSW`, `LDW`) zur Berechnung der Unterlieferung bei Flächenbindungen herangezogen. (4fa5b8f6d4)
+* In diversen Fenstern die Formatierung von Zahlen verbessert. (579ed53487)
+* Das Rundschreiben-Fenster (`MailWindow`) ist nun benutzerfreundlicher/-sicherer. (4a7c95e250)
+
+[v0.13.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.13.0
+
+
+
+
+[v0.12.0][v0.12.0] (2024-09-24) {#v0.12.0}
+------------------------------------------
+
+### Behobene Fehler {#v0.12.0-bugfixes}
+
+* Das Drucken von Dokumenten ist wieder möglich. (94a6dd5312, a48ea8e7e2)
+
+### Sonstiges {#v0.12.0-misc}
+
+* Versuch 1: `Database is locked` Fehler beheben. ([#56][i56])
+
+[v0.12.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.12.0
+[i56]: https://git.necronda.net/winzer/elwig/issues/56
+
+
+
+
+[v0.11.4][v0.11.4] (2024-09-22) {#v0.11.4}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen die nächste Version zu verwenden.
+
+### Behobene Fehler {#v0.11.4-bugfixes}
+
+* In den Tooltips für Gewicht und Flächenbindungen wurden die Abstände wieder hergestellt. (e0fcaf1f53)
+
+[v0.11.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.4
+
+
+
+
+[v0.11.3][v0.11.3] (2024-09-22) {#v0.11.3}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen Version 0.12.0 zu verwenden.
+
+### Behobene Fehler {#v0.11.3-bugfixes}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde das Berechnen der Mitgliederdaten pro Jahr und Mitglied rückgängig gemacht. (1d187c25f3)
+
+[v0.11.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.3
+
+
+
+
+[v0.11.2][v0.11.2] (2024-09-22) {#v0.11.2}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers ist in dieser Version das Drucken von Dokumenten nicht möglich!
+>
+> Es wird empfohlen Version 0.12.0 zu verwenden.
+
+### Neue Funktionen {#v0.11.2-features}
+
+* In der Anmeldeliste (`DeliveryAncmtList`) wird die Stamm-KG des Mitgliedes angegeben. (165770fa37)
+* Im Hauptmenü wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
+
+### Behobene Fehler {#v0.11.2-bugfixes}
+
+* Falls das Übernahme-Fenster (`DeliveryAdminWindow`) geöffnet war und man währenddessen die aktuellste Lieferung gelöscht hat kam es zum Fehler beim Nummerieren des Lieferscheines. (5c12dba125)
+* In Seltenen Fällen konnte es vorkommen, dass sich Elwig aufgrund eines internen Fehlers im Übernahme-Fenster (`DeliveryAdminWindow`) geschlossen hat. (dcec6f03fe)
+
+### Sonstiges {#v0.11.2-misc}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) wurde das Layout der Teillieferungen-Liste angepasst. (9fa9d9fbec)
+* Alle Aufrufe von `FillInputs()` in `Services` sind nun synchron. (648c406ad2, 7791d02979)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Lieferinformationen pro Jahr und Mitglied im Voraus berechnet. (66be5a3e2c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) heißt es nun _Anmeldungen_, nicht mehr _Traubenanmeldungen_. (3cde360aaa)
+
+[v0.11.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.2
+
+
+
+
+[v0.11.1][v0.11.1] (2024-09-19) {#v0.11.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.1-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) mehr Filter hinzugefügt; das Gewicht wird (wie im Lieferungen-Fenster) aufgeschlüsselt. (27d8a5cfb6)
+
+### Behobene Fehler {#v0.11.1-bugfixes}
+
+* Beim Export der BKI-Liste werden Namen von Rechnungsadressen _immer_ richtig getrennt. (871bc299bd)
+* Flächenbindungen ohne Startsaison werden ohne Fehler gehandhabt. (21a1b11d68)
+
+### Sonstiges {#v0.11.1-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`)...
+	* die Liste der Lesepläne vergrößert. (a18b58f438)
+	* sind abgesagte Lesepläne durchgestrichen. (74200083ab)
+	* wird beim Erstellen das Feld für die MgNr direkt fokussiert. (3f7cd2a6ff)
+* Abhängigkeiten aktualisiert. (eee90c784b, d8beb03b96)
+* Kleinigkeiten in `DeliveryService`. (642fb3a625)
+
+[v0.11.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.1
+
+
+
+
 [v0.11.0][v0.11.0] (2024-09-16) {#v0.11.0}
 ------------------------------------------
 
@@ -167,7 +295,7 @@ Changelog
 
 > [!NOTE]
 > Mitglieder können ab dieser Version als juristische Person markiert werden.
-> Es ist empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus).
+> Es wird empfohlen, dies bei entsprechenden Mitglieder zu überprüfen und einzusetzen (z.B. Bezirksbauernkammer, Lagerhaus).
 
 ### Neue Funktionen {#v0.10.0-features}
 

Elwig/Documents/BusinessDocument.cs

@@ -81,11 +81,11 @@ namespace Elwig.Documents {
         }
 
         private static string FormatRow(
-            int obligation, int right, int delivery, int? payment = null, int? area = null,
+            int obligation, int right, int delivery, int? totalDelivery = null, int? payment = null, int? area = null,
             bool isGa = false, bool showPayment = false, bool showArea = false
         ) {
+            totalDelivery ??= delivery;
             payment ??= delivery;
-            var baseline = showPayment ? payment : delivery;
 
             if (showArea) {
                 return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" +
@@ -95,15 +95,15 @@ namespace Elwig.Documents {
 
             return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
                 $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" +
-                $"<td>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" +
+                $"<td>{(totalDelivery < obligation ? $"<b>{obligation - totalDelivery:N0}</b>" : "-")}</td>" +
-                $"<td>{(baseline >= obligation && delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
+                $"<td>{(delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
                 $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
                 (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") +
-                $"<td>{delivery:N0}</td>";
+                $"<td>{totalDelivery:N0}</td>";
         }
 
         private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) {
-            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
+            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
         }
 
         public string PrintBucketTable(

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -8,10 +8,11 @@
     <h2>@Model.Filter</h2>
     <table class="announcement-list">
         <colgroup>
-            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
             <col style="width: 12mm;"/>
-            <col style="width: 70mm;"/>
+            <col style="width: 50mm;"/>
-            <col style="width: 40mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 38mm;"/>
             <col style="width: 11mm;"/>
             <col style="width: 14mm;"/>
         </colgroup>
@@ -20,6 +21,7 @@
                 <th rowspan="2">Datum</th>
                 <th rowspan="2">MgNr.</th>
                 <th rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Ort</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th rowspan="2">Anmldg.</th>
                 <th>Gewicht</th>
@@ -31,9 +33,10 @@
         <tbody>
             @foreach (var a in Model.Announcements) {
                 <tr>
-                    <td>@($"{a.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
                     <td class="number">@a.MgNr</td>
                     <td>@a.AdministrativeName</td>
+                    <td class="small">@a.DefaultKg</td>
                     <td>@a.Variety</td>
                     <td class="small center">@(a.Status ?? "-")</td>
                     <td class="number">@($"{a.Weight:N0}")</td>
@@ -41,7 +44,7 @@
             }
             <tr class="sum bold">
                 <td colspan="2">Gesamt:</td>
-                <td colspan="2">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
+                <td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
                 <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
             </tr>
         </tbody>

Elwig/Documents/Document.cs

@@ -153,7 +153,7 @@ namespace Elwig.Documents {
 
         public async Task Print(int copies = 1) {
             if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(PdfPath, copies);
+            await Pdf.Print(PdfPath, copies, DoublePaged);
         }
 
         public void Show() {

Elwig/Documents/MemberDataSheet.cshtml

@@ -206,7 +206,7 @@
                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                             <td class="number">@($"{areaCom.Area:N0}")</td>
                             <td class="center">@areaCom.WineCult?.Name</td>
-                            <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
+                            <td class="center">@(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;
                     }

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.11.0</Version>
+    <Version>0.13.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -25,17 +25,19 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
     <PackageReference Include="LinqKit" Version="1.3.0" />
     <PackageReference Include="MailKit" Version="4.7.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.32" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
+    <PackageReference Include="PdfiumViewer" Version="2.13.0" />
+    <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.36" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

Elwig/Helpers/AppDbContext.cs

@@ -17,7 +17,7 @@ namespace Elwig.Helpers {
 
     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 Payment);
+    public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int DeliveryTotal, int Payment);
     public record struct MemberStat(string Variety, string Discr, int Weight);
     public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum);
 
@@ -78,7 +78,7 @@ namespace Elwig.Helpers {
         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime;
 
         public static string? ConnectionStringOverride { get; set; } = null;
-        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default";
+        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False";
 
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
@@ -203,10 +203,10 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
-        public async Task<int> NextLNr(DateOnly date) {
+        public async Task<int> NextLNr(DateOnly date, string zwstid) {
             var dateStr = date.ToString("yyyy-MM-dd");
             int c = 0;
-            (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync())
+            (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => d.LNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
@@ -442,6 +442,7 @@ namespace Elwig.Helpers {
                     rightsAndObligations.GetValueOrDefault(id).Right,
                     deliveryBuckets.GetValueOrDefault(id),
                     deliveryBucketsStrict.GetValueOrDefault(id),
+                    deliveryBuckets.GetValueOrDefault(id) + deliveryBuckets.GetValueOrDefault(id + "_"),
                     paymentBuckets.GetValueOrDefault(id)
                 );
             }

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 29;
+        public static readonly int RequiredSchemaVersion = 31;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Export/ElwigData.cs

@@ -565,7 +565,7 @@ namespace Elwig.Helpers.Export {
                 KgNr = kgnr,
                 GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
                 RdNr = rd?.RdNr,
-                YearFrom = json["year_from"]!.AsValue().GetValue<int>(),
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                 YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
             }, newRd ? rd : null);

Elwig/Helpers/Printing/Pdf.cs

@@ -8,16 +8,12 @@ using System.Windows;
 using System.Text.RegularExpressions;
 using System.Linq;
 using System.Net.Sockets;
-using System.Text;
+using PdfiumViewer;
+using System.Drawing.Printing;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string PdfToPrinter = new string[] { App.ExePath }
-            .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
-            .Select(x => Path.Combine(x, "PDFtoPrinter.exe"))
-            .Where(File.Exists)
-            .FirstOrDefault() ?? throw new FileNotFoundException("PDFtoPrinter executable not found");
         private static readonly string WinziPrint = new string[] { App.ExePath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
@@ -92,21 +88,24 @@ namespace Elwig.Helpers.Printing {
             });
         }
 
-        public static async Task Print(string path, int copies = 1) {
+        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 p = new Process() { StartInfo = new() {
+                using var doc = PdfDocument.Load(path);
-                    FileName = PdfToPrinter,
+                using var printDoc = doc.CreatePrintDocument(PdfPrintMode.CutMargin);
-                    CreateNoWindow = true,
+                printDoc.PrinterSettings = settings;
-                    UseShellExecute = false,
+                printDoc.Print();
-                } };
-                p.StartInfo.ArgumentList.Add(path);
-                p.StartInfo.ArgumentList.Add("/s");
-                p.StartInfo.ArgumentList.Add($"copies={copies}");
-                p.Start();
-                await p.WaitForExitAsync();
             } catch (Exception e) {
-                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken");
+                MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            return Task.CompletedTask;
         }
     }
 }

Elwig/Helpers/Utils.cs

@@ -348,7 +348,7 @@ namespace Elwig.Helpers {
         }
 
         public static (string, string?) SplitName(string fullName, string? familyName) {
-            if (familyName == null || familyName == "") return (fullName, null);
+            if (string.IsNullOrWhiteSpace(familyName)) return (fullName, null);
             var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
             if (p0 == -1) return (fullName, null);
             var p1 = fullName.IndexOf(" und ");
@@ -362,8 +362,10 @@ namespace Elwig.Helpers {
                     var p3 = fullName.LastIndexOf(' ', p2 - 1);
                     return (fullName[0..p3], fullName[(p3 + 1)..^0]);
                 }
-            } else {
+            } else if (p0 + familyName.Length >= fullName.Length || fullName[p0 + familyName.Length] == ' ') {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            } else {
+                return (fullName, null);
             }
         }
 
@@ -537,6 +539,16 @@ namespace Elwig.Helpers {
             }
         }
 
+        public static List<EventLogEntry> GetLogEntries() {
+            using var log = new EventLog {
+                Log = "Application",
+                Source = ".NET Runtime",
+            };
+            return log.Entries.Cast<EventLogEntry>()
+                .Where(e => e.Message.StartsWith("Application: Elwig.exe"))
+                .ToList();
+        }
+
         public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
             var pk = primaryKey.Select(k => k?.GetHashCode() ?? 0).ToArray();
             return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
@@ -558,7 +570,7 @@ namespace Elwig.Helpers {
 
         public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
         public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
-            c => (c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
+            c => (c.YearFrom == null || c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
 
         public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
         public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int year) =>

Elwig/Models/Dtos/DeliveryAncmtListData.cs

@@ -15,6 +15,7 @@ namespace Elwig.Models.Dtos {
             ("MgNr", "MgNr.", null, 12),
             ("Name1", "Name", null, 40),
             ("Name2", "Vorname", null, 40),
+            ("DefaultKg", "Ort", null, 40),
             ("SortId", "Sorte", null, 10),
             ("Weight", "Gewicht", "kg", 20),
             ("CreatedTimestamp", "Angemeldet", null, 35),
@@ -43,6 +44,7 @@ namespace Elwig.Models.Dtos {
         public string Name1;
         public string? Name2;
         public string AdministrativeName;
+        public string? DefaultKg;
         public string SortId;
         public string Variety;
         public DateTime CreatedTimestamp;
@@ -60,6 +62,7 @@ namespace Elwig.Models.Dtos {
             Name1 = m.AdministrativeName1;
             Name2 = m.AdministrativeName2;
             AdministrativeName = m.AdministrativeName;
+            DefaultKg = m.DefaultKg?.Name;
             SortId = a.SortId;
             Variety = a.Variety.Name;
             CreatedTimestamp = a.CreatedTimestamp;

Elwig/Models/Entities/AreaCom.cs

@@ -32,7 +32,7 @@ namespace Elwig.Models.Entities {
         public int? RdNr { get; set; }
 
         [Column("year_from")]
-        public int YearFrom { get; set; }
+        public int? YearFrom { get; set; }
 
         [Column("year_to")]
         public int? YearTo { get; set; }

Elwig/Models/Entities/DeliverySchedule.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Windows;
 
 namespace Elwig.Models.Entities {
     [Table("delivery_schedule"), PrimaryKey("Year", "DsNr")]
@@ -47,6 +48,8 @@ namespace Elwig.Models.Entities {
 
         [Column("cancelled")]
         public bool IsCancelled { get; set; }
+        [NotMapped]
+        public TextDecorationCollection? TextDecoration => IsCancelled ? TextDecorations.Strikethrough : null;
 
         [Column("ancmt_from")]
         public long? AncmtFromUnix { get; set; }

Elwig/Resources/Sql/29-30.sql

@@ -0,0 +1,18 @@
+-- schema version 29 to 30
+
+PRAGMA writable_schema = ON;
+
+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,
+       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;
+
+PRAGMA schema_version = 2901;
+PRAGMA writable_schema = OFF;

Elwig/Resources/Sql/30-31.sql

@@ -0,0 +1,14 @@
+-- schema version 30 to 31
+
+PRAGMA writable_schema = ON;
+
+DROP VIEW v_under_delivery_bucket_strict;
+CREATE VIEW v_under_delivery_bucket_strict AS
+SELECT c.year, c.mgnr, c.bucket, c.min_kg, SUM(COALESCE(p.weight, 0)) AS weight
+FROM v_area_commitment_bucket_strict c
+    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket) OR (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket || '_')
+GROUP BY c.year, c.mgnr, c.bucket
+ORDER BY c.year, c.mgnr, c.bucket;
+
+PRAGMA schema_version = 3001;
+PRAGMA writable_schema = OFF;

Elwig/Services/AreaComService.cs

@@ -106,7 +106,7 @@ namespace Elwig.Services {
                 var a = new AreaCom {
                     FbNr = oldFbNr ?? newFbNr,
                     MgNr = (int)vm.MgNr!,
-                    YearFrom = (int)vm.YearFrom!,
+                    YearFrom = vm.YearFrom,
                     YearTo = vm.YearTo,
                     VtrgId = vm.AreaComType!.VtrgId,
                     CultId = vm.WineCult?.CultId,
@@ -162,20 +162,13 @@ namespace Elwig.Services {
             AddToolTipCell(grid, max == null ? "" : $"{max:N0} kg", row, 4, 1, bold, true);
         }
 
-        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
+        public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
-            var grid = new Grid();
+            var grid = new List<(string?, string?, int, int?, int?)>();
-            grid.ColumnDefinitions.Add(new() { Width = new(10) });
-            grid.ColumnDefinitions.Add(new() { Width = new(60) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
-            AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
             var text = "-";
 
             var area = await areaComs.SumAsync(p => p.Area);
             text = $"{area:N0} m²";
-            AddToolTipRow(grid, 1, "Geb. Fläche", null, area, null, null);
+            grid.Add(("Geb. Fläche", null, area, null, null));
 
             if (await areaComs.AnyAsync()) {
                 var attrGroups = await areaComs
@@ -221,24 +214,38 @@ namespace Elwig.Services {
                     .ThenBy(g => g.SortId)
                     .ToListAsync();
 
-                int rowNum = 2;
                 if (noAttr.Count > 0) {
-                    rowNum++;
+                    grid.Add((null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max)));
-                    AddToolTipRow(grid, rowNum++, null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max));
                     foreach (var g in noAttr) {
-                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
+                        grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
                     }
                 }
                 foreach (var attrG in attrGroups) {
-                    rowNum++;
+                    grid.Add((attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max));
-                    AddToolTipRow(grid, rowNum++, attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max);
                     foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Area).ThenBy(g => g.SortId)) {
-                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
+                        grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
                     }
                 }
             }
 
-            return (text, grid);
+            return (text, grid.ToArray());
+        }
+
+        public static Grid GenerateToolTip((string?, string?, int, int?, int?)[] data) {
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            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++;
+                AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+            return grid;
         }
     }
 }

Elwig/Services/DeliveryAncmtService.cs

@@ -12,6 +12,8 @@ using Microsoft.Win32;
 using System.Windows.Input;
 using System.Windows;
 using System;
+using LinqKit;
+using System.Windows.Controls;
 
 namespace Elwig.Services {
     public static class DeliveryAncmtService {
@@ -30,7 +32,7 @@ namespace Elwig.Services {
             vm.StatusAncmtModified = "-";
         }
 
-        public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
+        public static void FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
             vm.MgNr = a.MgNr;
             vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
             vm.SortId = a.SortId;
@@ -53,11 +55,21 @@ namespace Elwig.Services {
             var filterVar = new List<string>();
             var filterNotVar = new List<string>();
             var filterMgNr = new List<int>();
+            var filterZwst = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+            var filterCult = new List<string>();
+            var filterNotCult = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+            int filterWeightGt = 0, filterWeightLt = 0;
 
             var filter = vm.TextFilter;
             if (filter.Count > 0) {
                 var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                 var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
+                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -81,6 +93,82 @@ namespace Elwig.Services {
                         filterMgNr.Add(int.Parse(e));
                         filter.RemoveAt(i--);
                         filterNames.Add(member.AdministrativeName);
+                    } else if (attr.ContainsKey(e.ToLower())) {
+                        var a = attr[e.ToLower()];
+                        filterAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Attribut {a.Name}");
+                    } else if (e[0] == '!' && attr.ContainsKey(e[1..].ToLower())) {
+                        var a = attr[e[1..].ToLower()];
+                        filterNotAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Attribut {a.Name}");
+                    } else if (cult.ContainsKey(e.ToLower())) {
+                        var c = cult[e.ToLower()];
+                        filterCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Bewirtschaftung {c.Name}");
+                    } else if (e[0] == '!' && cult.ContainsKey(e[1..].ToLower())) {
+                        var c = cult[e[1..].ToLower()];
+                        filterNotCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Bewirtschaftung {c.Name}");
+                    } else if (zwst.ContainsKey(e.ToLower())) {
+                        var b = zwst[e.ToLower()];
+                        filterZwst.Add(b.ZwstId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if ((e.StartsWith('>') || e.StartsWith('<')) && e.EndsWith("kg")) {
+                        if (int.TryParse(e[1..^2], out var num)) {
+                            switch (e[0]) {
+                                case '>': filterWeightGt = num; break;
+                                case '<': filterWeightLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 3) filter.RemoveAt(i--);
+                    } else if (DateOnly.TryParse(e, out var date)) {
+                        var str = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((str, str));
+                        filter.RemoveAt(i--);
+                        if (filterNames.Contains($"{vm.FilterSeason}") && vm.FilterSeason == date.Year)
+                            filterNames.Remove($"{vm.FilterSeason}");
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
+                    } else if (Utils.DateFromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        if (parts.Length == 1) {
+                            // single date
+                            var dParts = parts[0].Split('.');
+                            var str = $"{dParts[2]}-{dParts[1].PadLeft(2, '0')}-{dParts[0].PadLeft(2, '0')}";
+                            filterDate.Add((str, str));
+                            filter.RemoveAt(i--);
+                            var n = string.Join('.', str.Split('-').Reverse());
+                            if (dParts[2] == "") {
+                                filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n + $"{vm.FilterSeason}");
+                            } else {
+                                if ($"{vm.FilterSeason}" == dParts[2])
+                                    filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n);
+                            }
+                        } else if (parts.Length == 2) {
+                            // from/to date
+                            var d1Parts = parts[0].Split('.');
+                            var d2Parts = parts[1].Split('.');
+                            var s1 = d1Parts.Length < 2 ? null : $"{d1Parts.ElementAtOrDefault(2)}-{d1Parts[1].PadLeft(2, '0')}-{d1Parts[0].PadLeft(2, '0')}";
+                            var s2 = d2Parts.Length < 2 ? null : $"{d2Parts.ElementAtOrDefault(2)}-{d2Parts[1].PadLeft(2, '0')}-{d2Parts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s1, s2));
+                            filter.RemoveAt(i--);
+                            var n1 = s1 == null ? null : string.Join('.', s1.Split('-').Reverse());
+                            var n2 = s2 == null ? null : string.Join('.', s2.Split('-').Reverse());
+                            if (n1 != null && n2 != null) {
+                                filterNames.Add($"{n1}–{n2}");
+                            } else if (n1 != null) {
+                                filterNames.Add($"ab dem {n1}");
+                            } else if (n2 != null) {
+                                filterNames.Add($"bis zum {n2}");
+                            }
+                        }
                     } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
                         filter[i] = e[1..^1];
                     } else if (e.Length <= 2) {
@@ -88,9 +176,30 @@ namespace Elwig.Services {
                     }
                 }
 
+                if (filterWeightGt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight >= filterWeightGt);
+                if (filterWeightLt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight <= filterWeightLt);
                 if (filterMgNr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterMgNr.Contains(a.MgNr));
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryAncmt>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(a => (d1 == null || d1.CompareTo(a.Schedule.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(a.Schedule.DateString.Substring(10 - d2.Length)) >= 0));
+                    deliveryAncmtQuery = deliveryAncmtQuery.Where(pr);
+                }
                 if (filterVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterVar.Contains(a.SortId));
                 if (filterNotVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => !filterNotVar.Contains(a.SortId));
+                if (filterZwst.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterZwst.Contains(a.Schedule.ZwstId));
+                if (filterAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId != null && filterAttr.Contains(a.Schedule.AttrId));
+                if (filterNotAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId == null || !filterNotAttr.Contains(a.Schedule.AttrId));
+                if (filterCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId != null && filterCult.Contains(a.Schedule.CultId));
+                if (filterNotCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId == null || !filterNotCult.Contains(a.Schedule.CultId));
+
+                if (filterWeightGt > 0 && filterWeightLt > 0) {
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
+                }
             }
 
             return (filterNames, deliveryAncmtQuery, filter);
@@ -182,5 +291,108 @@ namespace Elwig.Services {
                 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) 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)
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
+            if (total2 != 0)
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
+        }
+
+        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<DeliveryAncmt> deliveryAncmts) {
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            var text = "-";
+
+            var weight = await deliveryAncmts.SumAsync(p => p.Weight);
+            text = $"{weight:N0} kg";
+            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+
+            if (await deliveryAncmts.AnyAsync()) {
+                var attrGroups = await deliveryAncmts
+                    .GroupBy(a => new { Attr = a.Schedule.Attribute!.Name, Cult = a.Schedule.Cultivation!.Name })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ToListAsync();
+                var sortGroups = await deliveryAncmts
+                    .GroupBy(a => a.SortId)
+                    .Select(g => new {
+                        SortId = g.Key,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+                var groups = await deliveryAncmts
+                    .GroupBy(a => new {
+                        Attr = a.Schedule.Attribute!.Name,
+                        Cult = a.Schedule.Cultivation!.Name,
+                        a.SortId,
+                    })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        g.Key.SortId,
+                        Weight = g.Sum(p => p.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+
+                int rowNum = 1;
+                foreach (var attrG in attrGroups) {
+                    rowNum++;
+                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
+                    AddToolTipRow(grid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
+                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                    }
+                }
+
+                if (attrGroups.Count == 1) {
+                    var g = attrGroups.First();
+                    var name = g.Attr == null && g.Cult == null ? null : g.Attr + (g.Attr != null && g.Cult != null ? " / " : "") + g.Cult;
+                    if (name != null) {
+                        text += $" [{name}]";
+                    }
+                    if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
+                        text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+
+                    }
+                } else if (attrGroups.Count <= 4) {
+                    text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                }
+            }
+
+            return (text, grid);
+        }
     }
 }

Elwig/Services/DeliveryScheduleService.cs

@@ -21,7 +21,7 @@ namespace Elwig.Services {
         public static void ClearInputs(this DeliveryScheduleAdminViewModel vm) {
         }
 
-        public static async Task FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
+        public static void FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
             vm.Date = s.Date;
             vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, s.ZwstId);
             vm.Description = s.Description;

Elwig/Services/DeliveryService.cs

@@ -134,7 +134,7 @@ namespace Elwig.Services {
                 var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                 var qual = await ctx.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
                 var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
-                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
                 var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
                 var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);
 
@@ -183,11 +183,11 @@ namespace Elwig.Services {
                     } else if (e.ToLower() == "!gerebelt") {
                         prd = prd.And(p => p.IsNetWeight == false);
                         filter.RemoveAt(i--);
-                        filterNames.Add("brutto Wiegung");
+                        filterNames.Add("nicht gerebelt gewogen");
                     } else if (e.ToLower() == "gerebelt") {
                         prd = prd.And(p => p.IsNetWeight == true);
                         filter.RemoveAt(i--);
-                        filterNames.Add("netto Wiegung");
+                        filterNames.Add("gerebelt gewogen");
                     } else if (e.Length >= 5 && e.Length <= 9 && "lesewagen".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
                         prd = prd.And(p => p.IsLesewagen == true);
                         filter.RemoveAt(i--);
@@ -443,7 +443,8 @@ namespace Elwig.Services {
             var originalMemberKgNr = oldDelivery?.Member.DefaultKgNr;
 
             var date = DateOnly.ParseExact(vm.Date!, "dd.MM.yyyy");
-            int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date) : null;
+            int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date, vm.Branch!.ZwstId) : null;
+            string? newLsNr = (newLnr != null) ? Utils.GenerateLsNr(date, vm.Branch!.ZwstId, newLnr.Value) : null;
 
             string? newTimeString = null;
             if (partNew && timeIsDefault) {
@@ -459,7 +460,7 @@ namespace Elwig.Services {
                 TimeString = newTimeString ?? oldDelivery?.TimeString,
                 LNr = newLnr ?? oldDelivery!.LNr,
                 ZwstId = vm.Branch!.ZwstId,
-                LsNr = vm.LsNr!,
+                LsNr = newLsNr ?? vm.LsNr!,
                 MgNr = (int)vm.MgNr!,
                 Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
             };
@@ -493,41 +494,35 @@ namespace Elwig.Services {
                 WeighingReason = vm.ManualWeighingReason,
             };
 
-            try {
+            if (oldDelivery != null && ctx.Entry(oldDelivery) is EntityEntry<Delivery> entry) {
-                if (oldDelivery != null && ctx.Entry(oldDelivery) is EntityEntry<Delivery> entry) {
+                entry.State = EntityState.Detached;
-                    entry.State = EntityState.Detached;
-                }
-                if (!deliveryNew) {
-                    ctx.Update(d);
-                } else {
-                    ctx.Add(d);
-                }
-                if (!partNew) {
-                    ctx.Update(p);
-                } else {
-                    ctx.Add(p);
-                }
-
-                ctx.UpdateDeliveryPartModifiers(p, await ctx.DeliveryPartModifiers
-                    .Where(m => m.Year == p.Year && m.DId == p.DId && m.DPNr == p.DPNr)
-                    .Select(m => m.Modifier)
-                    .ToListAsync(), vm.Modifiers);
-
-                if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
-                    // update origin (KgNr), if default is selected
-                    var newKgNr = (await ctx.Members.FindAsync(d.MgNr))?.DefaultKgNr;
-                    foreach (var part in d.Parts.Where(part => part.DPNr != dpnr && part.KgNr == originalMemberKgNr)) {
-                        part.KgNr = newKgNr;
-                        ctx.Update(part);
-                    }
-                }
-
-                await ctx.SaveChangesAsync();
-            } catch (Exception exc) {
-                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
-                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
             }
+            if (!deliveryNew) {
+                ctx.Update(d);
+            } else {
+                ctx.Add(d);
+            }
+            if (!partNew) {
+                ctx.Update(p);
+            } else {
+                ctx.Add(p);
+            }
+
+            ctx.UpdateDeliveryPartModifiers(p, await ctx.DeliveryPartModifiers
+                .Where(m => m.Year == p.Year && m.DId == p.DId && m.DPNr == p.DPNr)
+                .Select(m => m.Modifier)
+                .ToListAsync(), vm.Modifiers);
+
+            if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
+                // update origin (KgNr), if default is selected
+                var newKgNr = (await ctx.Members.FindAsync(d.MgNr))?.DefaultKgNr;
+                foreach (var part in d.Parts.Where(part => part.DPNr != dpnr && part.KgNr == originalMemberKgNr)) {
+                    part.KgNr = newKgNr;
+                    ctx.Update(part);
+                }
+            }
+
+            await ctx.SaveChangesAsync();
 
             return p;
         }
@@ -636,7 +631,7 @@ namespace Elwig.Services {
                     } else {
                         await ElwigData.Export(path, list, filterNames);
                         await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {list.Count} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
+                        MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen",
                             MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 } catch (HttpRequestException exc) {
@@ -720,36 +715,22 @@ namespace Elwig.Services {
             AddToolTipCell(grid, $"{max:N1}°", row, 4, 1, bold, true);
         }
 
-        public static async Task<(string WeightText, Grid WeightGrid, string GradationText, Grid GradationGrid)> GenerateToolTip(IQueryable<DeliveryPart> deliveryParts) {
+        public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
-            var wGrid = new Grid();
+            var wGrid = new List<(string?, string?, int, int?, int)>();
-            wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
             var wText = "-";
-
+            var gGrid = new List<(string?, string?, double, double, double)>();
-            var gGrid = new Grid();
-            gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            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);
             var gText = "-";
 
             var weight = await deliveryParts.SumAsync(p => p.Weight);
             wText = $"{weight:N0} kg";
-            AddWeightToolTipRow(wGrid, 0, "Gewicht", null, weight, null, weight);
+            wGrid.Add(("Gewicht", null, weight, null, weight));
 
             if (await deliveryParts.AnyAsync()) {
                 var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
                 var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
                 var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
                 gText = $"{kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
-                AddGradationToolTipRow(gGrid, 1, "Gradation", null, kmwMin, kmwAvg, kmwMax);
+                gGrid.Add(("Gradation", null, kmwMin, kmwAvg, kmwMax));
 
                 var attrGroups = await deliveryParts
                     .GroupBy(p => new { Attr = p.Attribute!.Name, Cult = p.Cultivation!.Name })
@@ -763,6 +744,7 @@ namespace Elwig.Services {
                     })
                     .OrderByDescending(g => g.Weight)
                     .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                     .ToListAsync();
                 var sortGroups = await deliveryParts
                     .GroupBy(p => p.SortId)
@@ -791,27 +773,24 @@ namespace Elwig.Services {
                         Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
                         Max = g.Max(p => p.Kmw)
                     })
-                    .OrderByDescending(g => g.SortId)
+                    .OrderByDescending(g => g.Weight)
                     .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                     .ThenBy(g => g.SortId)
                     .ToListAsync();
 
-                int rowNum = 1;
                 foreach (var attrG in attrGroups) {
-                    rowNum++;
                     var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    AddWeightToolTipRow(wGrid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
+                    wGrid.Add((name, null, attrG.Weight, attrG.Weight, weight));
                     foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
-                        AddWeightToolTipRow(wGrid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                        wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, weight));
                     }
                 }
-                rowNum = 2;
                 foreach (var attrG in attrGroups) {
-                    rowNum++;
                     var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    AddGradationToolTipRow(gGrid, rowNum++, name, null, attrG.Min, attrG.Avg, attrG.Max);
+                    gGrid.Add((name, null, attrG.Min, attrG.Avg, attrG.Max));
                     foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
-                        AddGradationToolTipRow(gGrid, rowNum++, null, g.SortId, g.Min, g.Avg, g.Max);
+                        gGrid.Add((null, g.SortId, g.Min, g.Avg, g.Max));
                     }
                 }
 
@@ -833,7 +812,38 @@ namespace Elwig.Services {
                 }
             }
 
-            return (wText, wGrid, gText, gGrid);
+            return (wText, wGrid.ToArray(), gText, gGrid.ToArray());
+        }
+
+        public static (Grid WeightGrid, Grid GradationGrid) GenerateToolTip((string?, string?, int, int?, int)[] weightData, (string?, string?, double, double, double)[] gradationData) {
+            var wGrid = new Grid();
+            wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
+            int rowNum = 0;
+            foreach (var row in weightData) {
+                if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++;
+                AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+
+            var gGrid = new Grid();
+            gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            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 == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
+                AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+
+            return (wGrid, gGrid);
         }
     }
 }

Elwig/Services/MemberService.cs

@@ -51,7 +51,7 @@ namespace Elwig.Services {
             vm.Age = "-";
         }
 
-        public static async Task FillInputs(this MemberAdminViewModel vm, Member m) {
+        public static void FillInputs(this MemberAdminViewModel vm, Member m) {
             vm.IsMemberSelected = true;
             vm.MgNrString = $"{m.MgNr}";
             vm.PredecessorMgNrString = $"{m.PredecessorMgNr}";
@@ -137,19 +137,26 @@ namespace Elwig.Services {
             vm.ContactViaPost = m.ContactViaPost;
             vm.ContactViaEmail = m.ContactViaEmail;
 
-            Dictionary<int, int> deliveries;
+            vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
-            using (var ctx = new AppDbContext()) {
+            vm.StatusDeliveriesLastSeason = "...";
+            vm.StatusDeliveriesLastSeasonToolTip = null;
+            vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
+            vm.StatusDeliveriesThisSeason = "...";
+            vm.StatusDeliveriesThisSeasonToolTip = null;
+            vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
+            vm.StatusAreaCommitment = "...";
+            vm.StatusAreaCommitmentToolTip = null;
+
+            Utils.RunBackground("Mitgliederdaten laden", async () => {
+                using var ctx = new AppDbContext();
+
                 var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
-                var (_, d1Grid, _, _) = await DeliveryService.GenerateToolTip(d1.SelectMany(d => d.Parts));
+                var (_, d1GridData, _, _) = await DeliveryService.GenerateToolTipData(d1.SelectMany(d => d.Parts));
-                vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
+                var textLast = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesLastSeason = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
 
                 var d2 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
-                var (_, d2Grid, _, _) = await DeliveryService.GenerateToolTip(d2.SelectMany(d => d.Parts));
+                var (_, d2GridData, _, _) = await DeliveryService.GenerateToolTipData(d2.SelectMany(d => d.Parts));
-                vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
+                var textThis = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesThisSeason = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
 
                 var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason);
                 int maxKgPerHa = 10_000;
@@ -157,21 +164,36 @@ namespace Elwig.Services {
                     var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
                     if (s != null) maxKgPerHa = s.MaxKgPerHa;
                 } catch { }
-                var (text, grid) = await AreaComService.GenerateToolTip(c, maxKgPerHa);
+                var (text, gridData) = await AreaComService.GenerateToolTipData(c, maxKgPerHa);
-                vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
-                vm.StatusAreaCommitment = text;
-                vm.StatusAreaCommitmentToolTip = grid;
 
-                deliveries = ctx.Deliveries
+                var deliveries = await ctx.Deliveries
-                  .Where(d => d.MgNr == m.MgNr)
+                    .Where(d => d.MgNr == m.MgNr)
-                  .SelectMany(d => d.Parts)
+                    .GroupBy(d => d.Year)
-                  .GroupBy(d => d.Year)
+                    .ToDictionaryAsync(g => g.Key, g => g.Any());
-                  .ToDictionary(g => g.Key, g => g.Sum(d => d.Weight));
+
-            }
+                if (m.MgNr != vm.MgNr)
+                    return;
+
+                await App.MainDispatcher.BeginInvoke(() => {
+                    var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
+                    var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
+                    var grid = AreaComService.GenerateToolTip(gridData);
+                    vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
+                    vm.StatusDeliveriesLastSeason = textLast;
+                    vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
+                    vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
+                    vm.StatusDeliveriesThisSeason = textThis;
+                    vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
+                    vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
+                    vm.StatusAreaCommitment = text;
+                    vm.StatusAreaCommitmentToolTip = grid;
+                    vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, false)).ToList();
+                });
+            });
 
             vm.MemberHasEmail = m.EmailAddresses.Count > 0;
             vm.MemberCanSendEmail = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
-            vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, 0) > 0).ToList();
+            vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => false).ToList();
         }
 
         public static async Task<(List<string>, IQueryable<Member>, List<string>)> GetFilters(this MemberAdminViewModel vm, AppDbContext ctx) {
@@ -477,7 +499,7 @@ namespace Elwig.Services {
                     } else {
                         await ElwigData.Export(path, members, areaComs, filterNames);
                         await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {members.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                        MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
                             MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                 } catch (HttpRequestException exc) {

Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs

@@ -3,6 +3,7 @@ using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Elwig.ViewModels {
     public partial class DeliveryAncmtAdminViewModel : ObservableObject {
@@ -73,6 +74,9 @@ namespace Elwig.ViewModels {
         [ObservableProperty]
         private string _statusAncmtModified = "-";
 
+        [ObservableProperty]
+        private Grid? _statusWeightToolTip;
+
         [ObservableProperty]
         private Visibility _controlButtonsVisibility = Visibility.Visible;
         [ObservableProperty]

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -79,9 +79,9 @@ namespace Elwig.Windows {
             if (filter.Count == 0) {
                 ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
                 var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
-                var (text, grid) = await AreaComService.GenerateToolTip(areaComQuery, s?.MaxKgPerHa ?? 10_000);
+                var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
                 ViewModel.StatusArea = text;
-                ViewModel.StatusAreaToolTip = grid;
+                ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
             } else {
                 ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
                 ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";
@@ -226,14 +226,22 @@ namespace Elwig.Windows {
         }
 
         private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            int? fbnr = null;
+            AreaCommitmentSaveButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
+            int fbnr;
             try {
                 fbnr = await ViewModel.UpdateAreaCommitment((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                AreaCommitmentSaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
+
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public partial class BaseDataWindow : AdministrationWindow {
@@ -316,12 +317,19 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
+            SaveButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
             try {
                 await Save();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
 
             IsEditing = false;

Elwig/Windows/ChartWindow.xaml.cs

@@ -661,6 +661,9 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
+            SaveButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
             try {
                 using (var ctx = new AppDbContext()) {
                     var origData = BillingData.FromJson(PaymentVar.Data);
@@ -677,7 +680,12 @@ namespace Elwig.Windows {
                 var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Auszahlungsvariante speichern", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
+
             LockContext = true;
             SetHasChanged(false);
         }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -356,14 +356,14 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100"/>
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
 
-                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Lieferschein-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
                     <TextBox x:Name="LsNrInput" Text="{Binding LsNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
                              IsReadOnly="True" IsTabStop="False"
@@ -390,6 +390,37 @@
                     <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                              Grid.Column="1" Margin="0,100,10,10"
                              TextChanged="TextBox_TextChanged"/>
+
+                    <Grid Grid.ColumnSpan="2" Margin="0,130,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                                 SelectionChanged="DeliveryPartList_SelectionChanged">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                        <TextBlock Text="{Binding SortId}" Width="30"/>
+                                        <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding QualId}" Width="30"/>
+                                        <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
+                                        <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+
+                        <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                                ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                                Click="ExtractDeliveryPartButton_Click"/>
+                        <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                                Click="DeleteDeliveryPartButton_Click"/>
+                    </Grid>
                 </Grid>
             </GroupBox>
 
@@ -538,39 +569,6 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                             SelectionChanged="DeliveryPartList_SelectionChanged">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
-                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding QualId}" Width="30"/>
-                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
-                                    <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                            Click="ExtractDeliveryPartButton_Click"/>
-                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                            Click="DeleteDeliveryPartButton_Click"/>
-                </Grid>
-            </GroupBox>
-
             <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
                 <Grid>
                     <Grid.ColumnDefinitions>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -386,16 +386,18 @@ namespace Elwig.Windows {
             await RefreshDeliveryParts();
 
             var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
-            ViewModel.StatusMembers = $"{members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
+            ViewModel.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
-            ViewModel.StatusDeliveries = $"{deliveries.Count}";
+            ViewModel.StatusDeliveries = $"{deliveries.Count:N0}";
 
             if (filter.Count == 0) {
                 var deliveryParts = deliveryPartsQuery;
-                ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})";
+                ViewModel.StatusDeliveries = $"{deliveries.Count:N0} ({await deliveryParts.CountAsync():N0})";
                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
-                ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
+                ViewModel.StatusVarieties = $"{varieties.Count:N0}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
-                (ViewModel.StatusWeight, ViewModel.StatusWeightToolTip,
+                var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
-                 ViewModel.StatusGradation, ViewModel.StatusGradationToolTip) = await DeliveryService.GenerateToolTip(deliveryParts);
+                ViewModel.StatusWeight = wText;
+                ViewModel.StatusGradation = gText;
+                (ViewModel.StatusWeightToolTip, ViewModel.StatusGradationToolTip) = DeliveryService.GenerateToolTip(wData, gData);
             } else {
                 ViewModel.StatusVarieties = "-";
                 ViewModel.StatusWeight = "-";
@@ -692,14 +694,28 @@ namespace Elwig.Windows {
             NewDeliveryPartButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
-            var p = await ViewModel.UpdateDeliveryPart(
+
-                (DeliveryList.SelectedItem as Delivery)?.Year,
+            DeliveryPart? p;
-                (DeliveryList.SelectedItem as Delivery)?.DId,
+            try {
-                (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
+                p = await ViewModel.UpdateDeliveryPart(
-                InputHasChanged(DateInput),
+                    (DeliveryList.SelectedItem as Delivery)?.Year,
-                InputHasChanged(TimeInput),
+                    (DeliveryList.SelectedItem as Delivery)?.DId,
-                !InputIsNotDefault(TimeInput)
+                    (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
-            );
+                    InputHasChanged(DateInput),
+                    InputHasChanged(TimeInput),
+                    !InputIsNotDefault(TimeInput)
+                );
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                FinishButton.IsEnabled = true;
+                SaveButton.IsEnabled = true;
+                Mouse.OverrideCursor = null;
+                DeliveryPartList.IsEnabled = true;
+                return;
+            }
+
             EmptyScale();
             await RefreshList();
             await RefreshDeliveryParts();
@@ -716,14 +732,28 @@ namespace Elwig.Windows {
             NewDeliveryPartButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             DeliveryPartList.IsEnabled = false;
-            var p = await ViewModel.UpdateDeliveryPart(
+
-                (DeliveryList.SelectedItem as Delivery)?.Year,
+            DeliveryPart? p;
-                (DeliveryList.SelectedItem as Delivery)?.DId,
+            try {
-                (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
+                p = await ViewModel.UpdateDeliveryPart(
-                InputHasChanged(DateInput),
+                    (DeliveryList.SelectedItem as Delivery)?.Year,
-                InputHasChanged(TimeInput),
+                    (DeliveryList.SelectedItem as Delivery)?.DId,
-                !InputIsNotDefault(TimeInput)
+                    (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
-            );
+                    InputHasChanged(DateInput),
+                    InputHasChanged(TimeInput),
+                    !InputIsNotDefault(TimeInput)
+                );
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                FinishButton.IsEnabled = true;
+                SaveButton.IsEnabled = true;
+                Mouse.OverrideCursor = null;
+                DeliveryPartList.IsEnabled = true;
+                return;
+            }
+
             EmptyScale();
             await RefreshList();
             await RefreshDeliveryParts();
@@ -741,6 +771,7 @@ namespace Elwig.Windows {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
+
             Mouse.OverrideCursor = null;
             DeliveryList.SelectedItem = null;
             await RenewContext();
@@ -938,22 +969,31 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
 
+            DeliveryPart? p;
+            try {
+                p = await ViewModel.UpdateDeliveryPart(
+                    (DeliveryList.SelectedItem as Delivery)?.Year,
+                    (DeliveryList.SelectedItem as Delivery)?.DId,
+                    (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
+                    InputHasChanged(DateInput),
+                    InputHasChanged(TimeInput),
+                    !InputIsNotDefault(TimeInput)
+                );
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
+            }
+
             IsEditing = false;
             IsCreating = false;
             DeliveryList.IsEnabled = true;
             DeliveryPartList.IsEnabled = true;
 
-            var p = await ViewModel.UpdateDeliveryPart(
-                (DeliveryList.SelectedItem as Delivery)?.Year,
-                (DeliveryList.SelectedItem as Delivery)?.DId,
-                (DeliveryPartList.SelectedItem as DeliveryPart)?.DPNr,
-                InputHasChanged(DateInput),
-                InputHasChanged(TimeInput),
-                !InputIsNotDefault(TimeInput)
-            );
-
-            Mouse.OverrideCursor = null;
-
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             LockInputs();
@@ -1032,7 +1072,8 @@ namespace Elwig.Windows {
             try {
                 using var ctx = new AppDbContext();
                 if (res == "new") {
-                    var lnr = await ctx.NextLNr(delivery.Date);
+                    var lnr = await ctx.NextLNr(delivery.Date, delivery.ZwstId);
+                    var lsnr = Utils.GenerateLsNr(delivery.Date, delivery.ZwstId, lnr);
                     ctx.Add(new Delivery {
                         Year = p.Year,
                         DId = await ctx.NextDId(p.Year),
@@ -1042,9 +1083,10 @@ namespace Elwig.Windows {
                         ZwstId = delivery.ZwstId,
                         MgNr = delivery.MgNr,
                         Comment = delivery.Comment,
-                        LsNr = Utils.GenerateLsNr(delivery.Date, delivery.ZwstId, lnr),
+                        LsNr = lsnr,
                     });
                     await ctx.SaveChangesAsync();
+                    res = lsnr;
                 }
                 Delivery? d = await ctx.Deliveries.Where(d => d.LsNr == res).FirstOrDefaultAsync();
                 if (d == null) return;
@@ -1195,7 +1237,7 @@ namespace Elwig.Windows {
                     var branch = (Branch)BranchInput.SelectedItem;
                     var date = DateOnly.ParseExact(ViewModel.Date!, "dd.MM.yyyy");
                     using var ctx = new AppDbContext();
-                    var lnr = await ctx.NextLNr(date);
+                    var lnr = await ctx.NextLNr(date, branch.ZwstId);
                     ViewModel.LsNr = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
                 } catch {
                     ViewModel.LsNr = "";
@@ -1309,8 +1351,7 @@ namespace Elwig.Windows {
 
         private void ModifiersInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             if (!IsEditing && !IsCreating) return;
-            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
-            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
             if (App.Client.IsMatzen) {
                 var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
                 if (kl.Count() > 1) {
@@ -1330,8 +1371,8 @@ namespace Elwig.Windows {
 
         private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
             if (!IsEditing && !IsCreating) return;
-            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
-            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
+            var source = ModifiersInput.ItemsSource.Cast<Modifier>().ToList();
             var lw = LesewagenInput.IsChecked == true;
             if (App.Client.IsMatzen) {
                 var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];

Elwig/Windows/DeliveryAncmtAdminWindow.xaml

@@ -8,7 +8,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:vm="clr-namespace:Elwig.ViewModels"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Traubenanmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
+        Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
         Loaded="Window_Loaded">
     <Window.DataContext>
         <vm:DeliveryAncmtAdminViewModel/>
@@ -84,7 +84,7 @@
                 <RowDefinition Height="42"/>
                 <RowDefinition Height="1*" MinHeight="100"/>
                 <RowDefinition Height="5"/>
-                <RowDefinition Height="2*" MinHeight="100"/>
+                <RowDefinition Height="1*" MinHeight="100"/>
                 <RowDefinition Height="42"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
@@ -99,13 +99,18 @@
                 <TextBox.ToolTip>
                     <TextBlock>
                         <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
-                        Traubenanmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Anmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
                         Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
                         <LineBreak/>
                         Filtern nach:<LineBreak/>
                         <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
                         <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
-                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...
+                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
+                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                     </TextBlock>
                 </TextBox.ToolTip>
             </TextBox>
@@ -129,7 +134,7 @@
                             <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/>
                             <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/>
                             <TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/>
-                            <TextBlock Text="{Binding Description}" Width="200"/>
+                            <TextBlock Text="{Binding Description}" Width="200" TextDecorations="{Binding TextDecoration}"/>
                             <TextBlock TextAlignment="Right">
                                 <TextBlock Text="{Binding AnnouncedWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
                                 / <TextBlock Text="{Binding MaxWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
@@ -288,7 +293,7 @@
                                     <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/>
                                     <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/>
                                     <TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/>
-                                    <TextBlock Text="{Binding Description}"/>
+                                    <TextBlock Text="{Binding Description}" TextDecorations="{Binding TextDecoration}"/>
                                 </StackPanel>
                             </DataTemplate>
                         </ComboBox.ItemTemplate>
@@ -324,11 +329,11 @@
                 <ItemsPanelTemplate>
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*" MinWidth="120"/>
+                            <ColumnDefinition Width="0.5*" MinWidth="120"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*" MinWidth="150"/>
+                            <ColumnDefinition Width="1.75*" MinWidth="150"/>
                             <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="2.25*"/>
+                            <ColumnDefinition Width="2*"/>
                             <ColumnDefinition Width="Auto"/>
                             <ColumnDefinition Width="2*"/>
                         </Grid.ColumnDefinitions>
@@ -342,7 +347,7 @@
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
-                <TextBlock>
+                <TextBlock ToolTip="{Binding StatusWeightToolTip}">
                     Gewicht: <Run Text="{Binding StatusWeight}"/>
                 </TextBlock>
             </StatusBarItem>

Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs

@@ -134,15 +134,22 @@ namespace Elwig.Windows {
                 DeliveryAncmtList.ScrollIntoView(DeliveryAncmtList.SelectedItem);
 
             ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
-            ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
+            if (filter.Count == 0) {
+                var (text, grid) = await DeliveryAncmtService.GenerateToolTip(deliveryAncmtQuery);
+                ViewModel.StatusWeight = text;
+                ViewModel.StatusWeightToolTip = grid;
+            } else {
+                ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
+                ViewModel.StatusWeightToolTip = null;
+            }
         }
 
-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
             ClearInputStates();
             if (ViewModel.SelectedDeliveryAncmt is DeliveryAncmt a) {
                 EditDeliveryAncmtButton.IsEnabled = true;
                 DeleteDeliveryAncmtButton.IsEnabled = true;
-                await FillInputs(a);
+                FillInputs(a);
             } else {
                 EditDeliveryAncmtButton.IsEnabled = false;
                 DeleteDeliveryAncmtButton.IsEnabled = false;
@@ -178,8 +185,8 @@ namespace Elwig.Windows {
             await RefreshList();
         }
 
-        private async void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+            RefreshInputs();
         }
 
         private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
@@ -276,6 +283,9 @@ namespace Elwig.Windows {
             InitInputs();
             ViewModel.MgNr = mgnr;
             ViewModel.EnableSearchInputs = false;
+
+            MgNrInput.Focus();
+            MgNrInput.SelectAll();
         }
 
         protected override void ShortcutEdit() {
@@ -304,8 +314,8 @@ namespace Elwig.Windows {
             if (ViewModel.SelectedDeliveryAncmt is not DeliveryAncmt a)
                 return;
             var r = MessageBox.Show(
-                $"Soll die Traubenanmeldung wirklich unwiderruflich gelöscht werden?",
+                $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
-                "Traubenanmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
             if (r == MessageBoxResult.OK) {
                 Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
@@ -317,7 +327,7 @@ namespace Elwig.Windows {
                 } catch (Exception exc) {
                     var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                     if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                    MessageBox.Show(str, "Traubenanmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show(str, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
                 Mouse.OverrideCursor = null;
             }
@@ -331,6 +341,8 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             Mouse.OverrideCursor = Cursors.AppStarting;
+            SaveButton.IsEnabled = false;
+
             int year = -1, dsnr = -1, mgnr = -1;
             string? sortid = null;
             try {
@@ -339,9 +351,13 @@ namespace Elwig.Windows {
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Traubenanmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(str, "Anmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
-            Mouse.OverrideCursor = null;
+
             IsEditing = false;
             IsCreating = false;
             DeliveryAncmtList.IsEnabled = true;
@@ -351,7 +367,7 @@ namespace Elwig.Windows {
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
             await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
             ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
             if (sortid != null)
@@ -364,9 +380,9 @@ namespace Elwig.Windows {
             ResetButton_Click(null, null);
         }
 
-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
             } else if (IsCreating) {
                 ClearInputs();
                 InitInputs();
@@ -391,15 +407,15 @@ namespace Elwig.Windows {
 
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
             LockInputs();
             ViewModel.EnableSearchInputs = true;
         }
 
-        private async Task FillInputs(DeliveryAncmt a) {
+        private void FillInputs(DeliveryAncmt a) {
             ClearOriginalValues();
             ClearDefaultValues();
-            await ViewModel.FillInputs(a);
+            ViewModel.FillInputs(a);
             FinishInputFilling();
         }
 

Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs

@@ -72,12 +72,12 @@ namespace Elwig.Windows {
                 DeliveryScheduleList.ScrollIntoView(DeliveryScheduleList.SelectedItem);
         }
 
-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
             ClearInputStates();
             if (ViewModel.SelectedDeliverySchedule is DeliverySchedule s) {
                 EditDeliveryScheduleButton.IsEnabled = true;
                 DeleteDeliveryScheduleButton.IsEnabled = true;
-                await FillInputs(s);
+                FillInputs(s);
             } else {
                 EditDeliveryScheduleButton.IsEnabled = false;
                 DeleteDeliveryScheduleButton.IsEnabled = false;
@@ -113,8 +113,8 @@ namespace Elwig.Windows {
             await RefreshList();
         }
 
-        private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+            RefreshInputs();
         }
 
         private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
@@ -201,14 +201,20 @@ namespace Elwig.Windows {
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             Mouse.OverrideCursor = Cursors.AppStarting;
+            SaveButton.IsEnabled = false;
+
             try {
                 await ViewModel.UpdateDeliverySchedule(ViewModel.SelectedDeliverySchedule?.Year, ViewModel.SelectedDeliverySchedule?.DsNr);
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Leseplan aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
-            Mouse.OverrideCursor = null;
+
             IsEditing = false;
             IsCreating = false;
             DeliveryScheduleList.IsEnabled = true;
@@ -218,7 +224,7 @@ namespace Elwig.Windows {
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
             await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
         }
 
@@ -228,9 +234,9 @@ namespace Elwig.Windows {
             ResetButton_Click(null, null);
         }
 
-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
             } else if (IsCreating) {
                 ClearInputs();
                 InitInputs();
@@ -238,21 +244,21 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
             IsEditing = false;
             IsCreating = false;
             DeliveryScheduleList.IsEnabled = true;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
             LockInputs();
             ViewModel.EnableSearchInputs = true;
         }
 
-        private async Task FillInputs(DeliverySchedule s) {
+        private void FillInputs(DeliverySchedule s) {
             ClearOriginalValues();
             ClearDefaultValues();
-            await ViewModel.FillInputs(s);
+            ViewModel.FillInputs(s);
             FinishInputFilling();
         }
 

Elwig/Windows/LogWindow.xaml

@@ -0,0 +1,34 @@
+<Window x:Class="Elwig.Windows.LogWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        Title="Fehler-Protokoll - Elwig" Height="600" Width="1000"
+        Loaded="Window_Loaded">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <DataGrid x:Name="EventList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                  SelectionChanged="EventList_SelectionChanged"
+                  Margin="10,10,5,10">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Ebene" Binding="{Binding Event.EntryType}" Width="60"/>
+                <DataGridTextColumn Header="Zeitpunkt" Binding="{Binding Event.TimeGenerated, StringFormat='{}{0:dd.MM.yyyy HH:mm:ss}'}" Width="120"/>
+                <DataGridTextColumn Header="Gerät" Binding="{Binding Event.MachineName}" Width="120"/>
+                <DataGridTextColumn Header="Fehler" Binding="{Binding ExceptionName}" Width="200"/>
+                <DataGridTextColumn Header="Beschreibung" Binding="{Binding ExceptionMessage}" Width="200"/>
+                <DataGridTextColumn Header="Herkunft" Binding="{Binding Location}" Width="200"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <TextBox x:Name="EventData" Grid.Column="2" Margin="5,10,10,10" IsReadOnly="True"
+                 HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"/>
+    </Grid>
+</Window>

Elwig/Windows/LogWindow.xaml.cs

@@ -0,0 +1,44 @@
+using Elwig.Helpers;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class LogWindow : Window {
+
+        public LogWindow() {
+            InitializeComponent();
+            WindowState = WindowState.Maximized;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            var log = Utils.GetLogEntries();
+            EventList.ItemsSource = log
+                .Select(e => new {
+                    Event = e,
+                    Lines = e.Message.Split('\n').ToArray(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
+                    Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    e.Exception,
+                    ExceptionName = e.Exception?[0].Trim(),
+                    ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
+                    e.Location,
+                })
+                .OrderByDescending(e => e.Event.TimeGenerated)
+                .ToList();
+            EventList.SelectedIndex = 0;
+        }
+
+        private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            var t = EventList.SelectedItem.GetType();
+            var p = t.GetProperty("Event")!;
+            EventData.Text = ((EventLogEntry)p.GetValue(EventList.SelectedItem)!).Message;
+        }
+    }
+}

Elwig/Windows/MailWindow.xaml

@@ -86,14 +86,16 @@
                         <Label x:Name="DocumentFooterLabel" Content="Fußtext:" Margin="10,40,0,10"/>
                         <TextBox x:Name="DeliveryConfirmationFooterInput" Grid.Column="1"
                                  Margin="0,40,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/>
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
+                                 TextChanged="DocumentInput_TextChanged"/>
                         <TextBox x:Name="CreditNoteFooterInput" Grid.Column="1"
                                  Margin="0,10,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/>
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
+                                 TextChanged="DocumentInput_TextChanged"/>
                     </Grid>
                 </GroupBox>
 
-                <TextBox x:Name="PostalLocation" Grid.Column="1"
+                <TextBox x:Name="PostalLocation" Grid.Column="1" TextChanged="PostalLocation_TextChanged"
                          Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
                 <Label Content=", am" Margin="130,30,10,10" FontSize="14" Grid.Column="1"/>
                 <TextBox x:Name="PostalDate" Grid.Column="1" Text="01.01.2020"
@@ -195,41 +197,42 @@
                     <Grid>
                         <GroupBox Header="Zusenden an..." Margin="10,10,10,10" Height="150" Width="220" VerticalAlignment="Top" HorizontalAlignment="Left">
                             <StackPanel>
-                                <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5">
+                                <RadioButton x:Name="PostalAllInput" Margin="10,10,10,2.5" Click="PostalInput_Changed">
                                     <TextBlock>
-                                        ... alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
+                                        ...alle (<Run Text="{Binding Path=PostalAllCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
                                     </TextBlock>
                                 </RadioButton>
-                                <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" IsChecked="True">
+                                <RadioButton x:Name="PostalWishInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed" IsChecked="True">
                                     <TextBlock>
                                         ...Mitglieder, die Zusendung<LineBreak/>
                                         per Post wünschen (<Run Text="{Binding Path=PostalWishCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
                                     </TextBlock>
                                 </RadioButton>
-                                <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5">
+                                <RadioButton x:Name="PostalNoEmailInput" Margin="10,2.5,10,2.5" Click="PostalInput_Changed">
                                     <TextBlock>
                                         ...Mitglieder, die keine<LineBreak/>
                                         E-Mail erhalten würden (<Run Text="{Binding Path=PostalNoEmailCount, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>)
                                     </TextBlock>
                                 </RadioButton>
-                                <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"/>
+                                <RadioButton x:Name="PostalNobodyInput" Margin="10,2.5,10,10" Content="...niemanden (0)"  Click="PostalInput_Changed"/>
                             </StackPanel>
                         </GroupBox>
 
                         <GroupBox Header="Sortieren nach" Margin="10,180,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
                             <StackPanel Margin="5,5,0,5">
-                                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
+                                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" Click="OrderInput_Changed" IsChecked="True"/>
-                                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
+                                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name" Click="OrderInput_Changed"/>
-                                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name"/>
+                                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name" Click="OrderInput_Changed"/>
                             </StackPanel>
                         </GroupBox>
 
                         <CheckBox x:Name="DoublePagedInput" Margin="20,270,10,10" Content="Doppelseitig drucken"
-                                  VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                  VerticalAlignment="Top" HorizontalAlignment="Left"
+                                  Checked="DoublePagedInput_Changed" Unchecked="DoublePagedInput_Changed"/>
 
-                        <TextBox x:Name="PostalSender1" IsEnabled="False"
+                        <TextBox x:Name="PostalSender1" TextChanged="PostalSender_TextChanged" IsEnabled="False"
                                  Margin="10,300,10,10"/>
-                        <TextBox x:Name="PostalSender2"
+                        <TextBox x:Name="PostalSender2" TextChanged="PostalSender_TextChanged"
                                  Margin="10,330,10,10"/>
                     </Grid>
                 </GroupBox>

Elwig/Windows/MailWindow.xaml.cs

@@ -200,6 +200,48 @@ namespace Elwig.Windows {
             await UpdateRecipients(ctx);
         }
 
+        private void ResetDocuments() {
+            DisposeDocs();
+            if (IsLoaded) {
+                PreviewButton.IsEnabled = false;
+                PrintButton.IsEnabled = false;
+                EmailButton.IsEnabled = false;
+                ProgressBar.Value = 0;
+            }
+        }
+
+        private void LockInputs() {
+            DocumentAddButton.IsEnabled = false;
+            DocumentRemoveButton.IsEnabled = false;
+            SelectDocumentButton.IsEnabled = false;
+            foreach (var tb in ControlUtils.FindAllChildren<TextBox>(this, []))
+                tb.IsReadOnly = true;
+            foreach (var cb in ControlUtils.FindAllChildren<ComboBox>(this, []))
+                cb.IsEnabled = false;
+            foreach (var cb in ControlUtils.FindAllChildren<CheckBox>(this, []))
+                cb.IsEnabled = false;
+            foreach (var lb in ControlUtils.FindAllChildren<ListBox>(this, []))
+                lb.IsEnabled = false;
+            foreach (var rb in ControlUtils.FindAllChildren<RadioButton>(this, []))
+                rb.IsEnabled = false;
+        }
+
+        private void UnlockInputs() {
+            DocumentAddButton.IsEnabled = true;
+            DocumentRemoveButton.IsEnabled = true;
+            SelectDocumentButton.IsEnabled = true;
+            foreach (var tb in ControlUtils.FindAllChildren<TextBox>(this, []))
+                tb.IsReadOnly = false;
+            foreach (var cb in ControlUtils.FindAllChildren<ComboBox>(this, []))
+                cb.IsEnabled = true;
+            foreach (var cb in ControlUtils.FindAllChildren<CheckBox>(this, []))
+                cb.IsEnabled = true;
+            foreach (var lb in ControlUtils.FindAllChildren<ListBox>(this, []))
+                lb.IsEnabled = true;
+            foreach (var rb in ControlUtils.FindAllChildren<RadioButton>(this, []))
+                rb.IsEnabled = true;
+        }
+
         private void ContinueButton_Click(object sender, RoutedEventArgs evt) {
             TabControl.SelectedIndex = 1;
             TabControl.AllowDrop = false;
@@ -210,7 +252,7 @@ namespace Elwig.Windows {
             TabControl.AllowDrop = true;
         }
 
-        private void Document_Drop(object sender, DragEventArgs evt) {
+        private async void Document_Drop(object sender, DragEventArgs evt) {
             if (evt.Data.GetDataPresent(DataFormats.FileDrop)) {
                 var files = (string[])evt.Data.GetData(DataFormats.FileDrop);
                 foreach (var file in files) {
@@ -218,6 +260,8 @@ namespace Elwig.Windows {
                         SelectedDocs.Add(new(DocType.Custom, Path.GetFileName(file), file));
                     }
                 }
+                using var ctx = new AppDbContext();
+                await UpdateRecipients(ctx);
             }
         }
 
@@ -260,8 +304,9 @@ namespace Elwig.Windows {
             }
         }
 
-        private void DocumentAddButton_Click(object sender, RoutedEventArgs evt) {
+        private async void DocumentAddButton_Click(object sender, RoutedEventArgs evt) {
             var idx = AvaiableDocumentsList.SelectedIndex;
+            using var ctx = new AppDbContext();
             if (AvaiableDocumentsList.SelectedItem is not string s)
                 return;
             if (idx == 0) {
@@ -270,20 +315,22 @@ namespace Elwig.Windows {
                 SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, (Year, DocumentNonDeliverersInput.IsChecked == true)));
                 RecipientsDeliveryMembersInput.IsChecked = true;
             } else if (idx >= 2) {
-                using var ctx = new AppDbContext();
                 var name = s.Split(" – ")[^1];
-                var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
+                var pv = await ctx.PaymentVariants.SingleAsync(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
                 RecipientsDeliveryMembersInput.IsChecked = true;
             }
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
+            await UpdateRecipients(ctx);
         }
 
-        private void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) {
+        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) {
             DeleteCommand.Execute(null);
+            using var ctx = new AppDbContext();
+            await UpdateRecipients(ctx);
         }
 
-        private void SelectDocumentButton_Click(object sender, RoutedEventArgs evt) {
+        private async void SelectDocumentButton_Click(object sender, RoutedEventArgs evt) {
             var d = new OpenFileDialog() {
                 Title = "Dokument auswählen - Elwig",
                 DefaultExt = "pdf",
@@ -296,6 +343,8 @@ namespace Elwig.Windows {
                         SelectedDocs.Add(new(DocType.Custom, Path.GetFileName(file), file));
                     }
                 }
+                using var ctx = new AppDbContext();
+                await UpdateRecipients(ctx);
             }
         }
 
@@ -334,6 +383,7 @@ namespace Elwig.Windows {
 
         private void Date_TextChanged(object sender, RoutedEventArgs evt) {
             Validator.CheckDate((TextBox)sender, true);
+            ResetDocuments();
         }
 
         private void Date_LostFocus(object sender, RoutedEventArgs evt) {
@@ -375,6 +425,8 @@ namespace Elwig.Windows {
                     query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
                 } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
                     query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year));
+                } else if  (RecipientsActiveMembersInput.IsChecked == true && SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
+                    query = query.Where(m => m.IsActive || m.Deliveries.Any(d => d.Year == Year));
                 } else {
                     query = query.Where(m => m.IsActive);
                 }
@@ -403,6 +455,7 @@ namespace Elwig.Windows {
             PostalWishCount = Recipients.Count(m => m.ContactViaPost);
             var m = EmailAllInput.IsChecked == true ? 3 : EmailWishInput.IsChecked == true ? 2 : 1;
             PostalNoEmailCount = PostalAllCount - (m == 3 ? EmailAllCount : m == 2 ? EmailWishCount : 0);
+            ResetDocuments();
         }
 
         private async Task UpdateTextParameters() {
@@ -458,6 +511,7 @@ namespace Elwig.Windows {
         }
 
         private async void GenerateButton_Click(object sender, RoutedEventArgs evt) {
+            LockInputs();
             PreviewButton.IsEnabled = false;
             PrintButton.IsEnabled = false;
             EmailButton.IsEnabled = false;
@@ -520,6 +574,7 @@ namespace Elwig.Windows {
                         dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year);
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        UnlockInputs();
                         GenerateButton.IsEnabled = true;
                         Mouse.OverrideCursor = null;
                         return;
@@ -536,6 +591,7 @@ namespace Elwig.Windows {
                         );
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                        UnlockInputs();
                         GenerateButton.IsEnabled = true;
                         Mouse.OverrideCursor = null;
                         return;
@@ -626,6 +682,7 @@ namespace Elwig.Windows {
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                UnlockInputs();
                 GenerateButton.IsEnabled = true;
                 Mouse.OverrideCursor = null;
                 return;
@@ -665,6 +722,7 @@ namespace Elwig.Windows {
                     PrintDocument = print;
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    UnlockInputs();
                     GenerateButton.IsEnabled = true;
                     Mouse.OverrideCursor = null;
                     return;
@@ -672,6 +730,7 @@ namespace Elwig.Windows {
             }
             ProgressBar.Value = 100.0;
 
+            UnlockInputs();
             GenerateButton.IsEnabled = true;
             Mouse.OverrideCursor = null;
             PreviewButton.IsEnabled = true;
@@ -705,9 +764,12 @@ namespace Elwig.Windows {
 
         private async void PrintButton_Click(object sender, RoutedEventArgs evt) {
             if (PrintDocument == null) return;
+
             PrintButton.IsEnabled = false;
-            var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?\n" +
+            GenerateButton.IsEnabled = false;
-                $"Sind die \"Duplex-Einstellungen\" des Standarddruckers entsprechend eingestellt (doppelseitig bzw. einseitig)?",
+            LockInputs();
+
+            var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?",
                 "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
             if (res == MessageBoxResult.Yes) {
                 Mouse.OverrideCursor = Cursors.AppStarting;
@@ -718,20 +780,26 @@ namespace Elwig.Windows {
                 }
                 Mouse.OverrideCursor = null;
             }
+
             PrintButton.IsEnabled = true;
+            GenerateButton.IsEnabled = true;
+            UnlockInputs();
         }
 
         private async void EmailButton_Click(object sender, RoutedEventArgs evt) {
             if (App.Config.Smtp == null || EmailDocuments == null) return;
 
             EmailButton.IsEnabled = false;
+            GenerateButton.IsEnabled = false;
+            LockInputs();
+
             SmtpClient? client = null;
             try {
                 Mouse.OverrideCursor = Cursors.AppStarting;
                 client = await Utils.GetSmtpClient();
                 Mouse.OverrideCursor = null;
 
-                var res = MessageBox.Show($"Sollen {EmailDocuments.Count} E-Mails verschickt werden?",
+                var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
                     "Rundschreiben verschicken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
                 if (res != MessageBoxResult.Yes) {
                     return;
@@ -755,6 +823,8 @@ namespace Elwig.Windows {
                     msg.Body = body;
                     await client!.SendAsync(msg);
                 }
+
+                MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
             } finally {
@@ -762,11 +832,14 @@ namespace Elwig.Windows {
                     await client.DisconnectAsync(true);
                 client?.Dispose();
                 EmailButton.IsEnabled = true;
+                GenerateButton.IsEnabled = true;
+                UnlockInputs();
                 Mouse.OverrideCursor = null;
             }
         }
 
         public void AddDeliveryConfirmation() {
+            if (!GenerateButton.IsEnabled) return;
             AvaiableDocumentsList.SelectedIndex = 1;
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation))
                 return;
@@ -776,6 +849,7 @@ namespace Elwig.Windows {
         }
 
         public void AddCreditNote(int index) {
+            if (!GenerateButton.IsEnabled) return;
             AvaiableDocumentsList.SelectedIndex = 2 + index;
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.CreditNote))
                 return;
@@ -786,5 +860,29 @@ namespace Elwig.Windows {
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
             RecipientsDeliveryMembersInput.IsChecked = true;
         }
+
+        private void DocumentInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            ResetDocuments();
+        }
+
+        private void PostalLocation_TextChanged(object sender, TextChangedEventArgs evt) {
+            ResetDocuments();
+        }
+
+        private void PostalInput_Changed(object sender, RoutedEventArgs evt) {
+            ResetDocuments();
+        }
+
+        private void OrderInput_Changed(object sender, RoutedEventArgs evt) {
+            ResetDocuments();
+        }
+
+        private void DoublePagedInput_Changed(object sender, RoutedEventArgs evt) {
+            ResetDocuments();
+        }
+
+        private void PostalSender_TextChanged(object sender, TextChangedEventArgs evt) {
+            ResetDocuments();
+        }
     }
 }

Elwig/Windows/MainWindow.xaml

@@ -32,6 +32,7 @@
                 <MenuItem Header="Über"/>
                 <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>
                 <MenuItem x:Name="Menu_Help_Smtp" Header="E-Mail-Einstellungen testen" Click="Menu_Help_Smtp_Click"/>
+                <MenuItem x:Name="Menu_Help_Log" Header="Fehler-Protokoll anzeigen" Click="Menu_Help_Log_Click"/>
                 <Separator/>
                 <MenuItem x:Name="Menu_Help_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Help_Config_Click"/>
                 <MenuItem x:Name="Menu_Help_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Help_Directory_Click"/>

Elwig/Windows/MainWindow.xaml.cs

@@ -90,6 +90,11 @@ namespace Elwig.Windows {
             } catch { }
         }
 
+        private void Menu_Help_Log_Click(object sender, RoutedEventArgs evt) {
+            var w = new LogWindow();
+            w.Show();
+        }
+
         private async void Menu_Scale_SetDateTime_Click(object sender, RoutedEventArgs evt) {
             if (App.CommandScales.Count == 0) {
                 MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -201,7 +206,7 @@ namespace Elwig.Windows {
                 } else {
                     await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
                     await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                    MessageBox.Show($"Hochladen von {deliveries.Count} Lieferungen erfolgreich!", "Lieferungen hochladen",
+                    MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen",
                         MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             } catch (HttpRequestException exc) {

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -155,12 +155,12 @@ namespace Elwig.Windows {
             ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
             ClearInputStates();
             if (ViewModel.SelectedMember is Member m) {
                 EditMemberButton.IsEnabled = true;
                 DeleteMemberButton.IsEnabled = true;
-                await FillInputs(m);
+                FillInputs(m);
             } else {
                 EditMemberButton.IsEnabled = false;
                 DeleteMemberButton.IsEnabled = false;
@@ -283,8 +283,8 @@ namespace Elwig.Windows {
             inputs.Address.Visibility = vis;
         }
 
-        private async void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+            RefreshInputs();
             if (MemberList.SelectedItem is Member m) {
                 Menu_Export_ExportSelected.IsEnabled = !IsEditing && !IsCreating;
                 Menu_Export_UploadSelected.IsEnabled = !IsEditing && !IsCreating && App.Config.SyncUrl != null;
@@ -391,14 +391,22 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
-            int? mgnr = null;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            SaveButton.IsEnabled = false;
+
+            int mgnr;
             try {
                 mgnr = await ViewModel.UpdateMember(ViewModel.SelectedMember?.MgNr);
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                SaveButton.IsEnabled = true;
+                return;
+            } finally {
+                Mouse.OverrideCursor = null;
             }
+
             IsEditing = false;
             IsCreating = false;
             MemberList.IsEnabled = true;
@@ -409,7 +417,7 @@ namespace Elwig.Windows {
             ViewModel.EnableSearchInputs = true;
             FinishInputFilling();
             await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
             ViewModel.SearchQuery = "";
             if (mgnr is int m)
                 FocusMember(m);
@@ -425,7 +433,7 @@ namespace Elwig.Windows {
             ViewModel.TransferPredecessorAreaComs = null;
             ViewModel.CancelAreaComs = null;
             if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
             } else if (IsCreating) {
                 ClearInputs();
                 await InitInputs();
@@ -433,7 +441,7 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        private async void CancelButton_Click(object sender, RoutedEventArgs evt) {
+        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = false;
             IsCreating = false;
             MemberList.IsEnabled = true;
@@ -441,7 +449,7 @@ namespace Elwig.Windows {
             ViewModel.CancelAreaComs = null;
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
             LockInputs();
             UpdateContactInfoVisibility();
             ViewModel.EnableSearchInputs = true;
@@ -686,10 +694,10 @@ namespace Elwig.Windows {
             }
         }
 
-        private async Task FillInputs(Member m) {
+        private void FillInputs(Member m) {
             ClearOriginalValues();
             ClearDefaultValues();
-            await ViewModel.FillInputs(m);
+            ViewModel.FillInputs(m);
             UpdateContactInfoVisibility(IsEditing || IsCreating);
             FinishInputFilling();
         }

Elwig/fetch-resources.bat

@@ -1,5 +1,4 @@
 ::mkdir "C:\Program Files\Elwig"
-::curl --fail -s -L "https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe"
 mkdir "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"

Installer/Installer.wixproj

@@ -25,7 +25,6 @@
     </Task>
   </UsingTask>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
-    <Exec Command="curl --fail -s -L &quot;https://github.com/emendelson/pdftoprinter/raw/main/PDFtoPrinter.exe&quot; -z &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot; -o &quot;$(ProjectDir)\Files\PDFtoPrinter.exe&quot;" />
     <Exec Command="dotnet publish &quot;$(ProjectDir)\..\Elwig\Elwig.csproj&quot; &quot;/p:PublishProfile=$(ProjectDir)\..\Elwig\Properties\PublishProfiles\FolderProfile.pubxml&quot;" />
     <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe">
       <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />
@@ -36,7 +35,6 @@
   </Target>
   <ItemGroup>
     <None Include="Files\config.ini" />
-    <None Include="Files\PDFtoPrinter.exe" />
     <None Include="Files\WinziPrint.exe" />
   </ItemGroup>
 </Project>

Installer/MainComponents.wxs

@@ -10,9 +10,6 @@
       <Component Directory="InstallFolder">
         <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/>
       </Component>
-      <Component Directory="InstallFolder">
-        <File Source="$(ProjectDir)\Files\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
-      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>

Tests/DocumentTests/DeliveryAncmtListTest.cs

@@ -18,11 +18,11 @@ namespace Tests.DocumentTests {
                 Assert.That(text, Contains.Substring("Anmeldeliste"));
                 Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
                 Assert.That(table, Is.EqualTo(new string[][] {
-                    ["01.10.2020", "101 MUSTERMANN Max",       "Grüner Veltliner", "-",  "5 000"],
+                    ["01.10.2020", "101 MUSTERMANN Max",       "Hohenruppersdorf", "Grüner Veltliner", "-",  "5 000"],
-                    ["01.10.2020", "102 WEINBAUER Wernhardt",  "Grüner Veltliner", "-", "10 000"],
+                    ["01.10.2020", "102 WEINBAUER Wernhardt",  "Hohenruppersdorf", "Grüner Veltliner", "-", "10 000"],
-                    ["01.10.2020", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "-",  "8 000"],
+                    ["01.10.2020", "103 MUSTERBAUER Matthäus", "Wolkersdorf",      "Grüner Veltliner", "-",  "8 000"],
-                    ["01.10.2020", "104 WINZER Waltraud",      "Grüner Veltliner", "-",  "2 000"],
+                    ["01.10.2020", "104 WINZER Waltraud",      "Wolkersdorf",      "Grüner Veltliner", "-",  "2 000"],
-                    ["Gesamt:",        "Anmeldungen: 4",                                "25 000"],
+                    ["Gesamt:",        "Anmeldungen: 4",                                                    "25 000"],
                 }));
             });
         }

Tests/E2ETests/Setup.cs

@@ -15,7 +15,7 @@ namespace Tests.E2ETests {
         [OneTimeSetUp]
         public static async Task SetupDatabase() {
             if (File.Exists(Utils.TestDatabasePath)) File.Delete(Utils.TestDatabasePath);
-            using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default");
+            using var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{Utils.TestDatabasePath}\"; Mode=ReadWriteCreate; Foreign Keys=True; Cache=Default; Pooling=False");
             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Create.sql");
             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.Insert.sql");
             await AppDbContext.ExecuteEmbeddedScript(cnx, Assembly.GetExecutingAssembly(), "Tests.Resources.Sql.E2EInsert.sql");

Tests/Tests.csproj

@@ -19,12 +19,12 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageReference Include="NReco.PdfRenderer" Version="1.5.3" />
+    <PackageReference Include="NReco.PdfRenderer" Version="1.5.4" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=29" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=31" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"