Bump version to 0.7.2

Elwig/App.xaml

@@ -1,11 +1,10 @@
-<Application x:Class="Elwig.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Elwig"
-             xmlns:ctrl="clr-namespace:Elwig.Controls"
-             StartupUri="Windows\MainWindow.xaml"
-             Exit="Application_Exit"
-             xmlns:ui="http://schemas.modernwpf.com/2019">
+<Application
+        x:Class="Elwig.App"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        StartupUri="Windows\MainWindow.xaml"
+        Exit="Application_Exit">
     <Application.Resources>
         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
         <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>

Elwig/App.xaml.cs

@@ -60,6 +60,9 @@ namespace Elwig {
         public static ClientParameters Client { get; set; }
 
         public static Dispatcher MainDispatcher { get; private set; }
+        private DateTime LastChanged;
+        private static DateTime CurrentLastWrite => File.GetLastWriteTime(Config.DatabaseFile);
+        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(2) };
 
         public App() : base() {
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
@@ -69,6 +72,17 @@ namespace Elwig {
             Scales = [];
             CurrentApp = this;
             OverrideCulture();
+
+            ContextTimer.Tick += (object? sender, EventArgs evt) => {
+                if (CurrentLastWrite > LastChanged) {
+                    LastChanged = CurrentLastWrite;
+                    OnContextChanged();
+                }
+            };
+        }
+
+        private static void OnContextChanged() {
+            MainDispatcher.BeginInvoke(async () => await HintContextChange());
         }
 
         private static void OverrideCulture() {
@@ -94,11 +108,17 @@ namespace Elwig {
             try {
                 await AppDbUpdater.CheckDb();
             } catch (Exception e) {
+                if (Config.UpdateUrl != null && Utils.HasInternetConnectivity()) {
+                    await CheckForUpdates();
+                }
                 MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
                 return;
             }
 
+            LastChanged = CurrentLastWrite;
+            ContextTimer.Start();
+
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
                 branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
@@ -180,6 +200,7 @@ namespace Elwig {
         }
 
         public static async Task HintContextChange() {
+            CurrentApp.LastChanged = CurrentLastWrite;
             foreach (Window w in CurrentApp.Windows) {
                 if (w is not ContextWindow c) continue;
                 await c.HintContextChange();
@@ -248,7 +269,7 @@ namespace Elwig {
         public static BaseDataWindow FocusBaseDataSeason(int year) {
             var w = FocusBaseData();
             w.Seasons.Focus();
-            ControlUtils.SelectListBoxItem(w.SeasonList, s => (s as Season)?.Year, year);
+            ControlUtils.SelectItemWithPk(w.SeasonList, year);
             return w;
         }
 

Elwig/Documents/BusinessDocument.cs

@@ -7,13 +7,12 @@ using System.Linq;
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {
 
-        public bool ShowDateAndLocation = false;
-
         public Member Member;
+        public string? Location;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
+        public bool ShowDateAndLocation = false;
         public string Aside;
-        public string? Location;
 
         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
             Member = m;
@@ -157,7 +156,7 @@ namespace Elwig.Documents {
             tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow(
                     Member.BusinessShares * season.MinKgPerBusinessShare,
                     Member.BusinessShares * season.MaxKgPerBusinessShare,
-                    Member.Deliveries.Where(d => d.Year == season.Year).Sum(d => d.Weight),
+                    season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
                     isGa: true, showPayment: includePayment, showArea: !includeDelivery
                 )}</tr>";
             if (fbs.Any()) {

Elwig/Documents/BusinessDocument.css

@@ -55,13 +55,13 @@ aside {
 
 aside table {
     border-collapse: collapse;
-    border: 0.5pt solid #808080;
+    border: var(--border-thickness) solid #808080;
     width: 65mm;
     margin-right: 10mm;
 }
 
 aside table thead:not(:first-child) tr {
-    border-top: 0.5pt solid #808080;
+    border-top: var(--border-thickness) solid #808080;
 }
 
 aside table thead tr {
@@ -143,7 +143,7 @@ main h1 {
 
 .main-wrapper .signatures > * {
     width: 50mm;
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
     padding-top: 1mm;
     text-align: center;
     font-size: 10pt;

Elwig/Documents/CreditNote.cshtml

@@ -10,13 +10,14 @@
         <colgroup>
             <col style="width: 25mm;"/>
             <col style="width:  5mm;"/>
-            <col style="width: 24mm;"/>
-            <col style="width: 16mm;"/>
+            <col style="width: 22mm;"/>
+            <col style="width: 15mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
             <col style="width: 12mm;"/>
-            <col style="width: 15mm;"/>
+            <col style="width: 13mm;"/>
+            <col style="width:  5mm;"/>
             <col style="width: 17mm;"/>
             <col style="width: 16mm;"/>
         </colgroup>
@@ -29,6 +30,7 @@
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
                 <th>Preis</th>
+                <th class="narrow">Rbl.</th>
                 <th class="narrow">Zu-/Abschläge</th>
                 <th>Betrag</th>
             </tr>
@@ -37,6 +39,7 @@
                 <th class="unit narrow">[°KMW]</th>
                 <th class="unit" colspan="2">[kg]</th>
                 <th class="unit">[@Model.CurrencySymbol/kg]</th>
+                <th class="narrow unit">[%]</th>
                 <th class="unit">[@Model.CurrencySymbol]</th>
                 <th class="unit">[@Model.CurrencySymbol]</th>
             </tr>
@@ -50,14 +53,17 @@
                             <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
-                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
+                            <td class="small">
+                                @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation
+                                @((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI" ? " / " : "")@Raw(p.QualId == "WEI" ? "<i>abgew.</i>" : "")
+                            </td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }
                         @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="2" class="small mod">@p.Modifiers[i - 1]</td>
+                            <td colspan="4" class="small mod">@p.Modifiers[i - 1]</td>
                         } else if (i > 0) {
-                            <td colspan="2"></td>
+                            <td colspan="4"></td>
                         }
                         @if (i < p.Buckets.Length) {
                             var bucket = p.Buckets[i];
@@ -65,10 +71,12 @@
                             <td class="number">@($"{bucket.Value:N0}")</td>
                             <td class="number">@($"{bucket.Price:N4}")</td>
                         } else {
-                            <td colspan="3"></td>
+                            <td></td>
                         }
                         @if (i == p.Buckets.Length - 1) {
+                            var rebelMod = p.WeighingModifier * 100;
                             var totalMod = p.TotalModifiers ?? 0;
+                            <td class="tiny center">@(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"))</td>
                             <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
                             <td class="number">@($"{p.Amount:N2}")</td>
                         } else {

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -11,13 +11,14 @@
             <col style="width: 25mm;"/>
             <col style="width:  5mm;"/>
             <col style="width: 24mm;"/>
+            <col style="width: 16mm;"/>
             <col style="width: 17mm;"/>
-            <col style="width: 19mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
             <col style="width: 12mm;"/>
             <col style="width: 14mm;"/>
+            <col style="width:  3mm;"/>
             <col style="width: 14mm;"/>
         </colgroup>
         <thead>
@@ -30,6 +31,14 @@
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
                 <th>Gewicht</th>
+                <th rowspan="3" style="padding: 0;">
+                    <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
+                        <text x="-40" y="5" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
+                              style="text-anchor: start; alignment-baseline: middle;">
+                            bto./nto.
+                        </text>
+                    </svg>
+                </th>
                 <th>Davon<br/>abzuwerten</th>
             </tr>
             <tr>
@@ -72,8 +81,10 @@
                         }
                         @if (i == p.Buckets.Length - 1) {
                             <td class="number">@($"{p.Weight:N0}")</td>
+                            <td class="small">@(p.IsNetWeight ? "n" : "b")</td>
                         } else {
                             <td></td>
+                            <td></td>
                         }
                         @if (first) {
                             <td rowspan="@rows" class="number"></td>
@@ -87,6 +98,7 @@
                 <td colspan="8">Gesamt:</td>
                 <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
                 <td></td>
+                <td></td>
             </tr>
         </tbody>
     </table>

Elwig/Documents/DeliveryJournal.cs

@@ -1,33 +1,21 @@
-using Elwig.Helpers;
-using Elwig.Models.Entities;
-using Microsoft.EntityFrameworkCore;
-using System;
+using Elwig.Models.Dtos;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryJournal : Document {
 
-        public string Filter;
-        public IEnumerable<DeliveryPart> Deliveries;
+        public new static string Name => "Lieferjournal";
 
-        public DeliveryJournal(string filter, IEnumerable<DeliveryPart> deliveries) : base($"Lieferjournal {filter}") {
+        public string Filter;
+        public IEnumerable<DeliveryJournalRow> Deliveries;
+
+        public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) : base($"{Name} {filter}") {
             Filter = filter;
             Deliveries = deliveries;
         }
 
-        public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
-            this(filter, deliveries
-                .Include(p => p.Delivery).ThenInclude(d => d.Member)
-                .Include(p => p.Variety)
-                .ToList()) { }
-
-        public DeliveryJournal(AppDbContext ctx, DateOnly date) :
-            this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts
-                .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd"))
-                .OrderBy(p => p.Delivery.DateString)
-                .ThenBy(p => p.Delivery.TimeString)
-                .ThenBy(p => p.Delivery.LsNr)
-                .ThenBy(p => p.DPNr)) { }
+        public DeliveryJournal(string filter, DeliveryJournalData data) :
+            this(filter, data.Rows) {
+        }
     }
 }

Elwig/Documents/DeliveryJournal.cshtml

@@ -25,7 +25,8 @@
                 <th rowspan="2" class="narrow">Pos.</th>
                 <th rowspan="2">Datum</th>
                 <th rowspan="2">Zeit</th>
-                <th colspan="2" rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2">MgNr.</th>
+                <th rowspan="2" style="text-align: left;">Mitglied</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
                 <th colspan="2">Gradation</th>
                 <th>Gewicht</th>
@@ -39,13 +40,13 @@
         <tbody>
             @foreach (var p in Model.Deliveries) {
                 <tr>
-                    <td>@p.Delivery.LsNr</td>
-                    <td>@p.DPNr</td>
-                    <td class="small">@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
-                    <td class="small">@($"{p.Delivery.Time:HH:mm}")</td>
-                    <td class="number">@p.Delivery.Member.MgNr</td>
-                    <td class="small">@p.Delivery.Member.AdministrativeName</td>
-                    <td class="small">@p.Variety.Name</td>
+                    <td>@p.LsNr</td>
+                    <td>@p.Pos</td>
+                    <td class="small">@($"{p.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{p.Time:HH:mm}")</td>
+                    <td class="number">@p.MgNr</td>
+                    <td class="small">@p.AdministrativeName</td>
+                    <td class="small">@p.Variety</td>
                     <td class="center">@($"{p.Oe:N0}")</td>
                     <td class="center">@($"{p.Kmw:N1}")</td>
                     <td class="number">@($"{p.Weight:N0}")</td>
@@ -57,7 +58,7 @@
                     var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
                 }
                 <td colspan="2">Gesamt:</td>
-                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.Delivery).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
+                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
                 <td class="center">@($"{oe:N0}")</td>
                 <td class="center">@($"{kmw:N1}")</td>
                 <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>

Elwig/Documents/DeliveryJournal.css

@@ -2,6 +2,7 @@
 h1 {
     text-align: center;
     font-size: 24pt;
+    margin-top: 10mm;
     margin-bottom: 2mm;
 }
 

Elwig/Documents/DeliveryNote.cs

@@ -5,6 +5,8 @@ using System.Collections.Generic;
 namespace Elwig.Documents {
     public class DeliveryNote : BusinessDocument {
 
+        public new static string Name => "Traubenübernahmeschein";
+
         public Delivery Delivery;
         public string? Text;
         public Dictionary<string, MemberBucket> MemberBuckets;
@@ -15,7 +17,7 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+        public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"{Name} Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Delivery = d;

Elwig/Documents/Document.Page.css

@@ -4,7 +4,7 @@
     width: 10mm;
     position: fixed;
     left: -25mm;
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
 }
 .m1.r, .m2.r, .m3.r {
     left: initial;

Elwig/Documents/Document.Table.css

@@ -11,7 +11,7 @@ main table.tiny {
 }
 
 main table.border {
-    border: 0.5pt solid black;
+    border: var(--border-thickness) solid black;
 }
 
 main table tr {
@@ -57,6 +57,9 @@ main table .small {
 main table .large {
     font-size: 12pt;
 }
+main table .tiny {
+    font-size: 6pt;
+}
 
 main table.number td,
 main table.number th {
@@ -110,7 +113,28 @@ main table tr.sectionheading th {
     font-weight: bold;
     text-align: center;
     font-size: 10pt;
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
+}
+
+main table tr.header {
+    border: var(--border-thickness) solid black;
+    background-color: #E0E0E0;
+}
+
+main table tr.header th {
+    font-weight: bold;
+    font-style: normal;
+    font-size: 16pt;
+    padding: 1mm 2mm;
+}
+
+main table tr.spacing td,
+main table tr.spacing th {
+    height: 5mm;
+}
+
+main table tr.spacing ~ tr.header {
+    break-before: avoid;
 }
 
 main table.number thead tr:first-child th:first-child {
@@ -125,7 +149,7 @@ main table tr.sum,
 main table td.sum,
 main table tr.new,
 main table tr.border {
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
 }
 
 main table th.unit {
@@ -141,13 +165,13 @@ main table th.narrow {
     padding-right: 0;
 }
 
-main table .lborder {border-left: 0.5pt solid black;}
-main table .rborder {border-right: 0.5pt solid black;}
+main table .lborder {border-left: var(--border-thickness) solid black;}
+main table .rborder {border-right: var(--border-thickness) solid black;}
 
 main table .fleft {
     float: left;
 }
 
 main tbody.sum tr:last-child {
-    border-bottom: 0.5pt solid black;
+    border-bottom: var(--border-thickness) solid black;
 }

Elwig/Documents/Document.cs

@@ -84,6 +84,10 @@ namespace Elwig.Documents {
                 name = "DeliveryConfirmation";
             } else if (this is MemberDataSheet) {
                 name = "MemberDataSheet";
+            } else if (this is MemberList) {
+                name = "MemberList";
+            } else if (this is WineQualityStatistics) {
+                name = "WineQualityStatistics";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -95,6 +99,8 @@ namespace Elwig.Documents {
         }
 
         public async Task Generate(IProgress<double>? progress = null) {
+            if (_pdfFile != null)
+                return;
             progress?.Report(0.0);
             if (this is PdfDocument) {
                 // nothing to do

Elwig/Documents/Document.css

@@ -2,6 +2,7 @@
 :root {
     font-family: "Times New Roman", serif;
     line-height: 1;
+    --border-thickness: 0.05pt;
 }
 
 * {
@@ -58,7 +59,7 @@ header .type {
     position: running(page-footer);
     width: 165mm;
     /* for some reason the position without the following statement changes on the second page */
-    border: 0.5pt solid #00000000;
+    border: var(--border-thickness) solid #00000000;
 }
 
 .footer-wrapper.left {
@@ -95,7 +96,7 @@ header .type {
 
 footer {
     font-size: 10pt;
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
     height: 25mm;
     padding-top: 1mm;
     text-align: center;
@@ -107,6 +108,6 @@ footer {
 
 hr {
     border: none;
-    border-top: 0.5pt solid black;
+    border-top: var(--border-thickness) solid black;
     margin: 5mm 0;
 }

Elwig/Documents/MemberDataSheet.cs

@@ -11,11 +11,13 @@ namespace Elwig.Documents {
 
         public Season Season;
         public Dictionary<string, MemberBucket> MemberBuckets;
+        public IEnumerable<AreaCom> ActiveAreaCommitments;
 
         public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
             DocumentId = $"{Name} {m.MgNr}";
             Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
             MemberBuckets = ctx.GetMemberBuckets(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult();
+            ActiveAreaCommitments = m.ActiveAreaCommitments(ctx);
         }
     }
 }

Elwig/Documents/MemberDataSheet.cshtml

@@ -149,7 +149,7 @@
     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false))
 
     @{
-        var areaComs = Model.Member.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
+        var areaComs = Model.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
             AreaComType = group.Key,
             AreaComs = group.OrderBy(c => c.Kg.AtKg.Name),
             Size = group.Sum(c => c.Area)
@@ -205,7 +205,7 @@
                 }
                 <tr class="sum bold">
                     <td colspan="3">Gesamt:</td>
-                    <td class="number">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</td>
+                    <td class="number">@($"{Model.ActiveAreaCommitments.Sum(a => a.Area):N0}")</td>
                     <td colspan="2"></td>
                 </tr>
             </tbody>

Elwig/Documents/MemberList.cs

@@ -0,0 +1,21 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class MemberList : Document {
+
+        public new static string Name => "Mitgliederliste";
+
+        public string Filter;
+        public IEnumerable<MemberListRow> Members;
+
+        public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
+            Filter = filter;
+            Members = members;
+        }
+
+        public MemberList(string filter, MemberListData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/MemberList.cshtml

@@ -0,0 +1,72 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.MemberList>
+@model Elwig.Documents.MemberList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberList.css"/>
+<main>
+    <h1>Mitgliederliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="members">
+        <colgroup>
+            <col style="width: 8mm;"/>
+            <col style="width: 42mm;"/>
+            <col style="width: 40mm;"/>
+            <col style="width:  8mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width:  5mm;" />
+            <col style="width: 18mm;"/>
+            <col style="width: 12mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2">Nr.</th>
+                <th rowspan="2" style="text-align: left;">Name</th>
+                <th rowspan="2" style="text-align: left;">Adresse</th>
+                <th rowspan="2">PLZ</th>
+                <th rowspan="2" style="text-align: left;">Ort</th>
+                <th rowspan="2">Betr.-Nr.</th>
+                <th rowspan="2">GA</th>
+                <th rowspan="2" style="text-align: left;">Stamm-KG</th>
+                <th>Geb. Fl.</th>
+            </tr>
+            <tr>
+                <th class="unit">[m²]</th>
+            </tr>
+        </thead>
+        <tbody class="small">
+            @{
+                string? lastBranch = Model.Members.Select(m => m.Branch).Distinct().Count() == 1 ? null : "";
+            }
+            @foreach (var m in Model.Members) {
+                if (lastBranch != null && m.Branch != lastBranch) {
+                    <tr class="spacing"><td colspan="9"></td></tr>
+                    <tr class="header">
+                        <th colspan="9">@m.Branch</th>
+                    </tr>
+                    lastBranch = m.Branch;
+                }
+                <tr>
+                    <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
+                    <td>@m.Name1.Replace('ß', 'ẞ').ToUpper() @m.Name2</td>
+                    <td>@m.Address</td>
+                    <td>@m.Plz</td>
+                    <td class="tiny">@m.Locality</td>
+                    <td>@m.LfbisNr</td>
+                    <td class="number">@m.BusinessShares</td>
+                    <td class="tiny">@m.DefaultKg</td>
+                    <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                </tr>
+                if (m.BillingName != null) {
+                    <tr>
+                        <td>@m.BillingName</td>
+                        <td>@m.BillingAddress</td>
+                        <td>@m.BillingPlz</td>
+                        <td class="tiny">@m.BillingLocality</td>
+                        <td colspan="4"></td>
+                    </tr>
+                }
+            }
+        </tbody>
+    </table>
+</main>

Elwig/Documents/MemberList.css

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

Elwig/Documents/WineQualityStatistics.cs

@@ -0,0 +1,26 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class WineQualityStatistics : Document {
+
+        public new static string Name => "Qualitätsstatistik";
+
+        public readonly string[][] QualIds = [["WEI"], ["RSW", "LDW"], ["QUW"], ["KAB"]];
+        public readonly Dictionary<string, string> QualityLevels = new() {
+            ["WEI"] = "Wein",
+            ["RSW"] = "Rebsortenwein",
+            ["LDW"] = "Landwein",
+            ["QUW"] = "Qualitätswein",
+            ["KAB"] = "Kabinett",
+        };
+
+        public string Filter;
+        public WineQualityStatisticsData Data;
+
+        public WineQualityStatistics(string filter, WineQualityStatisticsData data) : base($"{Name} {filter}") {
+            Filter = filter;
+            Data = data;
+        }
+    }
+}

Elwig/Documents/WineQualityStatistics.cshtml

@@ -0,0 +1,80 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
+@model Elwig.Documents.WineQualityStatistics
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\WineQualityStatistics.css"/>
+<main>
+    <h1>Qualitätsstatistik</h1>
+    <h2>@Model.Filter</h2>
+    @foreach (var sec in Model.Data.Sections) {
+        <table>
+            <colgroup>
+                <col style="width: 25%;"/>
+                <col style="width: 25%;"/>
+                <col style="width: 25%;"/>
+                <col style="width: 25%;"/>
+            </colgroup>
+            <thead>
+                <tr>
+                    <th colspan="4" class="header @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")">
+                        <h3>@sec.Name</h3>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    @foreach (var qualIds in Model.QualIds) {
+                        <td class="container">
+                            <div class="row">
+                                <span class="units">[°Oe]</span>
+                                <span class="units">[#]</span>
+                                <span class="units">[kg]</span>
+                            </div>
+                            @foreach (var qualId in qualIds) {
+                                <h4>@(Model.QualityLevels.GetValueOrDefault(qualId, qualId))</h4>
+                                @foreach (var (oe, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(int, int, int)>())) {
+                                    <div class="row">
+                                        <span class="oe">@oe</span>
+                                        <span class="number">@($"{num:N0}")</span>
+                                        <span class="number">@($"{weight:N0}")</span>
+                                    </div>
+                                }
+                            }
+                        </td>
+                    }
+                </tr>
+                <tr>
+                    @foreach (var qualIds in Model.QualIds) {
+                        var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(int Oe, int Num, int Weight)>()));
+                        var weight = quals.Sum(q => q.Sum(kv => kv.Weight));
+                        var num = quals.Sum(q => q.Sum(kv => kv.Num));
+                        var oe = quals.Sum(q => q.Sum(kv => (double)kv.Oe * kv.Weight)) / weight;
+                        <td class="container bold">
+                            <div class="row">
+                                <span class="oe">@(weight == 0 ? "-" : $"{oe:N0}")</span>
+                                <span class="number">@($"{num:N0}")</span>
+                                <span class="number">@($"{weight:N0}")</span>
+                            </div>
+                        </td>
+                    }
+                </tr>
+            </tbody>
+            <tfoot>
+                <tr>
+                    @{
+                        var totalWeight = sec.Data.Values.Sum(q => q.Sum(kv => kv.Weight));
+                        var totalNum = sec.Data.Values.Sum(q => q.Sum(kv => kv.Num));
+                        var totalOe = sec.Data.Values.Sum(q => q.Sum(kv => (double)kv.Oe * kv.Weight)) / totalWeight;
+                    }
+                    <td colspan="4" class="container bold footer @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")">
+                        <div class="row" style="width: 24%; margin-left: 76%;">
+                            <span class="oe">@(totalWeight == 0 ? "-" : $"{totalOe:N0}")</span>
+                            <span class="number">@($"{totalNum:N0}")</span>
+                            <span class="number">@($"{totalWeight:N0}")</span>
+                        </div>
+                    </td>
+                </tr>
+            </tfoot>
+        </table>
+    }
+</main>

Elwig/Documents/WineQualityStatistics.css

@@ -0,0 +1,97 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-top: 10mm;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}
+
+h3 {
+    font-weight: bold;
+    font-style: normal;
+    font-size: 14pt;
+    margin: 0;
+    text-align: left;
+}
+
+h4 {
+    font-weight: bold;
+    font-style: italic;
+    font-size: 10pt;
+    margin: 0;
+    text-align: center;
+    margin: 2mm 0 2mm 0;
+}
+
+.row:first-child { margin-top: 0.5mm; }
+.row:last-child { margin-bottom: 0.5mm; }
+
+.bold {
+    font-weight: bold;
+}
+
+table {
+    margin-top: 10mm;
+    break-inside: avoid;
+}
+
+table th,
+table td {
+    border: var(--border-thickness) solid black;
+    vertical-align: top !important;
+}
+
+table .header {
+    padding: 1mm 2mm;
+}
+
+table .header,
+table .footer {
+    background-color: #E0E0E0;
+}
+
+table .header.red,
+table .footer.red {
+    background-color: #FFC0C0;
+}
+
+table .header.green,
+table .footer.green {
+    background-color: #C0FFC0;
+}
+
+.row {
+    display: flex;
+    width: 100%;
+    font-size: 10pt;
+}
+
+.row span {
+    flex: 10mm 1 1;
+    display: block;
+    padding: 0 1mm;
+}
+
+.row .units {
+    text-align: center;
+    font-size: 8pt;
+    font-style: italic;
+    padding: 1mm;
+}
+
+.oe {
+    text-align: center;
+}
+
+.number {
+    text-align: right;
+}
+
+.row span:first-child { flex-basis: 7.5mm; }
+.row span:last-child { flex-basis: 17.5mm; }

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.7.0</Version>
+    <Version>0.7.2</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Elwig/Helpers/ActionCommand.cs

@@ -4,18 +4,18 @@ using System.Windows.Input;
 namespace Elwig.Helpers {
     public class ActionCommand : ICommand {
 
-        public event EventHandler CanExecuteChanged;
+        public event EventHandler? CanExecuteChanged;
         private readonly Action Action;
 
         public ActionCommand(Action action) {
             Action = action;
         }
 
-        public void Execute(object parameter) {
+        public void Execute(object? parameter) {
             Action();
         }
 
-        public bool CanExecute(object parameter) {
+        public bool CanExecute(object? parameter) {
             return true;
         }
     }

Elwig/Helpers/AppDbContext.cs

@@ -46,6 +46,7 @@ namespace Elwig.Helpers {
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
+        public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
         public DbSet<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
@@ -55,6 +56,7 @@ namespace Elwig.Helpers {
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
+        public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
@@ -183,7 +185,7 @@ namespace Elwig.Helpers {
         public async Task<int> NextMgNr() {
             int c = 0;
             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 1000) c = a; });
+                .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
@@ -234,20 +236,21 @@ namespace Elwig.Helpers {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
                 .OrderBy(q => q.MinKmw)
-                .LastOrDefaultAsync();
+                .LastAsync();
         }
 
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
                 if (modifiers.Contains(m)) {
-                    DeliveryPartModifier dpm = mod ?? this.CreateProxy<DeliveryPartModifier>();
-                    dpm.Year = part.Year;
-                    dpm.DId = part.DId;
-                    dpm.DPNr = part.DPNr;
-                    dpm.ModId = m.ModId;
+                    var dpm = new DeliveryPartModifier {
+                        Year = part.Year,
+                        DId = part.DId,
+                        DPNr = part.DPNr,
+                        ModId = m.ModId,
+                    };
                     if (mod == null) {
-                        await AddAsync(dpm);
+                        Add(dpm);
                     } else {
                         Update(dpm);
                     }

Elwig/Helpers/Billing/Billing.cs

@@ -1,5 +1,6 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +10,6 @@ namespace Elwig.Helpers.Billing {
     public class Billing {
 
         protected readonly int Year;
-        protected readonly AppDbContext Context;
         protected readonly Season Season;
         protected readonly Dictionary<string, string> Attributes;
         protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
@@ -17,11 +17,11 @@ namespace Elwig.Helpers.Billing {
 
         public Billing(int year) {
             Year = year;
-            Context = new AppDbContext();
-            Season = Context.Seasons.Find(Year)!;
-            Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
-            Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
-            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
+            using var ctx = new AppDbContext();
+            Season = ctx.Seasons.Find(Year)!;
+            Attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
+            Modifiers = ctx.Modifiers.Where(m => m.Year == Year).Include(m => m.Season).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
+            AreaComTypes = ctx.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
         }
 
         public async Task FinishSeason() {
@@ -51,14 +51,15 @@ namespace Elwig.Helpers.Billing {
             bool? avoidUnderDeliveries = null,
             SqliteConnection? cnx = null
          ) {
+            using var ctx = new AppDbContext();
             var honorGebunden = honorGebundenField ?? Season.Billing_HonorGebunden;
             var allowAttrsIntoLower = allowAttributesIntoLower ?? Season.Billing_AllowAttrsIntoLower;
             var avoidUnderDlvrs = avoidUnderDeliveries ?? Season.Billing_AvoidUnderDeliveries;
-            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
+            var attrVals = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
             var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
             var ownCnx = cnx == null;
             cnx ??= await AppDbContext.ConnectAsync();
-            await Context.GetMemberAreaCommitmentBuckets(Year, 0, cnx);
+            await ctx.GetMemberAreaCommitmentBuckets(Year, 0, cnx);
             var inserts = new List<(int, int, int, string, int)>();
 
             var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>();
@@ -87,7 +88,7 @@ namespace Elwig.Helpers.Billing {
             Dictionary<string, int> used = [];
             foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
                 if (lastMgNr != mgnr) {
-                    rightsAndObligations = await Context.GetMemberAreaCommitmentBuckets(Year, mgnr);
+                    rightsAndObligations = await ctx.GetMemberAreaCommitmentBuckets(Year, mgnr);
                     used = [];
                 }
                 if ((honorGebunden && gebunden == false) ||

Elwig/Helpers/Billing/BillingData.cs

@@ -42,6 +42,15 @@ namespace Elwig.Helpers.Billing {
             set => SetConsider(value, "consider_auto_business_shares");
         }
 
+        public double NetWeightModifier {
+            get => GetWeightModifier("net_weight_modifier", "Rebelzuschlag");
+            set => SetWeightModifier(value, "net_weight_modifier", "Rebelzuschlag");
+        }
+        public double GrossWeightModifier {
+            get => GetWeightModifier("gross_weight_modifier");
+            set => SetWeightModifier(value, "gross_weight_modifier");
+        }
+
         private bool GetConsider(string name, string? wgMasterName = null) {
             return ((Mode == CalculationMode.Elwig) ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<bool>() ?? false;
         }
@@ -56,6 +65,23 @@ namespace Elwig.Helpers.Billing {
             }
         }
 
+        private double GetWeightModifier(string name, string? wgMasterName = null) {
+            var isElwig = (Mode == CalculationMode.Elwig);
+            var val = (isElwig ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<double>() ?? 0;
+            return isElwig ? val : val / 100.0;
+        }
+
+        private void SetWeightModifier(double value, string name, string? wgMasterName = null) {
+            var isElwig = (Mode == CalculationMode.Elwig);
+            if (Mode == CalculationMode.WgMaster && wgMasterName == null) {
+                return;
+            } else if (value != 0) {
+                Data[isElwig ? name : wgMasterName ?? ""] = isElwig ? value : value * 100.0;
+            } else {
+                Data.Remove(isElwig ? name : wgMasterName ?? "");
+            }
+        }
+
         public BillingData(JsonObject data) {
             Data = data;
             var mode = Data["mode"]?.GetValue<string>();
@@ -252,11 +278,11 @@ namespace Elwig.Helpers.Billing {
             return curve;
         }
 
-        protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
+        protected static (Dictionary<string, List<string>>, Dictionary<decimal, List<string>>) GetReverseKeys(JsonObject data, bool strict = true) {
             Dictionary<string, List<string>> rev1 = [];
             Dictionary<decimal, List<string>> rev2 = [];
             foreach (var (k, v) in data) {
-                if (k == "default" || k.StartsWith('/') || !k.Contains('/') || v is not JsonValue val) {
+                if (k == "default" || (strict && (k.StartsWith('/') || !k.Contains('/'))) || v is not JsonValue val) {
                     continue;
                 } else if (val.TryGetValue<decimal>(out var dec)) {
                     rev2[dec] = rev2.GetValueOrDefault(dec) ?? [];
@@ -266,6 +292,11 @@ namespace Elwig.Helpers.Billing {
                     rev1[cur].Add(k);
                 }
             }
+            return (rev1, rev2);
+        }
+
+        protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
+            var (rev1, rev2) = GetReverseKeys(data);
             if (!data.ContainsKey("default")) {
                 foreach (var (v, ks) in rev1) {
                     if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
@@ -322,6 +353,32 @@ namespace Elwig.Helpers.Billing {
                     data.Add(k.Replace("/-", "-"), val);
                 }
             }
+
+            (rev1, rev2) = GetReverseKeys(data, false);
+            var keyVaributes = data
+                .Select(e => e.Key.Split('-')[0])
+                .Where(e => e.Length > 0 && e != "default")
+                .Distinct()
+                .ToList();
+            foreach (var idx in keyVaributes) {
+                var len = data.Count(e => e.Key == idx || (e.Key.Length > idx.Length && e.Key.StartsWith(idx) && e.Key[idx.Length] == '-'));
+                foreach (var (v, ks) in rev1) {
+                    var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
+                    if (myKs.Count == len) {
+                        foreach (var k in myKs) {
+                            if (k != idx) data.Remove(k);
+                        }
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
+                    if (myKs.Count == len) {
+                        foreach (var k in myKs) {
+                            if (k != idx) data.Remove(k);
+                        }
+                    }
+                }
+            }
         }
 
         public static JsonObject FromGraphEntries(

Elwig/Helpers/Billing/BillingVariant.cs

@@ -1,5 +1,6 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,8 +15,9 @@ namespace Elwig.Helpers.Billing {
 
         public BillingVariant(int year, int avnr) : base(year) {
             AvNr = avnr;
-            PaymentVariant = Context.PaymentVariants.Find(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
-            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false));
+            using var ctx = new AppDbContext();
+            PaymentVariant = ctx.PaymentVariants.Include(v => v.Season).Where(v => v.Year == Year && v.AvNr == AvNr).Single() ?? throw new ArgumentException("PaymentVar not found");
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
         }
 
         public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
@@ -146,6 +148,8 @@ namespace Elwig.Helpers.Billing {
 
             var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
             foreach (var part in parts) {
+                if (part.Value == 0)
+                    continue;
                 var ungeb = part.Discr == "_";
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
                 var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
@@ -162,7 +166,16 @@ namespace Elwig.Helpers.Billing {
         }
 
         protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {
+            var netMod = Data.NetWeightModifier.ToString().Replace(',', '.');
+            var grossMod = Data.GrossWeightModifier.ToString().Replace(',', '.');
             await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, 0, IIF(d.net_weight, {netMod}, {grossMod})
+                FROM delivery_part d
+                WHERE d.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_rel = mod_rel + excluded.mod_rel;
+
                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
                 SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
                 FROM delivery_part d
@@ -171,7 +184,7 @@ namespace Elwig.Helpers.Billing {
                 WHERE d.year = {Year}
                 ON CONFLICT DO UPDATE
                 SET mod_abs = mod_abs + excluded.mod_abs,
-                    mod_rel = mod_rel + excluded.mod_rel
+                    mod_rel = mod_rel + excluded.mod_rel;
                 """);
         }
     }

Elwig/Helpers/Billing/Varibute.cs

@@ -1,4 +1,5 @@
 using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 
@@ -45,6 +46,7 @@ namespace Elwig.Helpers.Billing {
         }
     }
 
+    [PrimaryKey("Listing")]
     public class Varibute : IComparable<Varibute> {
 
         public WineVar? Variety { get; }

Elwig/Helpers/ClientParameters.cs

@@ -57,6 +57,7 @@ namespace Elwig.Helpers {
         public string? Website;
 
         public int ModeDeliveryNoteStats;
+        public int OrderingMemberList;
 
         public string? TextDeliveryNote;
         public string? TextDeliveryConfirmation;
@@ -102,6 +103,11 @@ namespace Elwig.Helpers {
                     case "SHORT": ModeDeliveryNoteStats = 2; break;
                     case "FULL": ModeDeliveryNoteStats = 3; break;
                 }
+                switch (parameters.GetValueOrDefault("ORDERING_MEMBERLIST", "")?.ToUpper()) {
+                    case "MGNR": OrderingMemberList = 0; break;
+                    case "NAME": OrderingMemberList = 1; break;
+                    case "KG": OrderingMemberList = 2; break;
+                }
 
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
@@ -127,6 +133,12 @@ namespace Elwig.Helpers {
                 case 2: deliveryNoteStats = "SHORT"; break;
                 case 3: deliveryNoteStats = "FULL"; break;
             }
+            string orderingMemberList = "MGNR";
+            switch (OrderingMemberList) {
+                case 0: orderingMemberList = "MGNR"; break;
+                case 1: orderingMemberList = "NAME"; break;
+                case 2: orderingMemberList = "KG"; break;
+            }
             return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -145,6 +157,7 @@ namespace Elwig.Helpers {
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
+                ("ORDERING_MEMBERLIST", orderingMemberList),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
@@ -171,7 +184,6 @@ namespace Elwig.Helpers {
             }
 
             await cmd.ExecuteNonQueryAsync();
-            await App.HintContextChange();
         }
     }
 }

Elwig/Helpers/ControlUtils.cs

@@ -84,13 +84,13 @@ namespace Elwig.Helpers {
             return null;
         }
 
-        public static void RenewItemsSource(Selector selector, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
+        public static void RenewItemsSource(Selector selector, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
             if (selector.ItemsSource == source)
                 return;
-            var selectedId = getId(selector.SelectedItem);
+            var selectedId = Utils.GetEntityIdentifier(selector.SelectedItem);
             object? selItem = null;
-            if (selectedId != null && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (selectedId != 0 && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
             if (source != null && selItem == null) {
                 if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
                     selItem = source.Cast<object>().First();
@@ -102,28 +102,30 @@ namespace Elwig.Helpers {
             selector.SelectedItem = selItem;
         }
 
-        public static void RenewItemsSource(Xceed.Wpf.Toolkit.Primitives.Selector selector, IEnumerable? source, Func<object?, object?> getId) {
+        public static void RenewItemsSource(Xceed.Wpf.Toolkit.Primitives.Selector selector, IEnumerable? source, Xceed.Wpf.Toolkit.Primitives.ItemSelectionChangedEventHandler? handler = null) {
             if (selector.ItemsSource == source)
                 return;
-            var selectedIds = selector.SelectedItems.Cast<object>().Select(i => getId(i)).ToList();
+            var selectedIds = selector.SelectedItems.Cast<object>().Select(i => Utils.GetEntityIdentifier(i)).ToList();
+            if (handler != null && selectedIds != null) selector.ItemSelectionChanged -= handler;
             selector.ItemsSource = source;
             if (source != null) {
                 selector.SelectedItems.Clear();
-                foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(getId(i))))
+                foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i))))
                     selector.SelectedItems.Add(i);
             }
+            if (handler != null && selectedIds != null) selector.ItemSelectionChanged += handler;
         }
 
-        public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
+        public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
             if (dataGrid.ItemsSource == source)
                 return;
             var column = dataGrid.CurrentCell.Column;
             var sortColumns = dataGrid.Columns.Select(c => c.SortDirection).ToList();
             var sort = dataGrid.Items.SortDescriptions.ToList();
-            var selectedId = getId(dataGrid.SelectedItem);
+            var selectedId = Utils.GetEntityIdentifier(dataGrid.SelectedItem);
             object? selItem = null;
-            if (selectedId != null && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (selectedId != 0 && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
             if (source != null && selItem == null) {
                 if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
                     selItem = source.Cast<object>().First();
@@ -143,13 +145,13 @@ namespace Elwig.Helpers {
                 dataGrid.CurrentCell = new(dataGrid.SelectedItem, column);
         }
 
-        public static void RenewItemsSource(ListBox listBox, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
+        public static void RenewItemsSource(ListBox listBox, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
             if (listBox.ItemsSource == source)
                 return;
-            var selectedId = getId(listBox.SelectedItem);
+            var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
             object? selItem = null;
-            if (selectedId != null && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (selectedId != 0 && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
             if (source != null && selItem == null) {
                 if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
                     selItem = source.Cast<object>().FirstOrDefault();
@@ -161,71 +163,75 @@ namespace Elwig.Helpers {
             listBox.SelectedItem = selItem;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, Func<object?, object?> getId, object? id) {
+        public static object? GetItemFromSource(IEnumerable source, int? hash) {
             if (source == null)
                 return null;
             var items = source.Cast<object>();
-            var item = items.Where(i => getId(i)?.Equals(id) ?? false).FirstOrDefault();
+            var item = items.Where(i => Utils.GetEntityIdentifier(i) == hash).FirstOrDefault();
             if (item == null && items.Any(i => i is NullItem))
                 return items.Where(i => i is NullItem).First();
             return item;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, object? item, Func<object?, object?> getId) {
-            return GetItemFromSource(source, getId, getId(item));
+        public static object? GetItemFromSource(IEnumerable source, object? item) {
+            return GetItemFromSource(source, Utils.GetEntityIdentifier(item));
         }
 
-        public static void SelectComboBoxItem(ComboBox cb, Func<object?, object?> getId, object? id) {
-            cb.SelectedItem = GetItemFromSource(cb.ItemsSource, getId, id);
+        public static void SelectItemWithHash(Selector input, int? hash) {
+            if (hash == null) {
+                input.SelectedItem = null;
+            } else {
+                input.SelectedItem = GetItemFromSource(input.ItemsSource, (int)hash);
+            }
+            if (input is ListBox lb && lb.SelectedItem is object lbItem) {
+                lb.ScrollIntoView(lbItem);
+            } else if (input is DataGrid dg && dg.SelectedItem is object dgItem) {
+                dg.ScrollIntoView(dgItem);
+            }
         }
 
-        public static void SelectComboBoxItem(ComboBox cb, object? item, Func<object?, object?> getId) {
-            SelectComboBoxItem(cb, getId, getId(item));
+        public static void SelectItemWithPk(Selector input, params object?[] pk) {
+            SelectItemWithHash(input, Utils.GetEntityIdentifier(pk));
         }
 
-        public static void SelectListBoxItem(ListBox lb, Func<object?, object?> getId, object? id) {
-            lb.SelectedItem = GetItemFromSource(lb.ItemsSource, getId, id);
-            lb.ScrollIntoView(lb.SelectedItem);
+        public static void SelectItem(Selector input, object? item) {
+            SelectItemWithHash(input, Utils.GetEntityIdentifier(item));
         }
 
-        public static void SelectListBoxItem(ListBox lb, object? item, Func<object?, object?> getId) {
-            SelectListBoxItem(lb, getId, getId(item));
-        }
-
-        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, Func<object?, object?> getId, IEnumerable<object?> ids) {
+        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<int?> ids) {
             if (source == null)
-                return Array.Empty<object>();
-            return source.Cast<object>().Where(i => ids.Any(c => c?.Equals(getId(i)) ?? false));
+                return [];
+            return source.Cast<object>().Where(i => ids.Any(c => c == Utils.GetEntityIdentifier(i)));
         }
 
-        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<object?>? items, Func<object?, object?> getId) {
+        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<object?>? items) {
             if (items == null)
-                return Array.Empty<object>();
-            return GetItemsFromSource(source, getId, items.Select(i => getId(i)));
+                return [];
+            return GetItemsFromSource(source, items.Select(Utils.GetEntityIdentifier));
         }
 
-        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, Func<object?, object?> getId, IEnumerable<object?>? ids) {
+        public static void SelectItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<int?>? ids) {
             ccb.SelectedItems.Clear();
             if (ids == null) return;
             foreach (var id in ids)
-                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, getId, id));
+                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, id));
         }
 
-        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items, Func<object?, object?> getId) {
-            SelectCheckComboBoxItems(ccb, getId, items?.Select(i => getId(i)));
+        public static void SelectItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items) {
+            SelectItems(ccb, items?.Select(Utils.GetEntityIdentifier));
         }
 
-        public static object? GetInputValue(Control input) {
+        public static int? GetInputHashCode(Control input) {
             if (input is TextBox tb) {
-                return tb.Text;
+                return Utils.GetEntityIdentifier(tb.Text);
             } else if (input is ComboBox sb) {
-                return sb.SelectedItem;
+                return Utils.GetEntityIdentifier(sb.SelectedItem);
             } else if (input is Xceed.Wpf.Toolkit.CheckComboBox ccb) {
-                return ccb.SelectedItems.Cast<object>().ToArray();
+                return Utils.GetEntityIdentifier(ccb.SelectedItems);
             } else if (input is CheckBox cb) {
-                return cb.IsChecked?.ToString();
+                return Utils.GetEntityIdentifier(cb.IsChecked);
             } else if (input is RadioButton rb) {
-                return rb.IsChecked?.ToString();
+                return Utils.GetEntityIdentifier(rb.IsChecked);
             } else {
                 return null;
             }

Elwig/Helpers/Export/Ods.cs

@@ -20,7 +20,7 @@ namespace Elwig.Helpers.Export {
             FileName = filename;
             File.Delete(filename);
             ZipArchive = ZipFile.Open(FileName, ZipArchiveMode.Create);
-            _tables = new();
+            _tables = [];
         }
 
         public void Dispose() {
@@ -101,7 +101,12 @@ namespace Elwig.Helpers.Export {
                   <style:style style:name="header" style:family="table-cell" style:parent-style-name="default">
                    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
                    <style:paragraph-properties fo:text-align="center"/>
-                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"  fo:font-size="16pt"/>
+                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" fo:font-size="16pt"/>
+                  </style:style>
+                  <style:style style:name="subheader" style:family="table-cell" style:parent-style-name="default">
+                   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
+                   <style:paragraph-properties fo:text-align="center"/>
+                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
                   </style:style>
                   <style:style style:name="th" style:family="table-cell" style:parent-style-name="default">
                    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" style:vertical-align="middle"/>
@@ -122,6 +127,18 @@ namespace Elwig.Helpers.Export {
                   <style:style style:name="N5" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN5"/>
                   <number:number-style style:name="NN6"><number:number number:decimal-places="6" number:min-decimal-places="6" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
                   <style:style style:name="N6" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN6"/>
+                  <number:date-style style:name="_date"><number:day number:style="long"/><number:text>.</number:text><number:month number:style="long"/><number:text>.</number:text><number:year number:style="long"/></number:date-style>
+                  <style:style style:name="date" style:family="table-cell" style:parent-style-name="default" style:data-style-name="_date"/>
+                  <number:time-style style:name="_time"><number:hours number:style="long"/><number:text>:</number:text><number:minutes number:style="long"/><number:text>:</number:text><number:seconds number:style="long"/></number:time-style>
+                  <style:style style:name="time" style:family="table-cell" style:parent-style-name="default" style:data-style-name="_time"/>
+                  <number:date-style style:name="_datetime">
+                   <number:day number:style="long"/><number:text>.</number:text><number:month number:style="long"/><number:text>.</number:text><number:year number:style="long"/>
+                   <number:text> </number:text>
+                   <number:hours number:style="long"/><number:text>:</number:text><number:minutes number:style="long"/><number:text>:</number:text><number:seconds number:style="long"/>
+                  </number:date-style>
+                  <style:style style:name="datetime" style:family="table-cell" style:parent-style-name="default" style:data-style-name="_datetime"/>
+                  <number:boolean-style style:name="_boolean"><number:boolean/></number:boolean-style>
+                  <style:style style:name="boolean" style:family="table-cell" style:parent-style-name="default" style:data-style-name="_boolean"/>
                  </office:automatic-styles>
                  <office:body>
                   <office:spreadsheet>
@@ -161,8 +178,8 @@ namespace Elwig.Helpers.Export {
                     await writer.WriteAsync($"""
                               <config:config-item-map-entry config:name="{tbl}">
                                <config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
-                               <config:config-item config:name="VerticalSplitPosition" config:type="int">4</config:config-item>
-                               <config:config-item config:name="PositionBottom" config:type="int">4</config:config-item>
+                               <config:config-item config:name="VerticalSplitPosition" config:type="int">5</config:config-item>
+                               <config:config-item config:name="PositionBottom" config:type="int">5</config:config-item>
                               </config:config-item-map-entry>
 
                         """);
@@ -198,6 +215,9 @@ namespace Elwig.Helpers.Export {
                 FormatCell(table.FullName, colSpan: totalSpan, style: "header") +
                 $"     </table:table-row>\r\n" +
                 $"     <table:table-row>\r\n" +
+                FormatCell(table.Subtitle, colSpan: totalSpan, style: "subheader") +
+                $"     </table:table-row>\r\n" +
+                $"     <table:table-row>\r\n" +
                 $"      <table:table-cell table:number-columns-repeated=\"{totalSpan}\"/>\r\n" +
                 $"     </table:table-row>\r\n" +
                 $"     <table:table-row>\r\n");
@@ -251,8 +271,8 @@ namespace Elwig.Helpers.Export {
 
         protected static string FormatCell(object? data, int rowSpan = 1, int colSpan = 1, string? style = "default", bool isCovered = false, string?[]? units = null) {
             if (data?.GetType().IsValueType == true && data.GetType().Name.StartsWith("ValueTuple"))
-                return string.Join("", data.GetType().GetFields().Zip(units ?? Array.Empty<string?>())
-                    .Select(p => FormatCell(p.First.GetValue(data), rowSpan, colSpan, style, isCovered, new[] { p.Second }))
+                return string.Join("", data.GetType().GetFields().Zip(units ?? [])
+                    .Select(p => FormatCell(p.First.GetValue(data), rowSpan, colSpan, style, isCovered, [p.Second]))
                 );
 
             var add = (style != null ? $" table:style-name=\"{style}\"" : "") + (rowSpan > 1 || colSpan > 1 ? $" table:number-rows-spanned=\"{rowSpan}\" table:number-columns-spanned=\"{colSpan}\"" : "");
@@ -262,6 +282,18 @@ namespace Elwig.Helpers.Export {
             string c;
             if (data == null) {
                 c = $"<{ct}{add}/>";
+            } else if (data is bool b) {
+                add = string.Join(' ', add.Split(' ').Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"boolean\"" : p));
+                c = $"<{ct} office:value-type=\"boolean\" calcext:value-type=\"boolean\" office:boolean-value=\"{(b ? "true" : "false")}\"{add}><text:p>{(b ? "Ja" : "Nein")}</text:p></{ct}>";
+            } else if (data is DateOnly date) {
+                add = string.Join(' ', add.Split(' ').Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"date\"" : p));
+                c = $"<{ct} office:value-type=\"date\" calcext:value-type=\"date\" office:date-value=\"{date:yyyy-MM-dd}\"{add}><text:p>{date:dd.MM.yyyy}</text:p></{ct}>";
+            } else if (data is TimeOnly time) {
+                add = string.Join(' ', add.Split(' ').Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"time\"" : p));
+                c = $"<{ct} office:value-type=\"time\" calcext:value-type=\"time\" office:time-value=\"{time:\\P\\THH\\Hmm\\Mss\\S}\"{add}><text:p>{time:HH:mm:ss}</text:p></{ct}>";
+            } else if (data is DateTime dt) {
+                add = string.Join(' ', add.Split(' ').Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"datetime\"" : p));
+                c = $"<{ct} office:value-type=\"date\" calcext:value-type=\"date\" office:date-value=\"{dt:yyyy-MM-dd\\THH:mm:ss}\"{add}><text:p>{dt:dd.MM.yyyy HH:mm:ss}</text:p></{ct}>";
             } else if (data is decimal || data is float || data is double || data is byte || data is char ||
                        data is short || data is ushort || data is int || data is uint || data is long || data is ulong) {
                 double v = double.Parse(data?.ToString() ?? "0");  // use default culture for ToString and Parse()!
@@ -272,8 +304,9 @@ namespace Elwig.Helpers.Export {
                         case "€": n = 2; data = $"{v:N2}"; break;
                         case "°KMW": n = 1; data = $"{v:N1}"; break;
                         case "°Oe": n = 0; data = $"{v:N0}"; break;
+                        case "m²": n = 0; data = $"{v:N0}"; break;
                     }
-                    if (n >= 0) add = string.Join(" ", add.Split(" ").Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"N{n}\"" : p));
+                    if (n >= 0) add = string.Join(' ', add.Split(' ').Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"N{n}\"" : p));
                 }
                 c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
             } else {

Elwig/Helpers/ExportMode.cs

@@ -0,0 +1,5 @@
+namespace Elwig.Helpers {
+    public enum ExportMode {
+        Show, SaveList, SavePdf, Print, Email
+    }
+}

Elwig/Helpers/Utils.cs

@@ -18,7 +18,16 @@ using System.Text.Json.Nodes;
 using System.IO;
 using MailKit.Net.Smtp;
 using MailKit.Security;
-using OpenTK.Compute.OpenCL;
+using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+using System.Collections;
+using Elwig.Documents;
+using MimeKit;
+using System.Windows.Input;
+using LinqKit;
+using System.Linq.Expressions;
+using Elwig.Models;
+using Microsoft.Win32;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -28,6 +37,7 @@ namespace Elwig.Helpers {
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
+        public static int FollowingSeason => DateTime.Now.Year + (DateTime.Now.Month >= 11 ? 1 : 0);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
         [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
@@ -318,7 +328,7 @@ namespace Elwig.Helpers {
                 > 0 => "+",
             };
 
-        public static double AggregateDeliveryPartsKmw(IEnumerable<DeliveryPart> parts)
+        public static double AggregateDeliveryPartsKmw(IEnumerable<IDelivery> parts)
             => parts.Aggregate(
                 (Weight: 0, Kmw: 0.0),
                 (sum, item) => (
@@ -404,9 +414,11 @@ namespace Elwig.Helpers {
                 using var client = new HttpClient() {
                     Timeout = TimeSpan.FromSeconds(5),
                 };
+                client.DefaultRequestHeaders.Accept.Clear();
+                client.DefaultRequestHeaders.Accept.Add(new("application/json"));
                 var res = JsonNode.Parse(await client.GetStringAsync(url));
                 var data = res!["data"]![0]!;
-                return ((string)data["version"]!, (string)data["url"]!, (int)data["size"]!);
+                return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
             } catch {
                 return null;
             }
@@ -432,5 +444,93 @@ namespace Elwig.Helpers {
             await client.AuthenticateAsync(username, password);
             return client;
         }
+
+        public static async Task<bool> SendEmail(Member member, string subject, string text, IEnumerable<Document> docs) {
+            if (App.Config.Smtp == null)
+                return false;
+
+            SmtpClient? client = null;
+            try {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await GetSmtpClient();
+
+                using var msg = new MimeMessage();
+                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                msg.Subject = subject;
+                var body = new Multipart("mixed") {
+                    new TextPart("plain") { Text = text }
+                };
+                foreach (var doc in docs) {
+                    var name = NormalizeFileName(doc.Title);
+                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                }
+                msg.Body = body;
+                await client!.SendAsync(msg);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            } finally {
+                if (client != null)
+                    await client.DisconnectAsync(true);
+                client?.Dispose();
+                Mouse.OverrideCursor = null;
+            }
+            return true;
+        }
+
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
+            if (mode == ExportMode.Print && !App.Config.Debug) {
+                await doc.Generate();
+                await doc.Print();
+            } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
+                await doc.Generate();
+                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
+                if (success)
+                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+            } else if (mode == ExportMode.SavePdf) {
+                var d = new SaveFileDialog() {
+                    FileName = $"{NormalizeFileName(filename ?? doc.Title)}.pdf",
+                    DefaultExt = "pdf",
+                    Filter = "PDF-Datei (*.pdf)|*.pdf",
+                    Title = $"{doc.Title} speichern unter - Elwig"
+                };
+                if (d.ShowDialog() == true) {
+                    await doc.Generate();
+                    doc.SaveTo(d.FileName);
+                    Process.Start("explorer.exe", d.FileName);
+                }
+            } else {
+                await doc.Generate();
+                doc.Show();
+            }
+        }
+
+        public static int? GetEntityIdentifier(object? obj) {
+            if (obj == null) {
+                return null;
+            } else if (obj is IEnumerable list && obj is not string) {
+                var arr = list.Cast<object>().Select(GetEntityIdentifier).ToArray();
+                return ((IStructuralEquatable)arr).GetHashCode(EqualityComparer<int?>.Default);
+            } else if (obj.GetType().GetCustomAttribute(typeof(PrimaryKeyAttribute), true) is PrimaryKeyAttribute pkAttr) {
+                var pk = pkAttr.PropertyNames.Select(name => obj.GetType().GetProperty(name)!.GetValue(obj)?.GetHashCode() ?? 0).ToArray();
+                return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
+            } else {
+                return obj.GetHashCode();
+            }
+        }
+
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int yearTo) =>
+            c => (c.YearFrom <= yearTo) && (c.YearTo == null || c.YearTo >= yearTo);
+
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int yearTo) =>
+            query.Where(ActiveAreaCommitments(yearTo));
+
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int yearTo) =>
+            query.Where(c => ActiveAreaCommitments(yearTo).Invoke(c));
     }
 }

Elwig/Helpers/Validator.cs

@@ -88,7 +88,9 @@ namespace Elwig.Helpers {
             input.Text = text;
             input.CaretIndex = pos;
 
-            if (text.Length == 0) {
+            if (text == "-") {
+                return new(false, "Ungültige Kommazahl");
+            } else if (text.Length == 0) {
                 return required ? new(false, "Wert ist nicht optional") : new(true, null);
             } else if (v2 == 0) {
                 return new(false, "Ungültige Kommazahl");
@@ -126,13 +128,14 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckPlz(TextBox input, bool required, AppDbContext ctx) {
+        public static ValidationResult CheckPlz(TextBox input, bool required) {
             CheckInteger(input, false, 4);
             if (!required && input.Text.Length == 0) {
                 return new(true, null);
             } else if (input.Text.Length != 4) {
                 return new(false, "PLZ zu kurz");
             }
+            using var ctx = new AppDbContext();
             int plz = int.Parse(input.Text);
             if (ctx.Postleitzahlen.Find(plz) == null) {
                 return new(false, "Ungültige PLZ");
@@ -411,7 +414,7 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static ValidationResult CheckMgNr(TextBox input, bool required, AppDbContext ctx) {
+        public static ValidationResult CheckMgNr(TextBox input, bool required) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;
@@ -419,6 +422,7 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
+            using var ctx = new AppDbContext();
             int nr = int.Parse(input.Text);
             if (!ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Ungültige Mitgliedsnummer");
@@ -427,7 +431,7 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckNewMgNr(TextBox input, bool required, AppDbContext ctx, Member? m) {
+        public static ValidationResult CheckNewMgNr(TextBox input, bool required, Member? m) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;
@@ -435,6 +439,7 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
+            using var ctx = new AppDbContext();
             int nr = int.Parse(input.Text);
             if (nr != m?.MgNr && ctx.MgNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Mitgliedsnummer wird bereits verwendet");
@@ -443,7 +448,7 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckSortId(TextBox input, bool required, AppDbContext ctx) {
+        public static ValidationResult CheckSortId(TextBox input, bool required) {
             var res = CheckUpperCase(input, required, 3);
             if (!res.IsValid) {
                 return res;
@@ -451,6 +456,7 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
+            using var ctx = new AppDbContext();
             if (input.Text.Length < 2 || !ctx.SortIdExists(input.Text[0..2]).GetAwaiter().GetResult()) {
                 return new(false, "Ungültige Sorte");
             } else if (input.Text.Length >= 3) {
@@ -463,8 +469,9 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckPredecessorMgNr(TextBox input, bool required, AppDbContext ctx) {
+        public static ValidationResult CheckPredecessorMgNr(TextBox input, bool required) {
             var res = CheckInteger(input, required);
+            using var ctx = new AppDbContext();
             if (!res.IsValid) {
                 return res;
             } else if (!required && input.Text.Length == 0) {
@@ -573,7 +580,7 @@ namespace Elwig.Helpers {
             }
         }
 
-        public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) {
+        public static ValidationResult CheckFbNr(TextBox input, bool required, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
                 return res;
@@ -581,6 +588,7 @@ namespace Elwig.Helpers {
                 return new(true, null);
             }
 
+            using var ctx = new AppDbContext();
             int nr = int.Parse(input.Text);
             if (nr != c?.FbNr && ctx.FbNrExists(nr).GetAwaiter().GetResult()) {
                 return new(false, "Flächenbindungsnummer wird bereits verwendet");

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -9,8 +9,8 @@ namespace Elwig.Models.Dtos {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
-            ("Name", "Name", null, 40),
-            ("GivenName", "Vorname", null, 40),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
@@ -35,7 +35,10 @@ namespace Elwig.Models.Dtos {
 
         private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
             return await table.FromSqlRaw($"""
-                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address,
+                    SELECT m.mgnr, m.family_name AS name_1,
+                           COALESCE(m.prefix || ' ', '') || m.given_name ||
+                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                           p.plz, o.name AS ort, m.address,
                            c.bucket, c.area, u.min_kg, u.weight
                     FROM member m
                         LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
@@ -50,8 +53,8 @@ namespace Elwig.Models.Dtos {
 
     public class AreaComUnderDeliveryRow {
         public int MgNr;
-        public string Name;
-        public string GivenName;
+        public string Name1;
+        public string Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -66,8 +69,8 @@ namespace Elwig.Models.Dtos {
         public AreaComUnderDeliveryRow(IEnumerable<AreaComUnderDeliveryRowSingle> rows) {
             var f = rows.First();
             MgNr = f.MgNr;
-            Name = f.Name;
-            GivenName = f.GivenName;
+            Name1 = f.Name1;
+            Name2 = f.Name2;
             Address = f.Address;
             Plz = f.Plz;
             Locality = f.Locality.Split(",")[0];
@@ -82,10 +85,10 @@ namespace Elwig.Models.Dtos {
     public class AreaComUnderDeliveryRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
-        [Column("family_name")]
-        public required string Name { get; set; }
-        [Column("given_name")]
-        public required string GivenName { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public required string Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/CreditNoteData.cs

@@ -12,8 +12,8 @@ namespace Elwig.Models.Dtos {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
-            ("Name", "Name", null, 40),
-            ("GivenName", "Vorname", null, 40),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
@@ -49,7 +49,10 @@ namespace Elwig.Models.Dtos {
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
             return await table.FromSqlRaw($"""
-                SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
+                SELECT m.mgnr, m.family_name AS name_1,
+                       COALESCE(m.prefix || ' ', '') || m.given_name ||
+                       COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                       p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
                        p.amount - p.net_amount AS surcharge,
                        c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
                        ROUND(COALESCE(u.total_penalty, 0) / POW(10, 4 - 2)) AS fb_penalty,
@@ -72,8 +75,8 @@ namespace Elwig.Models.Dtos {
 
     public class CreditNoteRow {
         public int MgNr;
-        public string Name;
-        public string GivenName;
+        public string Name1;
+        public string Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -96,8 +99,8 @@ namespace Elwig.Models.Dtos {
         public CreditNoteRow(CreditNoteRowSingle row, BillingData data) {
             byte prec1 = 2, prec2 = row.Precision;
             MgNr = row.MgNr;
-            Name = row.Name;
-            GivenName = row.GivenName;
+            Name1 = row.Name1;
+            Name2 = row.Name2;
             Address = row.Address;
             Plz = row.Plz;
             Locality = row.Locality;
@@ -132,10 +135,10 @@ namespace Elwig.Models.Dtos {
     public class CreditNoteRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
-        [Column("family_name")]
-        public required string Name { get; set; }
-        [Column("given_name")]
-        public required string GivenName { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public required string Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -1,5 +1,7 @@
-using Elwig.Models.Entities;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -26,10 +28,13 @@ namespace Elwig.Models.Dtos {
         }
 
         public static async Task<IDictionary<int, CreditNoteDeliveryData>> ForPaymentVariant(DbSet<CreditNoteDeliveryRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
+            var variant = (await seasons.FindAsync(year))?.PaymentVariants.Where(v => v.AvNr == avnr).SingleOrDefault();
+            BillingData? varData = null;
+            try { varData = variant != null ? BillingData.FromJson(variant.Data) : null; } catch { }
             return (await FromDbSet(table, year, avnr))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
-                    (k, g) => new CreditNoteDeliveryRow(g, seasons))
+                    (k, g) => new CreditNoteDeliveryRow(g, seasons, varData?.NetWeightModifier ?? 0.0, varData?.GrossWeightModifier ?? 0.0))
                 .GroupBy(
                     r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
                     (k, g) => new CreditNoteDeliveryData(g, k.Year, k.TgNr, mgnr: k.MgNr))
@@ -43,7 +48,7 @@ namespace Elwig.Models.Dtos {
             return await table.FromSqlRaw($"""
                 SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
                        b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
-                       s.name AS variety, a.name AS attribute, c.name AS cultivation, q.name AS quality_level, d.oe, d.kmw
+                       s.name AS variety, a.name AS attribute, c.name AS cultivation, q.qualid AS qualid, q.name AS quality_level, d.oe, d.kmw, d.net_weight
                 FROM v_delivery d
                     JOIN wine_variety s ON s.sortid = d.sortid
                     LEFT JOIN wine_attribute a ON a.attrid = d.attrid
@@ -64,7 +69,7 @@ namespace Elwig.Models.Dtos {
 
         public int Year;
         public int? TgNr;
-        public int AvNr;
+        public int? AvNr;
         public int MgNr;
 
         public string LsNr;
@@ -73,16 +78,19 @@ namespace Elwig.Models.Dtos {
         public string? Attribute;
         public string? Cultivation;
         public string[] Modifiers;
+        public string QualId;
         public string QualityLevel;
         public (double Oe, double Kmw) Gradation;
         public (string Name, int Value, decimal? Price, decimal? Amount)[] Buckets;
         public decimal? TotalModifiers;
         public decimal? Amount;
+        public double WeighingModifier;
 
-        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons) {
+        public CreditNoteDeliveryRow(IEnumerable<CreditNoteDeliveryRowSingle> rows, DbSet<Season> seasons, double netWeightModifier, double grossWeightModifier) {
             var f = rows.First();
             Year = f.Year;
             TgNr = f.TgNr;
+            AvNr = f.AvNr;
             MgNr = f.MgNr;
             var season = seasons.Find(Year);
 
@@ -97,6 +105,7 @@ namespace Elwig.Models.Dtos {
                 .OrderBy(m => m.Ordering)
                 .ToList();
             Modifiers = modifiers.Select(m => m.Name).ToArray();
+            QualId = f.QualId;
             QualityLevel = f.QualityLevel;
             Gradation = (f.Oe, f.Kmw);
             Buckets = rows
@@ -106,9 +115,11 @@ namespace Elwig.Models.Dtos {
                               b.Price != null ? season?.DecFromDb((long)b.Price) : null,
                               b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
                 .ToArray();
+            WeighingModifier = f.NetWeight ? netWeightModifier : grossWeightModifier;
             Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
             var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
-            TotalModifiers = Amount - netAmount;
+            var amt = netAmount * (decimal)(1.0 + WeighingModifier);
+            TotalModifiers = Amount - (amt != null ? Math.Round((decimal)amt, season?.Precision ?? 0) : null);
         }
     }
 
@@ -154,11 +165,15 @@ namespace Elwig.Models.Dtos {
         public string? Attribute { get; set; }
         [Column("cultivation")]
         public string? Cultivation { get; set; }
+        [Column("qualid")]
+        public required string QualId { get; set; }
         [Column("quality_level")]
         public required string QualityLevel { get; set; }
         [Column("oe")]
         public double Oe { get; set; }
         [Column("kmw")]
         public double Kmw { get; set; }
+        [Column("net_weight")]
+        public bool NetWeight { get; set; }
     }
 }

Elwig/Models/Dtos/DataTable.cs

@@ -8,6 +8,7 @@ namespace Elwig.Models.Dtos {
 
         public string Name { get; set; }
         public string FullName { get; set; }
+        public string? Subtitle { get; set; }
         public IEnumerable<T> Rows { get; private set; }
         public int RowNum => Rows.Count();
         public int ColNum => ColumnNames.Count();
@@ -24,6 +25,11 @@ namespace Elwig.Models.Dtos {
         private readonly FieldInfo[] _fields;
         private readonly (string, PropertyInfo?, FieldInfo?)[] _map;
 
+        public DataTable(string name, string fullName, string subtitle, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) :
+            this(name, fullName, rows, colNames) {
+            Subtitle = subtitle;
+        }
+
         public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) {
             _fields = typeof(T).GetFields();
             _properties = typeof(T).GetProperties();

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -78,6 +78,7 @@ namespace Elwig.Models.Dtos {
         public (double Oe, double Kmw) Gradation;
         public string[] Modifiers;
         public int Weight;
+        public bool IsNetWeight;
         public (string Name, int Value)[] Buckets;
 
         public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
@@ -93,6 +94,7 @@ namespace Elwig.Models.Dtos {
                 .Select(m => m.Name)
                 .ToArray();
             Weight = p.Weight;
+            IsNetWeight = p.IsNetWeight;
             Buckets = p.Buckets
                 .Where(b => b.Value > 0)
                 .OrderByDescending(b => b.BktNr)

Elwig/Models/Dtos/DeliveryJournalData.cs

@@ -0,0 +1,107 @@
+using Elwig.Documents;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class DeliveryJournalData : DataTable<DeliveryJournalRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("LsNr", "LsNr.", null, 30),
+            ("Pos", "Pos.", null, 10),
+            ("Date", "Datum", null, 20),
+            ("Time", "Zeit", null, 20),
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("SortId", "Sorte", null, 10),
+            ("AttrId", "Attr.", null, 15),
+            ("CultId", "Bewirt.", null, 15),
+            ("QualId", "Qualität", null, 15),
+            ("Gradation", "Gradation", "°Oe|°KMW", 40),
+            ("Weight", "Gewicht", "kg", 20),
+            ("NetGross", "bto./nto.", null, 20),
+            ("HkId", "Herkunft", null, 20),
+            ("Modifiers", "Zu-/Abschläge", null, 40),
+            ("Comment", "Anmerkung", null, 60),
+        ];
+
+        public DeliveryJournalData(IEnumerable<DeliveryJournalRow> rows, List<string> filterNames) :
+            base(DeliveryJournal.Name, DeliveryJournal.Name, string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<DeliveryJournalData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
+            return new((await query
+                .Include(p => p.Delivery.Member)
+                .Include(p => p.Delivery.Branch)
+                .Include(p => p.PartModifiers).ThenInclude(m => m.Modifier)
+                .Include(p => p.Variety)
+                .Include(p => p.Attribute)
+                .Include(p => p.Cultivation)
+                .Include(p => p.Origin)
+                .Include(p => p.Quality)
+                .AsSplitQuery()
+                .ToListAsync()).Select(d => new DeliveryJournalRow(d)), filterNames);
+        }
+    }
+
+    public class DeliveryJournalRow : IDelivery {
+        public string LsNr;
+        public int Pos;
+        public DateOnly Date;
+        public TimeOnly? Time;
+        public int MgNr;
+        public string Name1;
+        public string Name2;
+        public string AdministrativeName;
+        public string SortId;
+        public string Variety;
+        public string? AttrId;
+        public string? Attribute;
+        public string? CultId;
+        public string? Cultivation;
+        public string HkId;
+        public string QualId;
+        public string Quality;
+        public (double Oe, double Kmw) Gradation;
+        public double Kmw => Gradation.Kmw;
+        public double Oe => Gradation.Oe;
+        public int Weight { get; set; }
+        public bool IsNetWeight;
+        public string NetGross => IsNetWeight ? "n" : "b";
+        public string? Modifiers;
+        public string? Comment;
+
+        public DeliveryJournalRow(DeliveryPart p) {
+            var d = p.Delivery;
+            var m = d.Member;
+
+            LsNr = d.LsNr;
+            Pos = p.DPNr;
+            Date = d.Date;
+            Time = d.Time;
+            MgNr = m.MgNr;
+            Name1 = m.FamilyName;
+            Name2 = m.AdministrativeName2;
+            AdministrativeName = m.AdministrativeName;
+
+            SortId = p.SortId;
+            Variety = p.Variety.Name;
+            AttrId = p.AttrId;
+            Attribute = p.Attribute?.Name;
+            CultId = p.CultId;
+            Cultivation = p.Cultivation?.Name;
+            HkId = p.HkId;
+            QualId = p.QualId;
+            Quality = p.Quality.Name;
+            Gradation = (p.Oe, p.Kmw);
+            Weight = p.Weight;
+            IsNetWeight = p.IsNetWeight;
+            Modifiers = string.Join(" / ", p.Modifiers.Select(m => m.Name).Order());
+            Comment = d.Comment == null && p.Comment == null ? null : (d.Comment + (d.Comment != null && p.Comment != null ? " / " : "") + p.Comment);
+        }
+    }
+}

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -10,8 +10,8 @@ namespace Elwig.Models.Dtos {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
-            ("Name", "Name", null, 40),
-            ("GivenName", "Vorname", null, 40),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
@@ -37,7 +37,10 @@ namespace Elwig.Models.Dtos {
 
         private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
             return await table.FromSqlRaw($"""
-                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address,
+                    SELECT m.mgnr, m.family_name AS name_1,
+                           COALESCE(m.prefix || ' ', '') || m.given_name ||
+                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                           p.plz, o.name AS ort, m.address,
                            v.bucket, v.weight, v.area
                     FROM (
                             SELECT c.year AS year,
@@ -68,8 +71,8 @@ namespace Elwig.Models.Dtos {
 
     public class MemberDeliveryPerVariantRow {
         public int MgNr;
-        public string Name;
-        public string GivenName;
+        public string Name1;
+        public string Name2;
         public string Address;
         public int Plz;
         public string Locality;
@@ -82,8 +85,8 @@ namespace Elwig.Models.Dtos {
         public MemberDeliveryPerVariantRow(IEnumerable<MemberDeliveryPerVariantRowSingle> rows) {
             var f = rows.First();
             MgNr = f.MgNr;
-            Name = f.Name;
-            GivenName = f.GivenName;
+            Name1 = f.Name1;
+            Name2 = f.Name2;
             Address = f.Address;
             Plz = f.Plz;
             Locality = f.Locality.Split(",")[0];
@@ -98,10 +101,10 @@ namespace Elwig.Models.Dtos {
     public class MemberDeliveryPerVariantRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
-        [Column("family_name")]
-        public required string Name { get; set; }
-        [Column("given_name")]
-        public required string GivenName { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public required string Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/MemberListData.cs

@@ -0,0 +1,110 @@
+using Elwig.Documents;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Linq;
+using Microsoft.EntityFrameworkCore;
+using Elwig.Helpers;
+using System;
+
+namespace Elwig.Models.Dtos {
+    public class MemberListData : DataTable<MemberListRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("DefaultKg", "Stammgemeinde", null, 60),
+            ("Branch", "Zweigstelle", null, 40),
+            ("BusinessShares", "GA", null, 10),
+            ("BillingName", "Rechnungsname", null, 60),
+            ("BillingAddress", "Rechnungsadresse", null, 60),
+            ("BillingPlz", "PLZ", null, 10),
+            ("BillingLocality", "Ort", null, 60),
+            ("LfbisNr", "Betr.-Nr.", null, 20),
+            ("IsBuchführend", "buchf.", null, 15),
+            ("IsOrganic", "Bio", null, 15),
+            ("IsActive", "aktiv", null, 15),
+            ("EntryDate", "Eintritt", null, 20),
+            ("ExitDate", "Austritt", null, 20),
+            ("AreaCommitment", "geb. Fläche", "m²", 20),
+            ("UstIdNr", "UID", null, 25),
+            ("Iban", "IBAN", null, 45),
+            ("Bic", "BIC", null, 30),
+            ("Comment", "Anmerkung", null, 60),
+        ];
+
+        public MemberListData(IEnumerable<MemberListRow> rows, List<string> filterNames) :
+            base(MemberList.Name, MemberList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames) {
+            var areaCom = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments).Sum(c => c.Area));
+            return new((await query
+                .Include(m => m.DefaultWbKg!.AtKg)
+                .Include(m => m.Branch)
+                .Include(m => m.PostalDest.AtPlz!.Ort)
+                .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
+                .ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames);
+        }
+    }
+
+    public class MemberListRow {
+        public int MgNr;
+        public string? Name1;
+        public string? Name2;
+        public string? DefaultKg;
+        public string? Branch;
+        public int BusinessShares;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string? BillingName;
+        public string? BillingAddress;
+        public int? BillingPlz;
+        public string? BillingLocality;
+        public string? LfbisNr;
+        public string? UstIdNr;
+        public string? Iban;
+        public string? Bic;
+        public int? AreaCommitment;
+        public bool IsBuchführend;
+        public bool IsOrganic;
+        public bool IsActive;
+        public DateOnly? EntryDate;
+        public DateOnly? ExitDate;
+        public string? Comment;
+
+        public MemberListRow(Member m, int? areaCom = null) {
+            MgNr = m.MgNr;
+            Name1 = m.FamilyName;
+            Name2 = m.AdministrativeName2;
+            DefaultKg = m.DefaultKg?.Name;
+            Branch = m.Branch?.Name;
+            BusinessShares = m.BusinessShares;
+            Address = m.Address;
+            Plz = m.PostalDest.AtPlz!.Plz;
+            Locality = m.PostalDest.AtPlz!.Ort.Name;
+            if (m.BillingAddress is BillingAddr a) {
+                BillingName = a.Name;
+                BillingAddress = a.Address;
+                BillingPlz = a.PostalDest.AtPlz!.Plz;
+                BillingLocality = a.PostalDest.AtPlz!.Ort.Name;
+            }
+            LfbisNr = m.LfbisNr;
+            UstIdNr = m.UstIdNr;
+            Iban = m.Iban != null ? Utils.FormatIban(m.Iban) : null;
+            Bic = m.Bic;
+            IsBuchführend = m.IsBuchführend;
+            IsOrganic = m.IsOrganic;
+            IsActive = m.IsActive;
+            EntryDate = m.EntryDate;
+            ExitDate = m.ExitDate;
+            Comment = m.Comment;
+            AreaCommitment = areaCom == 0 ? null : areaCom;
+        }
+    }
+}

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -9,8 +9,8 @@ namespace Elwig.Models.Dtos {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
-            ("Name", "Name", null, 40),
-            ("GivenName", "Vorname", null, 40),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
             ("Address", "Adresse", null, 60),
             ("Plz", "PLZ", null, 10),
             ("Locality", "Ort", null, 60),
@@ -27,7 +27,10 @@ namespace Elwig.Models.Dtos {
 
         public static async Task<OverUnderDeliveryData> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
             var rows = await table.FromSqlRaw($"""
-                SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.business_shares,
+                SELECT m.mgnr, m.family_name AS name_1,
+                       COALESCE(m.prefix || ' ', '') || m.given_name ||
+                       COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                       p.plz, o.name AS ort, m.address, m.business_shares,
                        m.business_shares * s.min_kg_per_bs AS min_kg,
                        m.business_shares * s.max_kg_per_bs AS max_kg,
                        COALESCE(SUM(d.weight), 0) AS sum
@@ -48,10 +51,10 @@ namespace Elwig.Models.Dtos {
     public class OverUnderDeliveryRow {
         [Column("mgnr")]
         public int MgNr { get; set; }
-        [Column("family_name")]
-        public required string Name { get; set; }
-        [Column("given_name")]
-        public required string GivenName { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public required string Name2 { get; set; }
         [Column("address")]
         public required string Address { get; set; }
         [Column("plz")]

Elwig/Models/Dtos/WineQualityStatisticsData.cs

@@ -0,0 +1,105 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elwig.Models.Dtos {
+    public class WineQualityStatisticsData {
+
+        public record struct QualityRow(string? Variety, string? Attribute, string? Cultivation, string? Type, string QualId, int Oe, int Num, int Weight);
+        public record struct QualitySection(string Name, string? Type, Dictionary<string, (int Oe, int Num, int Weight)[]> Data);
+
+        public QualitySection[] Sections;
+
+        public WineQualityStatisticsData(QualitySection[] sections) {
+            Sections = sections;
+        }
+
+        private static QualitySection[] GetQualitySections(IEnumerable<QualityRow> rows) {
+            var data = new List<QualitySection>();
+            var currentQual = new Dictionary<int, (int Num, int Weight)>();
+            var current = new Dictionary<string, (int, int, int)[]>();
+            string? lastSection = null;
+            string? lastType = null;
+            string? lastQual = null;
+            foreach (var row in rows) {
+                var sec = $"{row.Variety ?? (row.Type == "R" ? "Rotweinsorten" : row.Type == "W" ? "Weißweinsorten" : "Gesamt")}" +
+                    $"{(row.Attribute != null ? " / " : "")}{row.Attribute}" +
+                    $"{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
+                if (lastQual != null && lastQual != row.QualId) {
+                    current[lastQual] = currentQual.Select(kv => (kv.Key, kv.Value.Num, kv.Value.Weight)).ToArray();
+                    currentQual.Clear();
+                }
+                if (lastSection != null && lastSection != sec) {
+                    if (!current.ContainsKey(lastQual!)) {
+                        current[lastQual!] = currentQual.Select(kv => (kv.Key, kv.Value.Num, kv.Value.Weight)).ToArray();
+                        currentQual.Clear();
+                    }
+                    data.Add(new(lastSection, lastType, current));
+                    current = [];
+                    currentQual.Clear();
+                }
+                currentQual[row.Oe] = (row.Num, row.Weight);
+                lastSection = sec;
+                lastType = row.Type;
+                lastQual = row.QualId;
+            }
+            if (lastQual != null) {
+                current[lastQual] = currentQual.Select(kv => (kv.Key, kv.Value.Num, kv.Value.Weight)).ToArray();
+                currentQual.Clear();
+            }
+            if (lastSection != null) {
+                data.Add(new(lastSection, lastType, current));
+                current = [];
+                currentQual.Clear();
+            }
+            return [.. data];
+        }
+
+        public static async Task<WineQualityStatisticsData> FromQuery(IQueryable<DeliveryPart> query) {
+            var rows = (await query
+                .GroupBy(p => new {
+                    p.Variety.Type,
+                    Variety = p.Variety.Name,
+                    Attribute = p.Attribute!.Name,
+                    Cultivation = p.Cultivation!.Name,
+                    p.QualId,
+                    Oe = (int)Math.Round(p.Kmw * (4.54 + 0.022 * p.Kmw), 0),
+                }, (k, g) => new { Key = k, Num = g.Count(), Weight = g.Sum(p => p.Weight) })
+                .OrderBy(g => g.Key.Variety)
+                .ThenBy(g => g.Key.Attribute)
+                .ThenBy(g => g.Key.Cultivation)
+                .ThenBy(g => g.Key.QualId)
+                .ThenBy(g => g.Key.Oe)
+                .ToListAsync())
+                .Select(r => new QualityRow(r.Key.Variety, r.Key.Attribute, r.Key.Cultivation, r.Key.Type, r.Key.QualId, r.Key.Oe, r.Num, r.Weight))
+                .ToList();
+
+            var data = GetQualitySections(rows);
+            if (data.Length <= 1)
+                return new(data);
+
+            var typeRows = rows
+                .GroupBy(s => new { s.Type, s.QualId, s.Oe }, (k, g) => new QualityRow(null, null, null, k.Type, k.QualId, k.Oe, g.Sum(g => g.Num), g.Sum(p => p.Weight)))
+                .OrderBy(g => g.Type)
+                .ThenBy(g => g.QualId)
+                .ThenBy(g => g.Oe)
+                .ToList();
+            var typeData = GetQualitySections(typeRows);
+            if (typeData.Length <= 1)
+                return new([.. typeData, .. data]);
+
+            var totalRows = rows
+                .GroupBy(s => new { s.QualId, s.Oe }, (k, g) => new QualityRow(null, null, null, null, k.QualId, k.Oe, g.Sum(p => p.Num), g.Sum(p => p.Weight)))
+                .OrderBy(g => g.QualId)
+                .ThenBy(g => g.Oe)
+                .ToList();
+            var totalData = GetQualitySections(totalRows);
+            return new([.. totalData, .. typeData, .. data]);
+        }
+    }
+}

Elwig/Models/Entities/AT_Gem.cs

@@ -11,10 +11,10 @@ namespace Elwig.Models.Entities {
         [Column("name")]
         public string Name { get; private set; } = null!;
 
-        [InverseProperty("Gem")]
-        public virtual ISet<AT_Kg> Kgs { get; private set; } = null!;
+        [InverseProperty(nameof(AT_Kg.Gem))]
+        public virtual ICollection<AT_Kg> Kgs { get; private set; } = null!;
 
-        [InverseProperty("AtGem")]
+        [InverseProperty(nameof(WbGem.AtGem))]
         public virtual WbGem? WbGem { get; private set; }
     }
 }

Elwig/Models/Entities/AT_Kg.cs

@@ -16,7 +16,7 @@ namespace Elwig.Models.Entities {
         [ForeignKey("Gkz")]
         public virtual AT_Gem Gem { get; private set; } = null!;
 
-        [InverseProperty("AtKg")]
+        [InverseProperty(nameof(WbKg.AtKg))]
         public virtual WbKg? WbKg { get; private set; }
     }
 }

Elwig/Models/Entities/AT_Plz.cs

@@ -26,7 +26,7 @@ namespace Elwig.Models.Entities {
         [Column("po_box")]
         public bool IsPoBox { get; private set; }
 
-        [InverseProperty("AtPlz")]
-        public virtual ISet<AT_PlzDest> Orte { get; private set; } = null!;
+        [InverseProperty(nameof(AT_PlzDest.AtPlz))]
+        public virtual ICollection<AT_PlzDest> Orte { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Branch.cs

@@ -36,7 +36,7 @@ namespace Elwig.Models.Entities {
         [Column("mobile_nr")]
         public string? MobileNr { get; set; }
 
-        [InverseProperty("Branch")]
-        public virtual ISet<Member> Members { get; private set; } = null!;
+        [InverseProperty(nameof(Member.Branch))]
+        public virtual ICollection<Member> Members { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Delivery.cs

@@ -66,8 +66,8 @@ namespace Elwig.Models.Entities {
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
 
-        [InverseProperty("Delivery")]
-        public virtual ISet<DeliveryPart> Parts { get; private set; } = null!;
+        [InverseProperty(nameof(DeliveryPart.Delivery))]
+        public virtual ICollection<DeliveryPart> Parts { get; private set; } = null!;
         [NotMapped]
         public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
 
@@ -85,10 +85,22 @@ namespace Elwig.Models.Entities {
             .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
             .Select(g => g.Key);
-
         public string SortIdString => string.Join(", ", SortIds);
         public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
+        public IEnumerable<string> Modifiers => Parts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public IEnumerable<string> FilteredModifiers => FilteredParts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public string ModifiersString => string.Join(" / ", Modifiers);
+        public string FilteredModifiersString => string.Join(" / ", FilteredModifiers);
+
         public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
         public double FilteredKmw => Utils.AggregateDeliveryPartsKmw(FilteredParts);
 

Elwig/Models/Entities/DeliveryPart.cs

@@ -6,7 +6,7 @@ using System.Linq;
 
 namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
-    public class DeliveryPart {
+    public class DeliveryPart : IDelivery {
         [Column("year")]
         public int Year { get; set; }
 
@@ -108,19 +108,19 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
+        [InverseProperty(nameof(DeliveryPartModifier.Part))]
+        public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
 
         [NotMapped]
         public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 
-        [InverseProperty("DeliveryPart")]
+        [InverseProperty(nameof(PaymentDeliveryPart.DeliveryPart))]
         public virtual PaymentDeliveryPart? Payment { get; private set; }
 
         [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; } = null!;
+        [InverseProperty(nameof(DeliveryPartBucket.Part))]
+        public virtual ICollection<DeliveryPartBucket> Buckets { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Member.cs

@@ -153,24 +153,24 @@ namespace Elwig.Models.Entities {
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }
 
-        [InverseProperty("Member")]
-        public virtual ISet<AreaCom> AreaCommitments { get; private set; } = null!;
+        [InverseProperty(nameof(AreaCom.Member))]
+        public virtual ICollection<AreaCom> AreaCommitments { get; private set; } = null!;
 
-        [NotMapped]
-        public IEnumerable<AreaCom> ActiveAreaCommitments => AreaCommitments
-            .Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear);
+        public IQueryable<AreaCom> ActiveAreaCommitments(AppDbContext ctx) {
+            return ctx.AreaCommitments.Where(c => c.MgNr == MgNr).Where(Utils.ActiveAreaCommitments());
+        }
 
-        [InverseProperty("Member")]
+        [InverseProperty(nameof(BillingAddr.Member))]
         public virtual BillingAddr? BillingAddress { get; private set; }
 
-        [InverseProperty("Member")]
-        public virtual ISet<Delivery> Deliveries { get; private set; } = null!;
+        [InverseProperty(nameof(Delivery.Member))]
+        public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 
-        [InverseProperty("Member")]
-        public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
+        [InverseProperty(nameof(MemberTelNr.Member))]
+        public virtual ICollection<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
 
-        [InverseProperty("member")]
-        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; } = null!;
+        [InverseProperty(nameof(MemberEmailAddr.Member))]
+        public virtual ICollection<MemberEmailAddr> EmailAddresses { get; private set; } = null!;
 
         public string FullAddress => $"{Address}, {PostalDest.AtPlz?.Plz} {PostalDest.AtPlz?.Ort.Name}";
 

Elwig/Models/Entities/PaymentMember.cs

@@ -48,7 +48,7 @@ namespace Elwig.Models.Entities {
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; } = null!;
 
-        [InverseProperty("Payment")]
+        [InverseProperty(nameof(Credit.Payment))]
         public virtual Credit? Credit { get; private set; }
     }
 }

Elwig/Models/Entities/PaymentVar.cs

@@ -48,13 +48,13 @@ namespace Elwig.Models.Entities {
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; } = null!;
 
-        [InverseProperty("Variant")]
-        public virtual ISet<PaymentMember> MemberPayments { get; private set; } = null!;
+        [InverseProperty(nameof(PaymentMember.Variant))]
+        public virtual ICollection<PaymentMember> MemberPayments { get; private set; } = null!;
 
-        [InverseProperty("Variant")]
-        public virtual ISet<PaymentDeliveryPart> DeliveryPartPayments { get; private set; } = null!;
+        [InverseProperty(nameof(PaymentDeliveryPart.Variant))]
+        public virtual ICollection<PaymentDeliveryPart> DeliveryPartPayments { get; private set; } = null!;
 
-        [InverseProperty("Variant")]
-        public virtual ISet<Credit> Credits { get; private set; } = null!;
+        [InverseProperty(nameof(Credit.Variant))]
+        public virtual ICollection<Credit> Credits { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Season.cs

@@ -100,14 +100,14 @@ namespace Elwig.Models.Entities {
         [ForeignKey("CurrencyCode")]
         public virtual Currency Currency { get; private set; } = null!;
 
-        [InverseProperty("Season")]
-        public virtual ISet<Modifier> Modifiers { get; private set; } = null!;
+        [InverseProperty(nameof(Modifier.Season))]
+        public virtual ICollection<Modifier> Modifiers { get; private set; } = null!;
 
-        [InverseProperty("Season")]
-        public virtual ISet<PaymentVar> PaymentVariants { get; private set; } = null!;
+        [InverseProperty(nameof(PaymentVar.Season))]
+        public virtual ICollection<PaymentVar> PaymentVariants { get; private set; } = null!;
 
-        [InverseProperty("Season")]
-        public virtual ISet<Delivery> Deliveries { get; private set; } = null!;
+        [InverseProperty(nameof(Delivery.Season))]
+        public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 
         public decimal DecFromDb(long value) {
             return Utils.DecFromDb(value, Precision);

Elwig/Models/Entities/WbGl.cs

@@ -11,7 +11,7 @@ namespace Elwig.Models.Entities {
         [Column("name")]
         public string Name { get; private set; } = null!;
 
-        [InverseProperty("Gl")]
-        public virtual ISet<WbKg> Kgs { get; private set; } = null!;
+        [InverseProperty(nameof(WbKg.Gl))]
+        public virtual ICollection<WbKg> Kgs { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/WbKg.cs

@@ -17,11 +17,11 @@ namespace Elwig.Models.Entities {
         [ForeignKey("GlNr")]
         public virtual WbGl Gl { get; private set; } = null!;
 
-        [InverseProperty("Kg")]
-        public virtual ISet<WbRd> Rds { get; private set; } = null!;
+        [InverseProperty(nameof(WbRd.Kg))]
+        public virtual ICollection<WbRd> Rds { get; private set; } = null!;
 
-        [InverseProperty("DefaultWbKg")]
-        public virtual ISet<Member> Members { get; private set; } = null!;
+        [InverseProperty(nameof(Member.DefaultWbKg))]
+        public virtual ICollection<Member> Members { get; private set; } = null!;
 
         [NotMapped]
         public WbGem Gem => AtKg.Gem.WbGem!;

Elwig/Models/Entities/WineOrigin.cs

@@ -23,11 +23,11 @@ namespace Elwig.Models.Entities {
         [Column("blnr")]
         public int? BlNr { get; private set; }
 
-        [InverseProperty("Origin")]
-        public virtual ISet<WbGem> Gems { get; private set; } = null!;
+        [InverseProperty(nameof(WbGem.Origin))]
+        public virtual ICollection<WbGem> Gems { get; private set; } = null!;
 
-        [InverseProperty("Parent")]
-        public virtual ISet<WineOrigin> Children { get; private set; } = null!;
+        [InverseProperty(nameof(Parent))]
+        public virtual ICollection<WineOrigin> Children { get; private set; } = null!;
 
         public int Level => (Parent?.Level + 1) ?? 0;
 

Elwig/Models/Entities/WineQualLevel.cs

@@ -41,5 +41,9 @@ namespace Elwig.Models.Entities {
         public static bool operator !=(WineQualLevel? q1, WineQualLevel? q2) {
             return !(q1?.Equals(q2) ?? Equals(q1, q2));
         }
+
+        public override int GetHashCode() {
+            return QualId.GetHashCode();
+        }
     }
 }

Elwig/Models/IDelivery.cs

@@ -0,0 +1,7 @@
+namespace Elwig.Models {
+    public interface IDelivery {
+        int Weight { get; }
+        double Kmw { get; }
+        double Oe { get; }
+    }
+}

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -12,6 +12,8 @@
       "consider_contract_penalties": {"type": "boolean"},
       "consider_total_penalty": {"type": "boolean"},
       "consider_auto_business_shares": {"type": "boolean"},
+      "net_weight_modifier": {"type": "number"},
+      "gross_weight_modifier": {"type": "number"},
       "payment": {"$ref": "#/definitions/payment_1"},
       "quality": {"$ref": "#/definitions/quality_1"},
       "curves": {
@@ -23,6 +25,7 @@
     "required": ["AuszahlungSorten", "Kurven"],
     "properties": {
       "mode": {"enum": ["wgmaster"]},
+      "Rebelzuschlag": {"type": "number"},
       "AuszahlungSorten": {"$ref": "#/definitions/payment_1"},
       "AuszahlungSortenQualitätsstufe": {"$ref": "#/definitions/quality_1"},
       "Kurven": {

Elwig/Windows/AdministrationWindow.cs

@@ -4,12 +4,14 @@ using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
 using Xceed.Wpf.Toolkit;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public abstract class AdministrationWindow : ContextWindow {
@@ -44,30 +46,53 @@ namespace Elwig.Windows {
         private CheckBox[] CheckBoxInputs;
         private RadioButton[] RadioButtonInputs;
         private readonly Dictionary<Control, bool> Valid;
-        private readonly Dictionary<Control, object?> OriginalValues;
-        private readonly Dictionary<Control, object?> DefaultValues;
+        private readonly Dictionary<Control, int?> OriginalValues;
+        private readonly Dictionary<Control, int?> DefaultValues;
+
+        private readonly RoutedCommand AltInsert = new("AltInsert", typeof(AdministrationWindow), [new KeyGesture(Key.Insert, ModifierKeys.Alt)]);
+        private readonly RoutedCommand AltDelete = new("AltDelete", typeof(AdministrationWindow), [new KeyGesture(Key.Delete, ModifierKeys.Alt)]);
+        private readonly RoutedCommand CtrlZ = new("CtrlZ", typeof(AdministrationWindow), [new KeyGesture(Key.Z, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlS = new("CtrlS", typeof(AdministrationWindow), [new KeyGesture(Key.S, ModifierKeys.Control)]);
+        private readonly RoutedCommand CtrlB = new("CtrlB", typeof(AdministrationWindow), [new KeyGesture(Key.B, ModifierKeys.Control)]);
 
         public AdministrationWindow() : base() {
+            CommandBindings.Add(new CommandBinding(AltInsert, ShortcutNew));
+            CommandBindings.Add(new CommandBinding(AltDelete, ShortcutDelete));
+            CommandBindings.Add(new CommandBinding(CtrlZ, ShortcutReset));
+            CommandBindings.Add(new CommandBinding(CtrlS, ShortcutSave));
+            CommandBindings.Add(new CommandBinding(CtrlB, ShortcutEdit));
             IsEditing = false;
             IsCreating = false;
-            ExemptInputs = Array.Empty<Control>();
-            RequiredInputs = Array.Empty<Control>();
-            TextBoxInputs = Array.Empty<TextBox>();
-            PlzInputs = Array.Empty<TextBox>();
-            ComboBoxInputs = Array.Empty<ComboBox>();
-            CheckComboBoxInputs = Array.Empty<CheckComboBox>();
-            PlzOrtInputs = Array.Empty<ComboBox>();
-            CheckBoxInputs = Array.Empty<CheckBox>();
-            RadioButtonInputs = Array.Empty<RadioButton>();
-            Valid = new();
-            OriginalValues = new();
-            DefaultValues = new();
+            ExemptInputs = [];
+            RequiredInputs = [];
+            TextBoxInputs = [];
+            PlzInputs = [];
+            ComboBoxInputs = [];
+            CheckComboBoxInputs = [];
+            PlzOrtInputs = [];
+            CheckBoxInputs = [];
+            RadioButtonInputs = [];
+            Valid = [];
+            OriginalValues = [];
+            DefaultValues = [];
             Closing += OnClosing;
             Loaded -= base.OnLoaded;
             Loaded += OnLoaded;
             Loaded += base.OnLoaded;
         }
 
+        abstract protected void ShortcutNew();
+        abstract protected void ShortcutDelete();
+        abstract protected void ShortcutReset();
+        abstract protected void ShortcutSave();
+        abstract protected void ShortcutEdit();
+
+        private void ShortcutNew(object sender, EventArgs evt) { ShortcutNew(); }
+        private void ShortcutDelete(object sender, EventArgs evt) { ShortcutDelete(); }
+        private void ShortcutReset(object sender, EventArgs evt) { ShortcutReset(); }
+        private void ShortcutSave(object sender, EventArgs evt) { ShortcutSave(); }
+        private void ShortcutEdit(object sender, EventArgs evt) { ShortcutEdit(); }
+
         private new void OnLoaded(object sender, RoutedEventArgs evt) {
             TextBoxInputs = ControlUtils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
             ComboBoxInputs = ControlUtils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
@@ -102,9 +127,9 @@ namespace Elwig.Windows {
 
         abstract protected void UpdateButtons();
 
-        protected override async Task OnRenewContext() {
+        protected override async Task OnRenewContext(AppDbContext ctx) {
             for (int i = 0; i < PlzInputs.Length; i++)
-                UpdatePlz(PlzInputs[i], PlzOrtInputs[i]);
+                await UpdatePlz(PlzInputs[i], PlzOrtInputs[i]);
         }
 
         protected void ValidateInput(Control input, bool valid) {
@@ -197,20 +222,20 @@ namespace Elwig.Windows {
 
         protected void FillOriginalValues() {
             foreach (var tb in TextBoxInputs)
-                OriginalValues[tb] = tb.Text;
+                OriginalValues[tb] = ControlUtils.GetInputHashCode(tb);
             foreach (var cb in ComboBoxInputs)
-                OriginalValues[cb] = cb.SelectedItem;
+                OriginalValues[cb] = ControlUtils.GetInputHashCode(cb);
             foreach (var ccb in CheckComboBoxInputs)
-                OriginalValues[ccb] = ccb.SelectedItems.Cast<object>().ToArray();
+                OriginalValues[ccb] = ControlUtils.GetInputHashCode(ccb);
             foreach (var cb in CheckBoxInputs)
-                OriginalValues[cb] = cb.IsChecked?.ToString();
+                OriginalValues[cb] = ControlUtils.GetInputHashCode(cb);
             foreach (var rb in RadioButtonInputs)
-                OriginalValues[rb] = rb.IsChecked?.ToString();
+                OriginalValues[rb] = ControlUtils.GetInputHashCode(rb);
         }
 
         protected void SetOriginalValue(Control input, object? value) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            OriginalValues[input] = value is bool b ? b.ToString() : value;
+            OriginalValues[input] = Utils.GetEntityIdentifier(value);
             if (InputHasChanged(input)) {
                 ControlUtils.SetInputChanged(input);
             } else {
@@ -220,7 +245,7 @@ namespace Elwig.Windows {
 
         protected void SetOriginalValue(Control input) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            SetOriginalValue(input, ControlUtils.GetInputValue(input));
+            SetOriginalValue(input, ControlUtils.GetInputHashCode(input));
         }
 
         protected void UnsetOriginalValue(Control input) {
@@ -231,7 +256,7 @@ namespace Elwig.Windows {
 
         protected void SetDefaultValue(Control input, object? value) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            DefaultValues[input] = value is bool b ? b.ToString() : value;
+            DefaultValues[input] = Utils.GetEntityIdentifier(value);
             if (!InputHasChanged(input)) {
                 if (InputIsNotDefault(input)) {
                     ControlUtils.SetInputNotDefault(input);
@@ -243,7 +268,7 @@ namespace Elwig.Windows {
 
         protected void SetDefaultValue(Control input) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            SetDefaultValue(input, ControlUtils.GetInputValue(input));
+            SetDefaultValue(input, ControlUtils.GetInputHashCode(input));
         }
 
         protected void UnsetDefaultValue(Control input) {
@@ -277,39 +302,21 @@ namespace Elwig.Windows {
 
         protected bool InputHasChanged(Control input) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            if (!OriginalValues.ContainsKey(input)) {
+            if (!OriginalValues.TryGetValue(input, out int? original)) {
                 return false;
-            } else if (input is TextBox tb) {
-                return OriginalValues[tb]?.ToString() != tb.Text;
-            } else if (input is ComboBox sb) {
-                return OriginalValues[sb] != sb.SelectedItem;
-            } else if (input is CheckComboBox ccb) {
-                return !ccb.SelectedItems.Cast<object>().ToArray().SequenceEqual(((object[]?)OriginalValues[ccb]) ?? Array.Empty<object>());
-            } else if (input is CheckBox cb) {
-                return (string?)OriginalValues[cb] != cb.IsChecked?.ToString();
-            } else if (input is RadioButton rb) {
-                return (string?)OriginalValues[rb] != rb.IsChecked?.ToString();
             } else {
-                return false;
+                var current = ControlUtils.GetInputHashCode(input);
+                return original != current;
             }
         }
 
         protected bool InputIsNotDefault(Control input) {
             if (input is UnitTextBox utbx) input = utbx.TextBox;
-            if (!DefaultValues.ContainsKey(input)) {
+            if (!DefaultValues.TryGetValue(input, out int? defaultValue)) {
                 return false;
-            } else if (input is TextBox tb) {
-                return DefaultValues[tb]?.ToString() != tb.Text;
-            } else if (input is ComboBox sb) {
-                return DefaultValues[sb] != sb.SelectedItem;
-            } else if (input is CheckComboBox ccb) {
-                return !ccb.SelectedItems.Cast<object>().ToArray().SequenceEqual(((object[]?)DefaultValues[ccb]) ?? Array.Empty<object>());
-            } else if (input is CheckBox cb) {
-                return (string?)DefaultValues[cb] != cb.IsChecked?.ToString();
-            } else if (input is RadioButton rb) {
-                return (string?)DefaultValues[rb] != rb.IsChecked?.ToString();
             } else {
-                return false;
+                var current = ControlUtils.GetInputHashCode(input);
+                return defaultValue != current;
             }
         }
 
@@ -329,11 +336,20 @@ namespace Elwig.Windows {
                 RadioButtonInputs.Any(InputIsNotDefault)
             );
 
-        protected void UpdatePlz(TextBox plzInput, ComboBox ortInput) {
-            var plzInputValid = Validator.CheckPlz(plzInput, RequiredInputs.Contains(plzInput), Context).IsValid;
-            var item = ortInput.SelectedItem;
-            var list = plzInputValid && plzInput.Text.Length == 4 ? Context.Postleitzahlen.Find(int.Parse(plzInput.Text))?.Orte.ToList() : null;
-            ControlUtils.RenewItemsSource(ortInput, list, i => (i as AT_PlzDest)?.Id);
+        protected async Task UpdatePlz(TextBox plzInput, ComboBox ortInput) {
+            var plzInputValid = Validator.CheckPlz(plzInput, RequiredInputs.Contains(plzInput)).IsValid;
+
+            List<AT_PlzDest>? list = null;
+            if (plzInputValid && plzInput.Text.Length == 4) {
+                var plz = int.Parse(plzInput.Text);
+                using var ctx = new AppDbContext();
+                list = await ctx.PlzDestinations
+                   .Where(p => p.Plz == plz)
+                   .Include(p => p.Ort)
+                   .ToListAsync();
+            }
+
+            ControlUtils.RenewItemsSource(ortInput, list);
             if (list != null && ortInput.SelectedItem == null && list.Count == 1)
                 ortInput.SelectedItem = list[0];
             UpdateComboBox(ortInput);
@@ -360,11 +376,7 @@ namespace Elwig.Windows {
         }
 
         protected bool InputTextChanged(TextBox input, Func<TextBox, bool, ValidationResult> checker) {
-            return InputTextChanged(input, (tb, required, ctx) => checker(tb, required));
-        }
-
-        protected bool InputTextChanged(TextBox input, Func<TextBox, bool, AppDbContext, ValidationResult> checker) {
-            return InputTextChanged(input, checker(input, SenderIsRequired(input), Context));
+            return InputTextChanged(input, checker(input, SenderIsRequired(input)));
         }
 
         protected bool InputTextChanged(TextBox input, ValidationResult res) {
@@ -385,11 +397,7 @@ namespace Elwig.Windows {
         }
 
         protected bool InputLostFocus(TextBox input, Func<TextBox, bool, ValidationResult> checker, string? msg = null) {
-            return InputLostFocus(input, (tb, requiered, ctx) => checker(tb, requiered), msg);
-        }
-
-        protected bool InputLostFocus(TextBox input, Func<TextBox, bool, AppDbContext, ValidationResult> checker, string? msg = null) {
-            return InputLostFocus(input, checker(input, SenderIsRequired(input), Context), msg);
+            return InputLostFocus(input, checker(input, SenderIsRequired(input)), msg);
         }
 
         protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
@@ -506,18 +514,18 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckTime);
         }
 
-        protected void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        protected async void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
             if ("PLZ".Equals(plz.Tag))
-                UpdatePlz(plz, GetPlzOrtInput(plz));
+                await UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
-        protected void PlzInput_LostFocus(object sender, RoutedEventArgs evt) {
+        protected async void PlzInput_LostFocus(object sender, RoutedEventArgs evt) {
             var plz = (TextBox)sender;
             InputLostFocus(plz, Validator.CheckPlz);
             if ("PLZ".Equals(plz.Tag))
-                UpdatePlz(plz, GetPlzOrtInput(plz));
+                await UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
         protected void EmailAddressInput_TextChanged(object sender, TextChangedEventArgs evt) {

Elwig/Windows/AreaComAdminWindow.xaml

@@ -95,18 +95,42 @@
             </DataGrid>
 
             <Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="EditAreaCommitmentButton" Content="Bearbeiten" Click="EditAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="DeleteAreaCommitmentButton" Content="Löschen" Click="DeleteAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
+                </Button.ToolTip>
+            </Button>
 
             <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
         </Grid>
 
         <GridSplitter Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -7,7 +7,6 @@ using Elwig.Models.Entities;
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Elwig.Windows {
@@ -20,7 +19,8 @@ namespace Elwig.Windows {
 
         public AreaComAdminWindow(int mgnr) {
             InitializeComponent();
-            Member = Context.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
+            using var ctx = new AppDbContext();
+            Member = ctx.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             Title = $"Flächenbindungen - {Member.AdministrativeName} - Elwig";
             ExemptInputs = [
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
@@ -39,13 +39,16 @@ namespace Elwig.Windows {
         }
 
         private async Task RefreshAreaCommitmentList() {
-            await Context.AreaCommitments.LoadAsync();
             await RefreshAreaCommitmentListQuery();
         }
 
         private async Task RefreshAreaCommitmentListQuery(bool updateSort = false) {
-            var (_, areaComQuery, filter) = await GetFilters();
-            var areaComs = await areaComQuery.ToListAsync();
+            using var ctx = new AppDbContext();
+            var (_, areaComQuery, filter) = await GetFilters(ctx);
+            var areaComs = await areaComQuery
+                .Include(a => a.Kg.AtKg)
+                .Include(a => a.Rd!.Kg.AtKg)
+                .ToListAsync();
 
             if (filter.Count > 0 && areaComs.Count > 0) {
                 var dict = areaComs.AsParallel()
@@ -58,7 +61,7 @@ namespace Elwig.Windows {
                     .ToList();
             }
 
-            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr,
+            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs,
                 AreaCommitmentList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             RefreshInputs();
 
@@ -75,11 +78,11 @@ namespace Elwig.Windows {
             StatusContracts.ToolTip = $"Vertragsarten: {groups.Count}\n" + string.Join($"\n", groups.Select(g => $"{g.Key}: {g.Item2:N0} m²"));
         }
 
-        private async Task<(List<string>, IQueryable<AreaCom>, List<string>)> GetFilters() {
+        private async Task<(List<string>, IQueryable<AreaCom>, List<string>)> GetFilters(AppDbContext ctx) {
             List<string> filterNames = [];
-            IQueryable<AreaCom> areaComQuery = Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr);
+            IQueryable<AreaCom> areaComQuery = ctx.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr);
             if (ActiveAreaCommitmentInput.IsChecked == true) {
-                areaComQuery = areaComQuery.Where(a => (a.YearFrom <= Utils.CurrentYear) && (a.YearTo == null || a.YearTo >= Utils.CurrentYear));
+                areaComQuery = Utils.ActiveAreaCommitments(areaComQuery);
                 filterNames.Add("aktiv");
             }
 
@@ -90,8 +93,8 @@ namespace Elwig.Windows {
 
             var filter = TextFilter.ToList();
             if (filter.Count > 0) {
-                var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var attr = await Context.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
+                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
@@ -150,13 +153,21 @@ namespace Elwig.Windows {
             YearFromInput.Text = a.YearFrom.ToString();
             YearToInput.Text = a.YearTo.ToString();
 
-            KgInput.SelectedItem = a.Kg.AtKg;
-            RdInput.SelectedItem = a.Rd ?? RdInput.Items[0];
+            ControlUtils.SelectItemWithPk(KgInput, a.KgNr);
+            if (a.RdNr != null) {
+                ControlUtils.SelectItemWithPk(RdInput, a.KgNr, a.RdNr);
+            } else {
+                RdInput.SelectedIndex = 0;
+            }
             GstNrInput.Text = a.GstNr;
             AreaInput.Text = a.Area.ToString();
 
-            AreaComTypeInput.SelectedItem = a.AreaComType;
-            WineCultivationInput.SelectedItem = a.WineCult ?? WineCultivationInput.Items[0];
+            ControlUtils.SelectItemWithPk(AreaComTypeInput, a.VtrgId);
+            if (a.CultId != null) {
+                ControlUtils.SelectItemWithPk(WineCultivationInput, a.CultId);
+            } else {
+                WineCultivationInput.SelectedIndex = 0;
+            }
 
             CommentInput.Text = a.Comment;
 
@@ -167,26 +178,44 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
 
-            FbNrInput.Text = (await Context.NextFbNr()).ToString();
-            MgNrInput.Text = Member.MgNr.ToString();
-            YearFromInput.Text = DateTime.Now.Year.ToString();
-            WineCultivationInput.SelectedIndex = 0;
+            using (var ctx = new AppDbContext()) {
+                FbNrInput.Text = (await ctx.NextFbNr()).ToString();
+                MgNrInput.Text = Member.MgNr.ToString();
+                YearFromInput.Text = DateTime.Now.Year.ToString();
+                WineCultivationInput.SelectedIndex = 0;
+            }
 
             SetDefaultValue(FbNrInput);
             ValidateRequiredInputs();
         }
 
-        protected override async Task OnRenewContext() {
-            await base.OnRenewContext();
-            ControlUtils.RenewItemsSource(KgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
-            ControlUtils.RenewItemsSource(AreaComTypeInput, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), i => (i as AreaComType)?.VtrgId);
-            var cultList = await Context.WineCultivations.OrderBy(c => c.Name).Cast<object>().ToListAsync();
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            await base.OnRenewContext(ctx);
+            ControlUtils.RenewItemsSource(KgInput, await ctx.WbKgs
+                .Include(k => k.AtKg.WbKg!.Rds)
+                .Select(k => k.AtKg)
+                .OrderBy(k => k.Name)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(AreaComTypeInput, await ctx.AreaCommitmentTypes
+                .Include(c => c.WineVar)
+                .Include(c => c.WineAttr)
+                .OrderBy(v => v.VtrgId)
+                .ToListAsync());
+            var cultList = await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .Cast<object>().ToListAsync();
             cultList.Insert(0, new NullItem());
-            ControlUtils.RenewItemsSource(WineCultivationInput, cultList, i => (i as WineCult)?.CultId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineCultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);
             await RefreshAreaCommitmentList();
         }
 
-        private void NewAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
+        protected override void ShortcutNew() {
+            if (!NewAreaCommitmentButton.IsEnabled || NewAreaCommitmentButton.Visibility != Visibility.Visible)
+                return;
+            NewAreaCommitmentButton_Click(null, null);
+        }
+
+        private void NewAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             IsCreating = true;
             AreaCommitmentList.IsEnabled = false;
             AreaCommitmentList.SelectedItem = null;
@@ -197,7 +226,14 @@ namespace Elwig.Windows {
             LockSearchInputs();
         }
 
-        private void EditAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
+
+        protected override void ShortcutEdit() {
+            if (!EditAreaCommitmentButton.IsEnabled || EditAreaCommitmentButton.Visibility != Visibility.Visible)
+                return;
+            EditAreaCommitmentButton_Click(null, null);
+        }
+
+        private void EditAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             if (AreaCommitmentList.SelectedItem == null)
                 return;
 
@@ -210,79 +246,85 @@ namespace Elwig.Windows {
             LockSearchInputs();
         }
 
-        private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
+        protected override void ShortcutDelete() {
+            if (!DeleteAreaCommitmentButton.IsEnabled || DeleteAreaCommitmentButton.Visibility != Visibility.Visible)
+                return;
+            DeleteAreaCommitmentButton_Click(null, null);
+        }
+
+        private async void DeleteAreaCommitmentButton_Click(object? sender, RoutedEventArgs? evt) {
             AreaCom a = (AreaCom)AreaCommitmentList.SelectedItem;
             if (a == null) return;
 
             var r = MessageBox.Show(
                 $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
-                "Flächenbindung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-            if (r == MessageBoxResult.Yes) {
-                Context.Remove(a);
-                Context.SaveChanges();
+                "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+            if (r == MessageBoxResult.OK) {
+                using var ctx = new AppDbContext();
+                ctx.Remove(a);
+                await ctx.SaveChangesAsync();
                 await RefreshAreaCommitmentList();
             }
         }
 
-        private async Task<AreaCom> UpdateAreaCom(AreaCom a) {
+        private async Task<int> UpdateAreaCom(int? oldFbNr) {
+            using var ctx = new AppDbContext();
             int newFbNr = int.Parse(FbNrInput.Text);
-            a.MgNr = int.Parse(MgNrInput.Text);
-            a.YearFrom = int.Parse(YearFromInput.Text);
-            a.YearTo = (YearToInput.Text == "") ? null : int.Parse(YearToInput.Text);
-            a.KgNr = ((AT_Kg)KgInput.SelectedItem).KgNr;
-            a.RdNr = RdInput.SelectedItem.GetType() == typeof(NullItem) ? null : ((WbRd)RdInput.SelectedItem).RdNr;
-            a.GstNr = GstNrInput.Text;
-            a.Area = int.Parse(AreaInput.Text);
-            a.VtrgId = (AreaComTypeInput.SelectedItem as AreaComType)!.VtrgId;
-            a.CultId = (WineCultivationInput.SelectedItem as WineCult)?.CultId;
-            a.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
 
-            EntityEntry<AreaCom>? tr = null;
+            var a = new AreaCom {
+                FbNr = oldFbNr ?? newFbNr,
+                MgNr = int.Parse(MgNrInput.Text),
+                YearFrom = int.Parse(YearFromInput.Text),
+                YearTo = (YearToInput.Text == "") ? null : int.Parse(YearToInput.Text),
+                KgNr = ((AT_Kg)KgInput.SelectedItem).KgNr,
+                RdNr = (RdInput.SelectedItem as WbRd)?.RdNr,
+                GstNr = GstNrInput.Text.Trim(),
+                Area = int.Parse(AreaInput.Text),
+                VtrgId = (AreaComTypeInput.SelectedItem as AreaComType)!.VtrgId,
+                CultId = (WineCultivationInput.SelectedItem as WineCult)?.CultId,
+                Comment = (CommentInput.Text == "") ? null : CommentInput.Text.Trim(),
+            };
+
+            if (RdInput.SelectedItem is WbRd rd) {
+                if (rd.RdNr == 0) {
+                    rd.RdNr = await ctx.NextRdNr(a.KgNr);
+                    a.RdNr = rd.RdNr;
+                    ctx.Add(rd);
+                }
+            }
+
+            if (oldFbNr != null) {
+                ctx.Update(a);
+            } else {
+                ctx.Add(a);
+            }
+
+            await ctx.SaveChangesAsync();
+
+            if (newFbNr != a.FbNr) {
+                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+            }
+
+            await App.HintContextChange();
+
+            return newFbNr;
+        }
+
+        protected override void ShortcutSave() {
+            if (!AreaCommitmentSaveButton.IsEnabled || AreaCommitmentSaveButton.Visibility != Visibility.Visible)
+                return;
+            AreaCommitmentSaveButton_Click(null, null);
+        }
+
+        private async void AreaCommitmentSaveButton_Click(object? sender, RoutedEventArgs? evt) {
+            int? fbnr = null;
             try {
-                if (RdInput.SelectedItem is WbRd wbRd) {
-                    a.RdNr = wbRd.RdNr;
-                    var e = Context.Entry(wbRd);
-                    if (e.State == EntityState.Detached) {
-                        await Context.AddAsync(wbRd);
-                    }
-                } else {
-                    a.RdNr = null;
-                }
-
-                if (IsEditing) {
-                    tr = Context.Update(a);
-                } else if (IsCreating) {
-                    a.FbNr = newFbNr;
-                    tr = await Context.AddAsync(a);
-                } else {
-                    throw new Exception();
-                }
-
-                await Context.SaveChangesAsync();
-
-                if (newFbNr != a.FbNr) {
-                    await Context.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {a.FbNr}");
-                    tr.State = EntityState.Detached;
-                    await Context.SaveChangesAsync();
-                    await tr.ReloadAsync();
-                    a = await Context.AreaCommitments.FindAsync(newFbNr);
-                }
-
+                fbnr = await UpdateAreaCom((AreaCommitmentList.SelectedItem as AreaCom)?.FbNr);
             } catch (Exception exc) {
-                if (tr != null) {
-                    tr.State = EntityState.Detached;
-                    await tr.ReloadAsync();
-                }
                 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);
             }
-
-            return a!;
-        }
-
-        private async void AreaCommitmentSaveButton_Click(object sender, RoutedEventArgs evt) {
-            AreaCom a = await UpdateAreaCom(IsEditing ? (AreaCom)AreaCommitmentList.SelectedItem : Context.CreateProxy<AreaCom>());
             IsEditing = false;
             IsCreating = false;
             AreaCommitmentList.IsEnabled = true;
@@ -290,11 +332,20 @@ namespace Elwig.Windows {
             ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
             UnlockSearchInputs();
-            await App.HintContextChange();
-            AreaCommitmentList.SelectedItem = a;
+            FinishInputFilling();
+            await RefreshAreaCommitmentList();
+            RefreshInputs();
+            SearchInput.Text = "";
+            ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
         }
 
-        private void AreaCommitmentResetButton_Click(object sender, RoutedEventArgs evt) {
+        protected override void ShortcutReset() {
+            if (!AreaCommitmentResetButton.IsEnabled || AreaCommitmentResetButton.Visibility != Visibility.Visible)
+                return;
+            AreaCommitmentResetButton_Click(null, null);
+        }
+
+        private void AreaCommitmentResetButton_Click(object? sender, RoutedEventArgs? evt) {
             if (IsEditing) {
                 RefreshInputs();
             } else if (IsCreating) {
@@ -393,14 +444,14 @@ namespace Elwig.Windows {
             await RefreshAreaCommitmentListQuery(true);
         }
 
-        private async void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            if (KgInput.SelectedItem is AT_Kg curr_kg) {
-                var rdList = await Context.WbRde.Where(r => r.KgNr == curr_kg.KgNr).OrderBy(r => r.Name).Cast<object>().ToListAsync();
+        private void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            if (KgInput.SelectedItem is AT_Kg kg) {
+                var rdList = kg.WbKg!.Rds.OrderBy(r => r.Name).Cast<object>().ToList();
                 rdList.Insert(0, new NullItem());
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
+                ControlUtils.RenewItemsSource(RdInput, rdList, null, ControlUtils.RenewSourceDefault.First);
             } else {
                 var rdList = new object[] { new NullItem() };
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
+                ControlUtils.RenewItemsSource(RdInput, rdList, null, ControlUtils.RenewSourceDefault.First);
             }
             ComboBox_SelectionChanged(sender, evt);
         }
@@ -417,21 +468,25 @@ namespace Elwig.Windows {
             RdAddButton.IsEnabled = RdInput.SelectedIndex == -1;
         }
 
-        private async void RdAddButton_Click(object sender, RoutedEventArgs evt) {
+        private void RdAddButton_Click(object sender, RoutedEventArgs evt) {
             if (KgInput.SelectedItem is not AT_Kg kg) return;
             string name = RdInput.Text.Trim();
             if (name.Length == 0) return;
             var s = RdInput.ItemsSource.Cast<object?>();
-            RdInput.ItemsSource = s.Append(new WbRd() { KgNr = kg.KgNr, Name = name, RdNr = await Context.NextRdNr(kg.KgNr)});
+            RdInput.ItemsSource = s.Append(new WbRd {
+                KgNr = kg.KgNr,
+                RdNr = 0,
+                Name = name,
+            });
             RdInput.SelectedIndex = s.Count();
         }
 
-        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AppDbContext, AreaCom?, ValidationResult> checker) {
-            InputTextChanged(input, checker(input, SenderIsRequired(input), Context, (AreaCom)AreaCommitmentList.SelectedItem));
+        protected void InputTextChanged(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker) {
+            InputTextChanged(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem));
         }
 
-        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AppDbContext, AreaCom?, ValidationResult> checker, string? msg = null) {
-            InputLostFocus(input, checker(input, SenderIsRequired(input), Context, (AreaCom)AreaCommitmentList.SelectedItem), msg);
+        protected void InputLostFocus(TextBox input, Func<TextBox, bool, AreaCom?, ValidationResult> checker, string? msg = null) {
+            InputLostFocus(input, checker(input, SenderIsRequired(input), (AreaCom)AreaCommitmentList.SelectedItem), msg);
         }
 
         private void FbNrInput_TextChanged(object sender, RoutedEventArgs evt) {

Elwig/Windows/BaseDataWindow.xaml

@@ -559,15 +559,31 @@
 
         <Button x:Name="EditButton" Content="Bearbeiten"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Width="120"
-                Click="EditButton_Click"/>
+                Click="EditButton_Click">
+            <Button.ToolTip>
+                <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+            </Button.ToolTip>
+        </Button>
         <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,250,10" Width="120"
-                Click="SaveButton_Click"/>
+                Click="SaveButton_Click">
+            <Button.ToolTip>
+                <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+            </Button.ToolTip>
+        </Button>
         <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Width="120"
-                Click="ResetButton_Click"/>
+                Click="ResetButton_Click">
+            <Button.ToolTip>
+                <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+            </Button.ToolTip>
+        </Button>
         <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" IsCancel="True"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="250,0,0,10" Width="120"
-                Click="CancelButton_Click"/>
+                Click="CancelButton_Click">
+            <Button.ToolTip>
+                <TextBlock FontWeight="Bold">Esc</TextBlock>
+            </Button.ToolTip>
+        </Button>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -18,16 +18,20 @@ namespace Elwig.Windows {
         private bool _actChanged = false;
         private bool _actUpdate = false;
 
-        private void AreaCommitmentTypesInitEditing() {
-            _actList = new(Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToList());
+        private async Task AreaCommitmentTypesInitEditing(AppDbContext ctx) {
+            _actList = new(await ctx.AreaCommitmentTypes
+                .OrderBy(v => v.VtrgId)
+                .Include(t => t.WineVar)
+                .Include(t => t.WineAttr)
+                .ToListAsync());
             _acts = _actList.ToDictionary(v => v.VtrgId, v => (string?)v.VtrgId);
             _actIds = _actList.ToDictionary(v => v, v => v.VtrgId);
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, _actList, a => (a as AreaComType)?.VtrgId);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, _actList);
             AreaCommitmentTypeList_SelectionChanged(null, null);
         }
 
-        private void AreaCommitmentTypesFinishEditing() {
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, Context.AreaCommitmentTypes.OrderBy(v => v.SortId).ToList(), v => (v as AreaComType)?.VtrgId);
+        private async Task AreaCommitmentTypesFinishEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await ctx.AreaCommitmentTypes.OrderBy(v => v.SortId).ToListAsync());
             _actList = null;
             _acts = null;
             _actIds = null;
@@ -37,31 +41,31 @@ namespace Elwig.Windows {
             AreaCommitmentTypeDeleteButton.IsEnabled = false;
         }
 
-        private async Task AreaCommitmentTypesSave() {
+        private async Task AreaCommitmentTypesSave(AppDbContext ctx) {
             if (!_actChanged || _actList == null || _acts == null || _actIds == null)
                 return;
 
             foreach (var (vtrgid, _) in _acts.Where(a => a.Value == null)) {
-                Context.Remove(Context.AreaCommitmentTypes.Find(vtrgid));
+                ctx.Remove(ctx.AreaCommitmentTypes.Find(vtrgid)!);
             }
             foreach (var (attr, old) in _actIds) {
                 attr.VtrgId = old;
             }
             foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
-                Context.Update(Context.AreaCommitmentTypes.Find(old));
+                ctx.Update(ctx.AreaCommitmentTypes.Find(old)!);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var (old, vtrgid) in _acts.Where(a => a.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = {vtrgid} WHERE vtrgid = {old}");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment_type SET vtrgid = {vtrgid} WHERE vtrgid = {old}");
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var type in _actList.Where(a => !_actIds.ContainsKey(a))) {
                 if (type.VtrgId == null) continue;
-                await Context.AddAsync(type);
+                ctx.Add(type);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
         }
 
         private void AreaCommitmentTypeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
@@ -69,8 +73,8 @@ namespace Elwig.Windows {
             _actUpdate = true;
             if (AreaCommitmentTypeList.SelectedItem is AreaComType type) {
                 AreaCommitmentTypeIdInput.Text = $"{type.SortId}{type.AttrId}";
-                ControlUtils.SelectComboBoxItem(AreaCommitmentTypeWineVariantInput, s => (s as WineVar)?.SortId, type.SortId);
-                ControlUtils.SelectComboBoxItem(AreaCommitmentTypeWineAttributeInput, a => (a as WineAttr)?.AttrId, type.AttrId);
+                ControlUtils.SelectItemWithPk(AreaCommitmentTypeWineVariantInput, type.SortId);
+                ControlUtils.SelectItemWithPk(AreaCommitmentTypeWineAttributeInput, type.AttrId);
                 AreaCommitmentTypeMinKgPerHaInput.Text = $"{type.MinKgPerHa}";
                 AreaCommitmentTypePenaltyPerKgInput.Text = $"{type.PenaltyPerKg}";
                 AreaCommitmentTypePenaltyInput.Text = $"{type.PenaltyAmount}";
@@ -90,7 +94,7 @@ namespace Elwig.Windows {
         private void AreaCommitmentTypeAddButton_Click(object sender, RoutedEventArgs evt) {
             if (_actList == null) return;
             _actChanged = true;
-            var item = Context.CreateProxy<AreaComType>();
+            var item = new AreaComType { VtrgId = "", SortId = "" };
             _actList.Add(item);
             AreaCommitmentTypeList.SelectedItem = item;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -18,16 +18,22 @@ namespace Elwig.Windows {
         private bool _branchChanged = false;
         private bool _branchUpdate = false;
 
-        private void BranchesInitEditing() {
-            _branchList = new(Context.Branches.OrderBy(b => b.Name).ToList());
+        private async Task BranchesInitEditing(AppDbContext ctx) {
+            _branchList = new(await ctx.Branches
+                .OrderBy(b => b.Name)
+                .Include(b => b.PostalDest!.AtPlz)
+                .ToListAsync());
             _branches = _branchList.ToDictionary(b => b.ZwstId, b => (string?)b.ZwstId);
             _branchIds = _branchList.ToDictionary(b => b, b => b.ZwstId);
-            ControlUtils.RenewItemsSource(BranchList, _branchList, b => (b as Branch)?.ZwstId);
+            ControlUtils.RenewItemsSource(BranchList, _branchList);
             BranchList_SelectionChanged(null, null);
         }
 
-        private void BranchesFinishEditing() {
-            ControlUtils.RenewItemsSource(BranchList, Context.Branches.OrderBy(b => b.Name).ToList(), b => (b as Branch)?.ZwstId);
+        private async Task BranchesFinishEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
+                .OrderBy(b => b.Name)
+                .Include(b => b.PostalDest!.AtPlz)
+                .ToListAsync());
             _branchList = null;
             _branches = null;
             _branchIds = null;
@@ -37,31 +43,31 @@ namespace Elwig.Windows {
             BranchDeleteButton.IsEnabled = false;
         }
 
-        private async Task BranchesSave() {
+        private async Task BranchesSave(AppDbContext ctx) {
             if (!_branchChanged || _branchList == null || _branches == null || _branchIds == null)
                 return;
 
             foreach (var (zwstid, _) in _branches.Where(b => b.Value == null)) {
-                Context.Remove(Context.Branches.Find(zwstid));
+                ctx.Remove(ctx.Branches.Find(zwstid)!);
             }
             foreach (var (branch, old) in _branchIds) {
                 branch.ZwstId = old;
             }
             foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
-                Context.Update(Context.Branches.Find(old));
+                ctx.Update(ctx.Branches.Find(old)!);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var (old, zwstid) in _branches.Where(b => b.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE branch SET zwstid = {zwstid} WHERE zwstid = {old}");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE branch SET zwstid = {zwstid} WHERE zwstid = {old}");
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var branch in _branchList.Where(b => !_branchIds.ContainsKey(b))) {
                 if (branch.ZwstId == null) continue;
-                await Context.AddAsync(branch);
+                ctx.Add(branch);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
         }
 
         private void BranchList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
@@ -79,7 +85,7 @@ namespace Elwig.Windows {
                 BranchIdInput.Text = branch.ZwstId;
                 BranchNameInput.Text = branch.Name;
                 BranchPlzInput.Text = branch.PostalDest?.AtPlz?.Plz.ToString() ?? "";
-                ControlUtils.SelectComboBoxItem(BranchOrtInput, o => (o as AT_PlzDest)?.Okz, branch.PostalDest?.AtPlz?.Okz);
+                ControlUtils.SelectItem(BranchOrtInput, branch.PostalDest?.AtPlz);
                 BranchAddressInput.Text = branch.Address;
                 BranchPhoneNrInput.Text = branch.PhoneNr;
                 BranchFaxNrInput.Text = branch.FaxNr;
@@ -91,7 +97,7 @@ namespace Elwig.Windows {
         private void BranchAddButton_Click(object sender, RoutedEventArgs evt) {
             if (_branchList == null) return;
             _branchChanged = true;
-            var item = Context.CreateProxy<Branch>();
+            var item = new Branch { ZwstId = "", Name = "" };
             _branchList.Add(item);
             BranchList.SelectedItem = item;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -1,5 +1,6 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
+using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -18,19 +19,19 @@ namespace Elwig.Windows {
         private bool _modChanged = false;
         private bool _modUpdate = false;
 
-        private void ModifiersInitEditing() {
+        private async Task ModifiersInitEditing(AppDbContext ctx) {
             SeasonList.IsEnabled = false;
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            _modList = new(Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToList());
+            _modList = new(await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync());
             _mods = _modList.ToDictionary(m => m.ModId, m => (string?)m.ModId);
             _modIds = _modList.ToDictionary(m => m, m => m.ModId);
-            ControlUtils.RenewItemsSource(SeasonModifierList, _modList, m => (m as Modifier)?.ModId);
+            ControlUtils.RenewItemsSource(SeasonModifierList, _modList);
             SeasonModifierList_SelectionChanged(null, null);
         }
 
-        private void ModifiersFinishEditing() {
+        private async Task ModifiersFinishEditing(AppDbContext ctx) {
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            ControlUtils.RenewItemsSource(SeasonModifierList, Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToList(), m => (m as Modifier)?.ModId);
+            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync());
             _modList = null;
             _mods = null;
             _modIds = null;
@@ -43,7 +44,7 @@ namespace Elwig.Windows {
             SeasonList.IsEnabled = true;
         }
 
-        private async Task ModifiersSave() {
+        private async Task ModifiersSave(AppDbContext ctx) {
             if (!_modChanged || _modList == null || _mods == null || _modIds == null)
                 return;
 
@@ -52,26 +53,26 @@ namespace Elwig.Windows {
 
             var year = (SeasonList.SelectedItem as Season)?.Year;
             foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
-                Context.Remove(Context.Modifiers.Find(year, modid)!);
+                ctx.Remove(ctx.Modifiers.Find(year, modid)!);
             }
             foreach (var (mod, old) in _modIds) {
                 mod.ModId = old;
             }
             foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
-                Context.Update(Context.Modifiers.Find(year, old)!);
+                ctx.Update(ctx.Modifiers.Find(year, old)!);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE modifier SET modid = {modid} WHERE (year, modid) = ({year}, {old})");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE modifier SET modid = {modid} WHERE (year, modid) = ({year}, {old})");
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var mod in _modList.Where(m => !_modIds.ContainsKey(m))) {
                 if (mod.ModId == null) continue;
-                await Context.AddAsync(mod);
+                await ctx.AddAsync(mod);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
         }
 
         private void SeasonModifierUpButton_Click(object sender, RoutedEventArgs evt) {
@@ -102,11 +103,7 @@ namespace Elwig.Windows {
             if (_modList == null || SeasonList.SelectedItem is not Season s) return;
             _modChanged = true;
             var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : _modList.Count;
-            var item = new Modifier {
-                Year = s.Year,
-                ModId = "",
-                Name = "",
-            };
+            var item = new Modifier { Year = s.Year, ModId = "", Name = "" };
             _modList.Insert(idx, item);
             SeasonModifierList.SelectedIndex = idx;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -12,27 +12,27 @@ namespace Elwig.Windows {
         private bool _seasonChanged = false;
         private bool _seasonUpdate = false;
 
-        private void SeasonsInitEditing() {
-            ControlUtils.RenewItemsSource(SeasonList, Context.Seasons.OrderByDescending(s => s.Year).ToList(), s => (s as Season)?.Year);
+        private async Task SeasonsInitEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync());
             SeasonList_SelectionChanged(null, null);
         }
 
-        private void SeasonsFinishEditing() {
-            ControlUtils.RenewItemsSource(SeasonList, Context.Seasons.OrderByDescending(s => s.Year).ToList(), s => (s as Season)?.Year);
+        private async Task SeasonsFinishEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons.OrderByDescending(s => s.Year).Include(s => s.Modifiers).ToListAsync());
             _seasonChanged = false;
         }
 
-        private async Task SeasonsSave() {
+        private async Task SeasonsSave(AppDbContext ctx) {
             if (!_seasonChanged || SeasonList.SelectedItem is not Season s)
                 return;
-            Context.Update(s);
-            await Context.SaveChangesAsync();
+            ctx.Update(s);
+            await ctx.SaveChangesAsync();
         }
 
-        private async void SeasonList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+        private void SeasonList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             _seasonUpdate = true;
             if (SeasonList.SelectedItem is Season s) {
-                SeasonModifierList.ItemsSource = await Context.Modifiers.Where(m => m.Year == s.Year).OrderBy(m => m.Ordering).ToListAsync();
+                SeasonModifierList.ItemsSource = s.Modifiers.OrderBy(m => m.Ordering).ToList();
                 SeasonMaxKgPerHaInput.Text = s.MaxKgPerHa.ToString();
                 SeasonVatNormalInput.Text = (s.VatNormal * 100).ToString();
                 SeasonVatFlatrateInput.Text = (s.VatFlatrate * 100).ToString();

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -18,16 +18,16 @@ namespace Elwig.Windows {
         private bool _attrChanged = false;
         private bool _attrUpdate = false;
 
-        private void WineAttributesInitEditing() {
-            _attrList = new(Context.WineAttributes.OrderBy(a => a.Name).ToList());
+        private async Task WineAttributesInitEditing(AppDbContext ctx) {
+            _attrList = new(await ctx.WineAttributes.OrderBy(a => a.Name).ToListAsync());
             _attrs = _attrList.ToDictionary(a => a.AttrId, a => (string?)a.AttrId);
             _attrIds = _attrList.ToDictionary(a => a, a => a.AttrId);
-            ControlUtils.RenewItemsSource(WineAttributeList, _attrList, a => (a as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(WineAttributeList, _attrList);
             WineAttributeList_SelectionChanged(null, null);
         }
 
-        private void WineAttributesFinishEditing() {
-            ControlUtils.RenewItemsSource(WineAttributeList, Context.WineAttributes.OrderBy(a => a.Name).ToList(), a => (a as WineAttr)?.AttrId);
+        private async Task WineAttributesFinishEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.WineAttributes.OrderBy(a => a.Name).ToListAsync());
             _attrList = null;
             _attrs = null;
             _attrIds = null;
@@ -37,31 +37,31 @@ namespace Elwig.Windows {
             WineAttributeDeleteButton.IsEnabled = false;
         }
 
-        private async Task WineAttributesSave() {
+        private async Task WineAttributesSave(AppDbContext ctx) {
             if (!_attrChanged || _attrList == null || _attrs == null || _attrIds == null)
                 return;
 
             foreach (var (attrid, _) in _attrs.Where(a => a.Value == null)) {
-                Context.Remove(Context.WineAttributes.Find(attrid));
+                ctx.Remove(ctx.WineAttributes.Find(attrid)!);
             }
             foreach (var (attr, old) in _attrIds) {
                 attr.AttrId = old;
             }
             foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
-                Context.Update(Context.WineAttributes.Find(old));
+                ctx.Update(ctx.WineAttributes.Find(old)!);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var (old, attrid) in _attrs.Where(a => a.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE wine_attribute SET attrid = {attrid} WHERE attrid = {old}");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE wine_attribute SET attrid = {attrid} WHERE attrid = {old}");
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var attr in _attrList.Where(a => !_attrIds.ContainsKey(a))) {
                 if (attr.AttrId == null) continue;
-                await Context.AddAsync(attr);
+                ctx.Add(attr);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
         }
 
         private void WineAttributeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
@@ -88,7 +88,7 @@ namespace Elwig.Windows {
         private void WineAttributeAddButton_Click(object sender, RoutedEventArgs evt) {
             if (_attrList == null) return;
             _attrChanged = true;
-            var item = Context.CreateProxy<WineAttr>();
+            var item = new WineAttr { AttrId = "", Name = "" };
             _attrList.Add(item);
             WineAttributeList.SelectedItem = item;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -18,16 +18,16 @@ namespace Elwig.Windows {
         private bool _cultChanged = false;
         private bool _cultUpdate = false;
 
-        private void WineCultivationsInitEditing() {
-            _cultList = new(Context.WineCultivations.OrderBy(c => c.Name).ToList());
+        private async Task WineCultivationsInitEditing(AppDbContext ctx) {
+            _cultList = new(await ctx.WineCultivations.OrderBy(c => c.Name).ToListAsync());
             _cults = _cultList.ToDictionary(c => c.CultId, c => (string?)c.CultId);
             _cultIds = _cultList.ToDictionary(c => c, c => c.CultId);
-            ControlUtils.RenewItemsSource(WineCultivationList, _cultList, c => (c as WineCult)?.CultId);
+            ControlUtils.RenewItemsSource(WineCultivationList, _cultList);
             WineCultivationList_SelectionChanged(null, null);
         }
 
-        private void WineCultivationsFinishEditing() {
-            ControlUtils.RenewItemsSource(WineCultivationList, Context.WineCultivations.OrderBy(c => c.Name).ToList(), c => (c as WineCult)?.CultId);
+        private async Task WineCultivationsFinishEditing(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.WineCultivations.OrderBy(c => c.Name).ToListAsync());
             _cultList = null;
             _cults = null;
             _cultIds = null;
@@ -37,31 +37,31 @@ namespace Elwig.Windows {
             WineCultivationDeleteButton.IsEnabled = false;
         }
 
-        private async Task WineCultivationsSave() {
+        private async Task WineCultivationsSave(AppDbContext ctx) {
             if (!_cultChanged || _cultList == null || _cults == null || _cultIds == null)
                 return;
 
             foreach (var (cultid, _) in _cults.Where(c => c.Value == null)) {
-                Context.Remove(Context.WineCultivations.Find(cultid));
+                ctx.Remove(ctx.WineCultivations.Find(cultid)!);
             }
             foreach (var (cult, old) in _cultIds) {
                 cult.CultId = old;
             }
             foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
-                Context.Update(Context.WineCultivations.Find(old));
+                ctx.Update(ctx.WineCultivations.Find(old)!);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var (old, cultid) in _cults.Where(c => c.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE wine_cultivation SET cultid = {cultid} WHERE cultid = {old}");
+                await ctx.Database.ExecuteSqlAsync($"UPDATE wine_cultivation SET cultid = {cultid} WHERE cultid = {old}");
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
 
             foreach (var cult in _cultList.Where(c => !_cultIds.ContainsKey(c))) {
                 if (cult.CultId == null) continue;
-                await Context.AddAsync(cult);
+                ctx.Add(cult);
             }
-            await Context.SaveChangesAsync();
+            await ctx.SaveChangesAsync();
         }
 
         private void WineCultivationList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
@@ -82,7 +82,7 @@ namespace Elwig.Windows {
         private void WineCultivationAddButton_Click(object sender, RoutedEventArgs evt) {
             if (_cultList == null) return;
             _cultChanged = true;
-            var item = Context.CreateProxy<WineCult>();
+            var item = new WineCult { CultId = "", Name = "" };
             _cultList.Add(item);
             WineCultivationList.SelectedItem = item;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -10,6 +10,8 @@ using System.Windows.Controls;
 namespace Elwig.Windows {
     public partial class BaseDataWindow : AdministrationWindow {
 
+        protected AppDbContext? EditContext;
+
         public BaseDataWindow() {
             InitializeComponent();
             RequiredInputs = [
@@ -35,6 +37,10 @@ namespace Elwig.Windows {
             WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
         }
 
+        protected override void ShortcutNew() { }
+
+        protected override void ShortcutDelete() { }
+
         new protected void LockInputs() {
             base.LockInputs();
 
@@ -131,20 +137,38 @@ namespace Elwig.Windows {
             LockInputs();
         }
 
-        protected override async Task OnRenewContext() {
-            await base.OnRenewContext();
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            await base.OnRenewContext(ctx);
             FillInputs(App.Client);
-            ControlUtils.RenewItemsSource(SeasonList, await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync(), s => (s as Season)?.Year, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(SeasonList, await ctx.Seasons
+                .OrderByDescending(s => s.Year)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            ControlUtils.RenewItemsSource(BranchList, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), b => (b as Branch)?.ZwstId, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(WineAttributeList, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), a => (a as WineAttr)?.AttrId, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineVariantInput, await Context.WineVarieties.OrderBy(s => s.Name).ToListAsync(), s => (s as WineVar)?.SortId);
-            var attrList = await Context.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            ControlUtils.RenewItemsSource(BranchList, await ctx.Branches
+                .OrderBy(b => b.Name)
+                .Include(b => b.PostalDest!.AtPlz)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineAttributeList, await ctx.WineAttributes
+                .OrderBy(a => a.Name)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineVariantInput, await ctx.WineVarieties
+                .OrderBy(s => s.Name)
+                .ToListAsync());
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
             attrList.Insert(0, new NullItem(""));
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineAttributeInput, attrList, a => (a as WineAttr)?.AttrId);
-            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), v => (v as AreaComType)?.VtrgId, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(WineCultivationList, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), c=> (c as WineCult)?.CultId, null, ControlUtils.RenewSourceDefault.First);
-            ControlUtils.RenewItemsSource(SeasonModifierList, await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync(), m => (m as Modifier)?.ModId, null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeWineAttributeInput, attrList);
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, await ctx.AreaCommitmentTypes
+                .OrderBy(t => t.VtrgId)
+                .Include(t => t.WineVar)
+                .Include(t => t.WineAttr)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(WineCultivationList, await ctx.WineCultivations
+                .OrderBy(c => c.Name)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(SeasonModifierList, await ctx.Modifiers
+                .Where(m => m.Year == year)
+                .OrderBy(m => m.Ordering)
+                .ToListAsync(), null, ControlUtils.RenewSourceDefault.First);
         }
 
         protected override void UpdateButtons() {
@@ -174,23 +198,59 @@ namespace Elwig.Windows {
             App.FocusOriginHierarchy();
         }
 
-        private void EditButton_Click(object sender, RoutedEventArgs evt) {
+        private async Task InitEditing() {
+            EditContext = new AppDbContext();
+            await BranchesInitEditing(EditContext);
+            await WineAttributesInitEditing(EditContext);
+            await WineCultivationsInitEditing(EditContext);
+            await AreaCommitmentTypesInitEditing(EditContext);
+            await SeasonsInitEditing(EditContext);
+            await ModifiersInitEditing(EditContext);
+        }
+
+        private async Task Save() {
+            await UpdateClientParameters(App.Client);
+            using var tx = await EditContext!.Database.BeginTransactionAsync();
+            await BranchesSave(EditContext!);
+            await WineAttributesSave(EditContext!);
+            await WineCultivationsSave(EditContext!);
+            await AreaCommitmentTypesSave(EditContext!);
+            await SeasonsSave(EditContext!);
+            await ModifiersSave(EditContext!);
+            await tx.CommitAsync();
+        }
+
+        private async Task FinishEditing() {
+            EditContext?.Dispose();
+            EditContext = null;
+            using var ctx = new AppDbContext();
+            await BranchesFinishEditing(ctx);
+            await WineAttributesFinishEditing(ctx);
+            await WineCultivationsFinishEditing(ctx);
+            await AreaCommitmentTypesFinishEditing(ctx);
+            await SeasonsFinishEditing(ctx);
+            await ModifiersFinishEditing(ctx);
+        }
+
+
+        protected override void ShortcutEdit() {
+            if (!EditButton.IsEnabled || EditButton.Visibility != Visibility.Visible)
+                return;
+            EditButton_Click(null, null);
+        }
+
+        private async void EditButton_Click(object? sender, RoutedEventArgs? evt) {
             IsEditing = true;
             EditButton.Visibility = Visibility.Hidden;
             ResetButton.Visibility = Visibility.Visible;
 
-            BranchesInitEditing();
-            WineAttributesInitEditing();
-            WineCultivationsInitEditing();
-            AreaCommitmentTypesInitEditing();
-            SeasonsInitEditing();
-            ModifiersInitEditing();
+            await InitEditing();
 
             UnlockInputs();
             UpdateButtons();
         }
 
-        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
+        private async void CancelButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = false;
             IsCreating = false;
             EditButton.Visibility = Visibility.Visible;
@@ -199,47 +259,41 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
 
-            Context.ChangeTracker.Clear();
-            BranchesFinishEditing();
-            WineCultivationsFinishEditing();
-            WineAttributesFinishEditing();
-            AreaCommitmentTypesFinishEditing();
-            SeasonsFinishEditing();
-            ModifiersFinishEditing();
+            await FinishEditing();
 
             ClearInputStates();
             FillInputs(App.Client);
             LockInputs();
         }
 
-        private void ResetButton_Click(object sender, RoutedEventArgs evt) {
+        protected override void ShortcutReset() {
+            if (!ResetButton.IsEnabled || ResetButton.Visibility != Visibility.Visible)
+                return;
+            ResetButton_Click(null, null);
+        }
+
+        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
             _branchChanged = false;
             _attrChanged = false;
             _cultChanged = false;
             _modChanged = false;
-            Context.ChangeTracker.Clear();
 
-            BranchesInitEditing();
-            WineAttributesInitEditing();
-            WineCultivationsInitEditing();
-            AreaCommitmentTypesInitEditing();
-            SeasonsInitEditing();
-            ModifiersInitEditing();
+            await InitEditing();
 
             ClearInputStates();
             FillInputs(App.Client);
             UpdateButtons();
         }
 
-        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
+        protected override void ShortcutSave() {
+            if (!SaveButton.IsEnabled || SaveButton.Visibility != Visibility.Visible)
+                return;
+            SaveButton_Click(null, null);
+        }
+
+        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
             try {
-                await UpdateClientParameters(App.Client);
-                await BranchesSave();
-                await WineAttributesSave();
-                await WineCultivationsSave();
-                await AreaCommitmentTypesSave();
-                await SeasonsSave();
-                await ModifiersSave();
+                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;
@@ -254,12 +308,7 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
 
-            BranchesFinishEditing();
-            WineAttributesFinishEditing();
-            WineCultivationsFinishEditing();
-            AreaCommitmentTypesFinishEditing();
-            SeasonsFinishEditing();
-            ModifiersFinishEditing();
+            await FinishEditing();
 
             ClearInputStates();
             FillInputs(App.Client);

Elwig/Windows/ChartWindow.xaml.cs

@@ -74,8 +74,9 @@ namespace Elwig.Windows {
             InitializeComponent();
             Year = year;
             AvNr = avnr;
-            Season = Context.Seasons.Find(year) ?? throw new ArgumentException("Season not found");
-            PaymentVar = Context.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
+            using var ctx = new AppDbContext();
+            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("Season not found");
+            PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
             Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
             LockContext = true;
         }
@@ -99,16 +100,16 @@ namespace Elwig.Windows {
             SaveButton.IsEnabled = hasChanged;
         }
 
-        private async Task RefreshGraphList() {
-            PaymentVar = await Context.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
-            Season = await Context.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
+        private async Task RefreshGraphList(AppDbContext ctx) {
+            PaymentVar = await ctx.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
+            Season = await ctx.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
 
             try {
-                var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetVaributes(Context, Year));
-                var paymentEntries = data.GetPaymentGraphEntries(Context, Season);
+                var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetVaributes(ctx, Year));
+                var paymentEntries = data.GetPaymentGraphEntries(ctx, Season);
                 GraphEntries = [
                     ..paymentEntries,
-                    ..data.GetQualityGraphEntries(Context, Season, paymentEntries.Any() ? paymentEntries.Max(e => e.Id) : 0)
+                    ..data.GetQualityGraphEntries(ctx, Season, paymentEntries.Any() ? paymentEntries.Max(e => e.Id) : 0)
                 ];
             } catch (KeyNotFoundException ex) {
                 var key = ex.Message.Split('\'')[1].Split('\'')[0];
@@ -123,7 +124,7 @@ namespace Elwig.Windows {
                 MessageBox.Show("Fehler beim Laden der Auszahlungsvariante:\n\n" + ex.Message, "Fehler",
                     MessageBoxButton.OK, MessageBoxImage.Error);
             }
-            Vaributes = Utils.GetVaributeList(Context, Year);
+            Vaributes = Utils.GetVaributeList(ctx, Year);
             GraphEntries.ForEach(e => {
                 e.Vaributes.ForEach(v => {
                     var found = Vaributes.Find(a => a.Variety?.SortId == v.Variety?.SortId && a.Attribute?.AttrId == v.Attribute?.AttrId && a.Cultivation?.CultId == v.Cultivation?.CultId);
@@ -137,9 +138,9 @@ namespace Elwig.Windows {
             });
 
             FillingInputs = true;
-            ControlUtils.RenewItemsSource(VaributeInput, Vaributes, v => (v as Varibute)?.Listing);
+            ControlUtils.RenewItemsSource(VaributeInput, Vaributes);
             FillingInputs = false;
-            ControlUtils.RenewItemsSource(GraphList, GraphEntries, g => (g as GraphEntry)?.VaributeStringChange, GraphList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(GraphList, GraphEntries, GraphList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
 
             RefreshInputs();
         }
@@ -192,15 +193,15 @@ namespace Elwig.Windows {
                 GebundenFlatBonus.Text = "";
             }
 
-            ControlUtils.SelectCheckComboBoxItems(VaributeInput, SelectedGraphEntry?.Vaributes ?? [], i => (i as Varibute)?.Listing);
+            ControlUtils.SelectItems(VaributeInput, SelectedGraphEntry?.Vaributes ?? []);
 
             InitPlot();
             OechslePricePlot.IsEnabled = true;
             FillingInputs = false;
         }
 
-        protected override async Task OnRenewContext() {
-            await RefreshGraphList();
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            await RefreshGraphList(ctx);
         }
 
         private void InitPlot() {
@@ -505,9 +506,9 @@ namespace Elwig.Windows {
                 PrimaryMarkedPoint = Highlighted.Index;
                 if (ActiveGraph != Highlighted.Graph) ChangeActiveGraph(Highlighted.Graph);
 
-                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
+                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph!.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
 
-                OechsleInput.Text = Highlighted.Graph.GetOechsleAt(Highlighted.Index).ToString();
+                OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
                 PriceInput.Text = Highlighted.Graph.GetPriceAt(Highlighted.Index).ToString();
 
                 EnableActionButtons();
@@ -643,20 +644,18 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs e) {
-            var origData = BillingData.FromJson(PaymentVar.Data);
-            var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(Context, Year),
-                AllVaributesAssigned, AllVaributesAssignedAbgew);
-
-            EntityEntry<PaymentVar>? tr = null;
             try {
+                using var ctx = new AppDbContext();
+                var origData = BillingData.FromJson(PaymentVar.Data);
+                var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
+                    AllVaributesAssigned, AllVaributesAssignedAbgew);
+
                 PaymentVar.Data = data.ToJsonString();
-                tr = Context.Update(PaymentVar);
-                await Context.SaveChangesAsync();
+                ctx.Update(PaymentVar);
+                await ctx.SaveChangesAsync();
                 LockContext = false;
-                tr = null;
                 await App.HintContextChange();
             } catch (Exception exc) {
-                if (tr != null) await tr.ReloadAsync();
                 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);

Elwig/Windows/ContextWindow.cs

@@ -2,50 +2,55 @@ using Elwig.Helpers;
 using System;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Threading;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public abstract class ContextWindow : Window {
 
-        public static readonly int RenewSec = 10;
+        private bool _lockContext = false;
+        protected bool LockContext {
+            get => _lockContext;
+            set {
+                _lockContext = value;
+                if (!_lockContext && _renewPending) {
+                    Dispatcher.BeginInvoke(async () => await RenewContext());
+                }
+            }
+        }
 
-        protected AppDbContext Context { get; private set; }
-        protected bool LockContext { get; set; } = false;
-
-        private readonly DispatcherTimer _timer;
         private bool _renewPending = false;
 
+        private readonly RoutedCommand CtrlR = new("CtrlR", typeof(ContextWindow), [new KeyGesture(Key.R, ModifierKeys.Control)]);
+        private readonly RoutedCommand F5 = new("F5", typeof(ContextWindow), [new KeyGesture(Key.F5)]);
+
         public ContextWindow() : base() {
-            _timer = new DispatcherTimer();
-            _timer.Tick += new EventHandler(OnShouldRenewContext);
-            _timer.Interval = new TimeSpan(0, 0, RenewSec);
-            _timer.Start();
-            Context = new();
+            CommandBindings.Add(new CommandBinding(CtrlR, ForceContextReload));
+            CommandBindings.Add(new CommandBinding(F5, ForceContextReload));
             Loaded += OnLoaded;
         }
 
+        public async void ForceContextReload(object sender, EventArgs evt) {
+            await HintContextChange();
+        }
+
         public async Task HintContextChange() {
             _renewPending = true;
             if (LockContext) return;
             await RenewContext();
         }
 
-        private async void OnShouldRenewContext(object? sender, EventArgs? evt) {
-            if (!Context.HasBackendChanged) return;
-            await HintContextChange();
-        }
-
         protected async void OnLoaded(object? sender, RoutedEventArgs? evt) {
-            await OnRenewContext();
+            using var ctx = new AppDbContext();
+            await OnRenewContext(ctx);
         }
 
         protected async Task RenewContext() {
             if (!_renewPending) return;
-            Context = new();
-            await OnRenewContext();
+            using var ctx = new AppDbContext();
+            await OnRenewContext(ctx);
             _renewPending = false;
         }
 
-        abstract protected Task OnRenewContext();
+        abstract protected Task OnRenewContext(AppDbContext ctx);
     }
 }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -1,8 +1,6 @@
 <local:AdministrationWindow x:Class="Elwig.Windows.DeliveryAdminWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:ctrl="clr-namespace:Elwig.Controls"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -54,24 +52,52 @@
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Drucken">
-                <MenuItem x:Name="Menu_Print_ShowDeliveryNote" Header="Lieferschein anzeigen" IsEnabled="False"
-                          Click="Menu_Print_ShowDeliveryNote_Click"/>
-                <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
-                          Click="Menu_Print_PrintDeliveryNote_Click"/>
-                <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
-                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen"
-                              Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
-                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken"
-                              Click="Menu_Print_DeliveryJournal_PrintToday_Click"/>
-                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen"
-                              Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/>
-                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken"
-                              Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/>
-                </MenuItem>
+            <MenuItem Header="Lieferschein">
+                <MenuItem x:Name="Menu_DeliveryNote_Show" Header="...anzeigen (PDF)" IsEnabled="False"
+                          Click="Menu_DeliveryNote_Show_Click" InputGestureText="Strg+P"/>
+                <MenuItem x:Name="Menu_DeliveryNote_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
+                          Click="Menu_DeliveryNote_SavePdf_Click"/>
+                <MenuItem x:Name="Menu_DeliveryNote_Print" Header="...drucken" IsEnabled="False"
+                          Click="Menu_DeliveryNote_Print_Click" InputGestureText="Strg+Shift+P"/>
+                <MenuItem x:Name="Menu_DeliveryNote_Email" Header="...per E-Mail schicken" IsEnabled="False"
+                          Click="Menu_DeliveryNote_Email_Click"/>
             </MenuItem>
-            <MenuItem Header="Exportieren">
-                <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
+            <MenuItem Header="Lieferjournal">
+                <MenuItem x:Name="Menu_DeliveryJournal_SaveFilters" Header="...aus Filtern speichern... (Excel)"
+                          Click="Menu_DeliveryJournal_SaveFilters_Click" InputGestureText="Strg+L"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
+                          Click="Menu_DeliveryJournal_ShowFilters_Click" InputGestureText="Strg+O"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
+                          Click="Menu_DeliveryJournal_SavePdfFilters_Click"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_PrintFilters" Header="...aus Filtern drucken"
+                          Click="Menu_DeliveryJournal_PrintFilters_Click" InputGestureText="Strg+Shift+O"/>
+                <Separator/>
+                <MenuItem x:Name="Menu_DeliveryJournal_SaveToday" Header="...von heute speichern... (Excel)"
+                          Click="Menu_DeliveryJournal_SaveToday_Click"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_ShowToday" Header="...von heute anzeigen (PDF)"
+                          Click="Menu_DeliveryJournal_ShowToday_Click"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_SavePdfToday" Header="...von heute speichern... (PDF)"
+                          Click="Menu_DeliveryJournal_SavePdfToday_Click"/>
+                <MenuItem x:Name="Menu_DeliveryJournal_PrintToday" Header="...von heute drucken"
+                          Click="Menu_DeliveryJournal_PrintToday_Click" InputGestureText="Strg+J"/>
+            </MenuItem>
+            <MenuItem Header="Qualitätsstatistik">
+                <MenuItem x:Name="Menu_WineQualityStatistics_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
+                          Click="Menu_WineQualityStatistics_ShowFilters_Click"/>
+                <MenuItem x:Name="Menu_WineQualityStatistics_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
+                          Click="Menu_WineQualityStatistics_SavePdfFilters_Click"/>
+                <MenuItem x:Name="Menu_WineQualityStatistics_PrintFilters" Header="...aus Filtern drucken"
+                          Click="Menu_WineQualityStatistics_PrintFilters_Click"/>
+                <Separator/>
+                <MenuItem x:Name="Menu_WineQualityStatistics_ShowToday" Header="...von heute anzeigen (PDF)"
+                          Click="Menu_WineQualityStatistics_ShowToday_Click"/>
+                <MenuItem x:Name="Menu_WineQualityStatistics_SavePdfToday" Header="...von heute speichern... (PDF)"
+                          Click="Menu_WineQualityStatistics_SavePdfToday_Click"/>
+                <MenuItem x:Name="Menu_WineQualityStatistics_PrintToday" Header="...von heute drucken"
+                          Click="Menu_WineQualityStatistics_PrintToday_Click" InputGestureText="Strg+Q"/>
+            </MenuItem>
+            <MenuItem Header="BKI">
+                <MenuItem x:Name="Menu_Bki_SaveList" Header="Traubentransportscheinliste speichern..."/>
             </MenuItem>
             <MenuItem Header="Einstellungen">
                 <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
@@ -95,6 +121,7 @@
                      TextChanged="SearchInput_TextChanged">
                 <TextBox.ToolTip>
                     <TextBlock>
+                        <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
                         Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
                         Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
                         <LineBreak/>
@@ -110,6 +137,10 @@
                         <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
                         <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                         <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
+                        <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
+                        <Bold>Handlese</Bold>: Handl[ese], !handl[ese] (alle ohne Handlese)<LineBreak/>
+                        <Bold>Gebunden</Bold>: geb[unden], ungeb[unden], !geb[unden], !ungeb[unden]<LineBreak/>
+                        <Bold>Brutto/Netto Wiegung</Bold>: bto, Brut[to], nto, Net[to], gerebelt, !Gerebelt<LineBreak/>
                         <Bold>Freitext</Bold>: z.B. Lieferscheinnummern, Anmerkung, "quw" (sucht nach dem Text "quw")
                     </TextBlock>
                 </TextBox.ToolTip>
@@ -172,6 +203,7 @@
                     </DataGridTextColumn>
                     <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
                     <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
+                    <DataGridTextColumn Header="Zu-/Abschläge" Binding="{Binding FilteredModifiersString}" Width="150"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -183,33 +215,61 @@
                     ToolTip="Neue Teillieferung auf selben Lieferschein hinzufügen"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
                     Click="NewDeliveryPartButton_Click"/>
-            <Button x:Name="CancelCreatingButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden"
+                <Button x:Name="CancelCreatingButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelCreatingButton_Click"/>
+                    Click="CancelCreatingButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
 
             <Button x:Name="NewDeliveryButton" Content="Neu" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="NewDeliveryButton_Click"/>
+                    Click="NewDeliveryButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="AbwertenButton" Content="Abwerten" IsEnabled="False" 
                     ToolTip="Ausgewählte Teillieferung vollständig oder teilweise abwerten"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
                     Click="AbwertenButton_Click"/>
             <Button x:Name="EditDeliveryButton" Content="Bearbeiten" IsEnabled="False"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="EditDeliveryButton_Click"/>
+                    Click="EditDeliveryButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="DeleteDeliveryButton" Content="Löschen" IsEnabled="False"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="DeleteDeliveryButton_Click"/>
+                    Click="DeleteDeliveryButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
+                </Button.ToolTip>
+            </Button>
 
             <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="SaveButton_Click"/>
+                    Click="SaveButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="ResetButton_Click"/>
+                    Click="ResetButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelButton_Click"/>
+                    Click="CancelButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
         </Grid>
 
         <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
@@ -396,10 +456,10 @@
 
                     <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
-                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
+                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed" Click="HandPickedInput_Changed"/>
                     <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
-                              Checked="HandPickedInput_Changed" Unchecked="HandPickedInput_Changed"/>
+                              Checked="HandPickedInput_Changed" Unchecked="HandPickedInput_Changed" Click="HandPickedInput_Changed"/>
                 </Grid>
             </GroupBox>
 

Elwig/Windows/MailWindow.xaml

@@ -85,14 +85,20 @@
                         <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"/>
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/>
                         <TextBox x:Name="CreditNoteFooterInput" Grid.Column="1"
                                  Margin="0,10,10,10" Height="Auto" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
-                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible"/>
+                                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"/>
                     </Grid>
                 </GroupBox>
 
-                <GroupBox Header="Adressaten" Margin="10,10,10,47" Grid.Column="1">
+                <TextBox x:Name="PostalLocation" Grid.Column="1"
+                         Margin="10,30,10,10" Width="120" HorizontalAlignment="Left"/>
+                <Label Margin="130,30,10,10" FontSize="14" Grid.Column="1">
+                    <TextBlock>, am <Run x:Name="PostalDate">01.01.2020</Run></TextBlock>
+                </Label>
+
+                <GroupBox Header="Adressaten" Margin="10,70,10,47" Grid.Column="1">
                     <Grid>
                         <RadioButton GroupName="Recipients" x:Name="RecipientsActiveMembersInput" Content="aktive Mitglieder"
                                      Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
@@ -192,7 +198,6 @@
                                  Margin="10,300,10,10"/>
                         <TextBox x:Name="PostalSender2"
                                  Margin="10,330,10,10"/>
-
                     </Grid>
                 </GroupBox>
 

Elwig/Windows/MailWindow.xaml.cs

@@ -90,7 +90,7 @@ namespace Elwig.Windows {
             private set => SetValue(EmailWishCountProperty, value);
         }
 
-        private ICommand _deleteCommand;
+        private ICommand? _deleteCommand;
         public ICommand DeleteCommand => _deleteCommand ??= new ActionCommand(() => {
             var idx = SelectedDocumentsList.SelectedIndex;
             if (idx == -1)
@@ -102,8 +102,10 @@ namespace Elwig.Windows {
         // powershell -Command "$(Get-WmiObject -Class Win32_Printer | Where-Object {$_.Default -eq $True}).Name"
         public MailWindow(int? year = null) {
             InitializeComponent();
-            Year = year ?? Context.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year;
-            Title = $"Rundschreiben - Lese {Year} - Elwig";
+            using (var ctx = new AppDbContext()) {
+                Year = year ?? ctx.Seasons.OrderBy(s => s.Year).LastOrDefault()?.Year;
+                Title = $"Rundschreiben - Lese {Year} - Elwig";
+            }
 
             AvaiableDocumentsList.ItemsSource = AvaiableDocuments;
             SelectedDocumentsList.ItemsSource = SelectedDocs;
@@ -119,12 +121,14 @@ namespace Elwig.Windows {
 
             PostalSender1.Text = App.Client.Sender1;
             PostalSender2.Text = App.Client.Sender2;
+            PostalLocation.Text = App.BranchLocation;
+            PostalDate.Text = $"{Utils.Today:dd.MM.yyyy}";
             EmailSubjectInput.Text = App.Client.TextEmailSubject ?? "Rundschreiben";
             EmailBodyInput.Text = App.Client.TextEmailBody ?? "Sehr geehrtes Mitglied,\n\nim Anhang finden Sie das aktuelle Rundschreiben.\n\nIhre Winzergenossenschaft\n";
         }
 
-        protected override async Task OnRenewContext() {
-            var season = await Context.Seasons.FindAsync(Year);
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            var season = await ctx.Seasons.FindAsync(Year);
             var l = new List<string> {
                 MemberDataSheet.Name
             };
@@ -134,28 +138,44 @@ namespace Elwig.Windows {
             }
             AvaiableDocumentsList.ItemsSource = l;
 
-            ControlUtils.RenewItemsSource(MemberBranchInput, await Context.Branches
+            ControlUtils.RenewItemsSource(MemberBranchInput, await ctx.Branches
                 .Where(b => b.Members.Any())
                 .OrderBy(b => b.Name)
-                .ToListAsync(), b => (b as Branch)?.ZwstId);
-            if (MemberBranchInput.SelectedItems.Count == 0) MemberBranchInput.SelectAll();
-            ControlUtils.RenewItemsSource(MemberKgInput, await Context.Katastralgemeinden
-                .Where(k => k.WbKg.Members.Any())
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberBranchInput.SelectedItems.Count == 0) {
+                MemberBranchInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberBranchInput.SelectAll();
+                MemberBranchInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+            }
+            ControlUtils.RenewItemsSource(MemberKgInput, await ctx.Katastralgemeinden
+                .Where(k => k.WbKg!.Members.Any())
                 .OrderBy(k => k.Name)
-                .ToListAsync(), k => (k as AT_Kg)?.KgNr);
-            if (MemberKgInput.SelectedItems.Count == 0) MemberKgInput.SelectAll();
-            ControlUtils.RenewItemsSource(MemberAreaComInput, await Context.AreaCommitmentTypes
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberKgInput.SelectedItems.Count == 0) {
+                MemberKgInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberKgInput.SelectAll();
+                MemberKgInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+            }
+            ControlUtils.RenewItemsSource(MemberAreaComInput, await ctx.AreaCommitmentTypes
                 .OrderBy(a => a.VtrgId)
-                .ToListAsync(), a => (a as AreaComType)?.VtrgId);
-            if (MemberAreaComInput.SelectedItems.Count == 0) MemberAreaComInput.SelectAll();
-            ControlUtils.RenewItemsSource(MemberCustomInput, await Context.Members
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberAreaComInput.SelectedItems.Count == 0) {
+                MemberAreaComInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberAreaComInput.SelectAll();
+                MemberAreaComInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+            }
+            ControlUtils.RenewItemsSource(MemberCustomInput, await ctx.Members
                 .Where(m => m.IsActive)
                 .OrderBy(m => m.FamilyName)
                 .ThenBy(m => m.GivenName)
-                .ToListAsync(), m => (m as Member)?.MgNr);
-            if (MemberCustomInput.SelectedItems.Count == 0) MemberCustomInput.SelectAll();
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberCustomInput.SelectedItems.Count == 0) {
+                MemberCustomInput.ItemSelectionChanged -= MemberInput_SelectionChanged;
+                MemberCustomInput.SelectAll();
+                MemberCustomInput.ItemSelectionChanged += MemberInput_SelectionChanged;
+            }
 
-            await UpdateRecipients();
+            await UpdateRecipients(ctx);
         }
 
         private void ContinueButton_Click(object sender, RoutedEventArgs evt) {
@@ -227,8 +247,9 @@ namespace Elwig.Windows {
             } else if (idx == 1) {
                 SelectedDocs.Add(new(DocType.DeliveryConfirmation, s, ((int)Year!, DocumentNonDeliverersInput.IsChecked == true)));
             } else if (idx >= 2) {
+                using var ctx = new AppDbContext();
                 var name = s.Split(" – ")[^1];
-                var pv = Context.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
+                var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             }
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
@@ -263,20 +284,22 @@ namespace Elwig.Windows {
             MemberAreaComInput.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
             MemberAreaComLabel.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
             MemberCustomInput.Visibility = RecipientsCustomInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
-            await UpdateRecipients();
+            using var ctx = new AppDbContext();
+            await UpdateRecipients(ctx);
         }
 
         private async void MemberInput_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await UpdateRecipients();
+            using var ctx = new AppDbContext();
+            await UpdateRecipients(ctx);
         }
 
-        private async Task UpdateRecipients() {
+        private async Task UpdateRecipients(AppDbContext ctx) {
             if (RecipientsCustomInput.IsChecked == true) {
                 Recipients = MemberCustomInput.SelectedItems.Cast<Member>().ToList();
             } else {
-                var year = (!await Context.Deliveries.AnyAsync()) ? 0 : await Context.Deliveries.Select(d => d.Year).MaxAsync();
+                var year = (!await ctx.Deliveries.AnyAsync()) ? 0 : await ctx.Deliveries.MaxAsync(d => d.Year);
 
-                IQueryable<Member> query = Context.Members.Where(m => m.IsActive);
+                IQueryable<Member> query = ctx.Members.Where(m => m.IsActive);
                 if (MemberBranchInput.SelectedItems.Count != MemberBranchInput.Items.Count) {
                     var zwst = MemberBranchInput.SelectedItems.Cast<Branch>().Select(b => b.ZwstId).ToList();
                     query = query.Where(m => zwst.Contains(m.ZwstId));
@@ -288,13 +311,22 @@ namespace Elwig.Windows {
 
                 if (RecipientsAreaComMembersInput.IsChecked == true) {
                     var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
-                    query = query.Where(m => m.AreaCommitments.Any(a => a.YearFrom <= year && (a.YearTo == null || a.YearTo >= year) && vtrg.Contains(a.VtrgId)));
+                    query = query.Where(m => Utils.ActiveAreaCommitments(m.AreaCommitments).Any(c => vtrg.Contains(c.VtrgId)));
                 } else if (year > 0 && RecipientsDeliveryMembersInput.IsChecked == true) {
                     query = query.Where(m => m.Deliveries.Any(d => d.Year == year));
                 } else if (year > 0 && RecipientsNonDeliveryMembersInput.IsChecked == true) {
                     query = query.Where(m => !m.Deliveries.Any(d => d.Year == year));
                 }
-                Recipients = await query.ToListAsync();
+                Recipients = await query
+                    .Include(m => m.Branch)
+                    .Include(m => m.DefaultWbKg!.AtKg)
+                    .Include(m => m.EmailAddresses)
+                    .Include(m => m.TelephoneNumbers)
+                    .Include(m => m.PostalDest.AtPlz!.Ort)
+                    .Include(m => m.PostalDest.AtPlz!.Country)
+                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
+                    .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country)
+                    .ToListAsync();
             }
             UpdatePostalEmailRecipients();
         }
@@ -374,6 +406,12 @@ namespace Elwig.Windows {
             DisposeDocs();
             await UpdateTextParameters();
 
+            using var ctx = new AppDbContext();
+
+            var doublePaged = DoublePagedInput.IsChecked == true;
+            var location = PostalLocation.Text.Trim();
+            var docs = SelectedDocs.OrderByDescending(d => d.Type).ToList();
+
             IEnumerable<Member> recipients = Recipients;
             if (OrderMgNrInput.IsChecked == true) {
                 recipients = recipients
@@ -386,34 +424,41 @@ namespace Elwig.Windows {
                     .ThenBy(m => m.MgNr)
                     .ToList();
             } else if (OrderPlzInput.IsChecked == true) {
-                recipients = recipients
-                    .OrderBy(m => m.PostalDest.AtPlz.Plz)
-                    .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
-                    .ThenBy(m => m.FamilyName)
-                    .ThenBy(m => m.GivenName)
-                    .ThenBy(m => m.MgNr)
-                    .ToList();
+                if (docs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
+                    recipients = recipients
+                        .OrderBy(m => m.BillingAddress?.PostalDest.AtPlz?.Plz ?? m.PostalDest.AtPlz?.Plz)
+                        .ThenBy(m => m.BillingAddress?.PostalDest.AtPlz?.Ort.Name ?? m.PostalDest.AtPlz?.Ort.Name)
+                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr)
+                        .ToList();
+                } else {
+                    recipients = recipients
+                        .OrderBy(m => m.PostalDest.AtPlz?.Plz)
+                        .ThenBy(m => m.PostalDest.AtPlz?.Ort.Name)
+                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr)
+                        .ToList();
+                }
             }
 
-            var doublePaged = DoublePagedInput.IsChecked == true;
-            var docs = SelectedDocs.OrderByDescending(d => d.Type).ToList();
-
             Dictionary<int, IDictionary<int, DeliveryConfirmationDeliveryData>> dcData = [];
             Dictionary<(int, int), (IDictionary<int, CreditNoteDeliveryData>, IDictionary<int, PaymentMember>, BillingData)> cnData = [];
             foreach (var doc in docs) {
                 if (doc.Type == DocType.DeliveryConfirmation) {
                     var details = ((int, bool))doc.Details!;
                     var year = details.Item1;
-                    dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(Context.DeliveryParts, year);
+                    dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year);
                 } else if (doc.Type == DocType.CreditNote) {
                     var details = ((int, int))doc.Details!;
                     var year = details.Item1;
                     var avnr = details.Item2;
                     try {
                         cnData[(year, avnr)] = (
-                            await CreditNoteDeliveryData.ForPaymentVariant(Context.CreditNoteDeliveryRows, Context.Seasons, year, avnr),
-                            await Context.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
-                            BillingData.FromJson((await Context.PaymentVariants.FindAsync(year, avnr))!.Data)
+                            await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.Seasons, year, avnr),
+                            await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
+                            BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                         );
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -421,7 +466,7 @@ namespace Elwig.Windows {
                         Mouse.OverrideCursor = null;
                         return;
                     }
-                    await Context.GetMemberAreaCommitmentBuckets(year, 0);
+                    await ctx.GetMemberAreaCommitmentBuckets(year, 0);
                 }
             }
 
@@ -432,7 +477,7 @@ namespace Elwig.Windows {
                         if (doc.Type == DocType.Custom) {
                             return [new GeneratedDoc((string)doc.Details!)];
                         } else if (doc.Type == DocType.MemberDataSheet) {
-                            return [new GeneratedDoc(new MemberDataSheet(m, Context))];
+                            return [new GeneratedDoc(new MemberDataSheet(m, ctx))];
                         } else if (doc.Type == DocType.DeliveryConfirmation) {
                             var details = ((int, bool))doc.Details!;
                             var year = details.Item1;
@@ -445,7 +490,7 @@ namespace Elwig.Windows {
                             } else {
                                 return [];
                             }
-                            return [new GeneratedDoc(new DeliveryConfirmation(Context, year, m, data))];
+                            return [new GeneratedDoc(new DeliveryConfirmation(ctx, year, m, data))];
                         } else if (doc.Type == DocType.CreditNote) {
                             var details = ((int, int))doc.Details!;
                             var year = details.Item1;
@@ -453,11 +498,11 @@ namespace Elwig.Windows {
                             var data = cnData[(year, avnr)];
                             try {
                                 return [new GeneratedDoc(new CreditNote(
-                                Context, data.Item2[m.MgNr], data.Item1[m.MgNr],
+                                ctx, data.Item2[m.MgNr], data.Item1[m.MgNr],
                                 data.Item3.ConsiderContractPenalties,
                                 data.Item3.ConsiderTotalPenalty,
                                 data.Item3.ConsiderAutoBusinessShares,
-                                Context.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
+                                ctx.GetMemberUnderDelivery(year, m.MgNr).GetAwaiter().GetResult()
                             ))];
                             } catch (Exception) {
                                 return [];
@@ -487,8 +532,10 @@ namespace Elwig.Windows {
                     var docs = m.Docs.Select(d => d.Doc).ToList();
                     foreach (var doc in docs) {
                         doc!.DoublePaged = false;
-                        if (doc is BusinessDocument b)
+                        if (doc is BusinessDocument b) {
                             b.IncludeSender = false;
+                            b.Location = location;
+                        }
                     };
                     return docs;
                 });
@@ -503,6 +550,8 @@ namespace Elwig.Windows {
                 }
             } catch (Exception exc) {
                 MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                GenerateButton.IsEnabled = true;
+                Mouse.OverrideCursor = null;
                 return;
             }
             if (email.Count > 0) {
@@ -519,7 +568,11 @@ namespace Elwig.Windows {
                     if (docs.Count == 0 || m.Docs[0].Type == DocType.Custom) {
                         docs.Insert(0, new Letterhead(m.Member));
                     }
-                    docs.ForEach(doc => doc.DoublePaged = doublePaged);
+                    docs.ForEach(doc => {
+                        doc.DoublePaged = doublePaged;
+                        if (doc is BusinessDocument b)
+                            b.Location = location;
+                    });
                     if (docs.Count > 0 && docs[0] is BusinessDocument b)
                         b.IncludeSender = true;
                     return docs;
@@ -536,6 +589,8 @@ namespace Elwig.Windows {
                     PrintDocument = print;
                 } catch (Exception exc) {
                     MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    GenerateButton.IsEnabled = true;
+                    Mouse.OverrideCursor = null;
                     return;
                 }
             }
@@ -648,7 +703,8 @@ namespace Elwig.Windows {
             if (AvaiableDocumentsList.SelectedItem is not string s || SelectedDocs.Any(d => d.Type == DocType.CreditNote))
                 return;
             var name = s.Split(" – ")[^1];
-            var pv = Context.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
+            using var ctx = new AppDbContext();
+            var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
             SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
         }

Elwig/Windows/MemberAdminWindow.xaml

@@ -45,32 +45,66 @@
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Mitglied">
-                <MenuItem x:Name="Menu_Member_SendEmail" Header="E-Mail senden" IsEnabled="False"
-                          Click="Menu_Member_SendEmail_Click"/>
+            <MenuItem Header="Kontaktieren">
+                <MenuItem x:Name="Menu_Contact_Email" Header="E-Mail senden..." IsEnabled="False"
+                          Click="Menu_Contact_Email_Click"/>
+                <MenuItem x:Name="Menu_Contact_Letterhead" Header="Briefkopf drucken" IsEnabled="False"
+                          Click="Menu_Contact_Letterhead_Click"/>
             </MenuItem>
-            <MenuItem Header="Drucken">
-                <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
-                          Click="Menu_Print_Letterhead_Click"/>
-                <MenuItem x:Name="Menu_Show_MemberDataSheet" Header="Stammdatenblatt anzeigen" IsEnabled="False"
-                          Click="Menu_Show_MemberDataSheet_Click" InputGestureText="Strg+P"/>
-                <MenuItem x:Name="Menu_Print_MemberDataSheet" Header="Stammdatenblatt drucken" IsEnabled="False"
-                          Click="Menu_Print_MemberDataSheet_Click" InputGestureText="Strg+Shift+P"/>
-                <MenuItem Header="Briefköpfe drucken">
-                    <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert"
-                              Click="Menu_Print_Letterheads_MgNr_Click"/>
-                    <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert"
-                              Click="Menu_Print_Letterheads_Name_Click"/>
-                    <MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert"
-                              Click="Menu_Print_Letterheads_Plz_Click"/>
-                </MenuItem>
+            <MenuItem Header="Stammdatenblatt">
+                <MenuItem x:Name="Menu_MemberDataSheet_Show" Header="...anzeigen (PDF)" IsEnabled="False"
+                          Click="Menu_MemberDataSheet_Show_Click" InputGestureText="Strg+P"/>
+                <MenuItem x:Name="Menu_MemberDataSheet_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
+                          Click="Menu_MemberDataSheet_SavePdf_Click"/>
+                <MenuItem x:Name="Menu_MemberDataSheet_Print" Header="...drucken" IsEnabled="False"
+                          Click="Menu_MemberDataSheet_Print_Click" InputGestureText="Strg+Shift+P"/>
+                <MenuItem x:Name="Menu_MemberDataSheet_Email" Header="...per E-Mail schicken" IsEnabled="False"
+                          Click="Menu_MemberDataSheet_Email_Click"/>
             </MenuItem>
-            <MenuItem Header="Rundschreiben">
-                <MenuItem Header="Runschreiben ausschicken"/>
-                <MenuItem Header="Alle Stammdatenblätter ausschicken"/>
+            <MenuItem Header="Anlieferungsbestätigung" x:Name="Menu_DeliveryConfirmation">
+                <MenuItem x:Name="Menu_DeliveryConfirmation_Show" Header="...anzeigen (PDF)" IsEnabled="False"
+                          Click="Menu_DeliveryConfirmation_Show_Click"/>
+                <MenuItem x:Name="Menu_DeliveryConfirmation_SavePdf" Header="...speichern... (PDF)" IsEnabled="False"
+                          Click="Menu_DeliveryConfirmation_SavePdf_Click"/>
+                <MenuItem x:Name="Menu_DeliveryConfirmation_Print" Header="...drucken" IsEnabled="False"
+                          Click="Menu_DeliveryConfirmation_Print_Click"/>
+                <MenuItem x:Name="Menu_DeliveryConfirmation_Email" Header="...per E-Mail schicken" IsEnabled="False"
+                          Click="Menu_DeliveryConfirmation_Email_Click"/>
             </MenuItem>
-            <MenuItem Header="Werkzeuge">
-                <MenuItem Header="Alle Mitglieder überprüfen"/>
+            <MenuItem Header="Mitgliederliste" x:Name="Menu_List">
+                <MenuItem x:Name="Menu_List_SaveActive" Header="...mit Aktiven speichern (Excel)"
+                          Click="Menu_List_SaveActive_Click" InputGestureText="Strg+L"/>
+                <MenuItem x:Name="Menu_List_ShowActive" Header="...mit Aktiven anzeigen (PDF)"
+                          Click="Menu_List_ShowActive_Click" InputGestureText="Strg+O"/>
+                <MenuItem x:Name="Menu_List_SavePdfActive" Header="...mit Aktiven speichern... (PDF)"
+                          Click="Menu_List_SavePdfActive_Click"/>
+                <MenuItem x:Name="Menu_List_PrintActive" Header="...mit Aktiven drucken"
+                          Click="Menu_List_PrintActive_Click" InputGestureText="Strg+Shift+O"/>
+                <Separator/>
+                <MenuItem x:Name="Menu_List_SaveFilters" Header="...aus Filtern speichern (Excel)"
+                          Click="Menu_List_SaveFilters_Click"/>
+                <MenuItem x:Name="Menu_List_ShowFilters" Header="...aus Filtern anzeigen (PDF)"
+                          Click="Menu_List_ShowFilters_Click"/>
+                <MenuItem x:Name="Menu_List_SavePdfFilters" Header="...aus Filtern speichern... (PDF)"
+                          Click="Menu_List_SavePdfFilters_Click"/>
+                <MenuItem x:Name="Menu_List_PrintFilters" Header="...aus Filtern drucken"
+                          Click="Menu_List_PrintFilters_Click"/>
+                <Separator/>
+                <MenuItem x:Name="Menu_List_SaveAll" Header="...mit allen speichern (Excel)"
+                          Click="Menu_List_SaveAll_Click"/>
+                <MenuItem x:Name="Menu_List_ShowAll" Header="...mit allen anzeigen (PDF)"
+                          Click="Menu_List_ShowAll_Click"/>
+                <MenuItem x:Name="Menu_List_SavePdfAll" Header="...mit allen speichern... (PDF)"
+                          Click="Menu_List_SavePdfAll_Click"/>
+                <MenuItem x:Name="Menu_List_PrintAll" Header="...mit allen drucken"
+                          Click="Menu_List_PrintAll_Click"/>
+                <Separator/>
+                <MenuItem x:Name="Menu_List_OrderMgNr" Header="...nach MgNr. sortieren" IsCheckable="True" IsChecked="True"
+                          Click="Menu_List_Order_Click"/>
+                <MenuItem x:Name="Menu_List_OrderName" Header="...nach Nachname, Vorname sortieren" IsCheckable="True"
+                          Click="Menu_List_Order_Click"/>
+                <MenuItem x:Name="Menu_List_OrderOrt" Header="...nach Stamm-KG, Name sortieren" IsCheckable="True"
+                          Click="Menu_List_Order_Click"/>
             </MenuItem>
         </Menu>
 
@@ -90,6 +124,7 @@
                      TextChanged="SearchInput_TextChanged">
                 <TextBox.ToolTip>
                     <TextBlock>
+                        <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
                         Mitglieder filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
                         Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
                         <LineBreak/>
@@ -140,23 +175,47 @@
 
             <Button x:Name="NewMemberButton" Content="Neu"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="NewMemberButton_Click"/>
+                    Click="NewMemberButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Einfg</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="EditMemberButton" Content="Bearbeiten" IsEnabled="False"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="EditMemberButton_Click"/>
+                    Click="EditMemberButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+B</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="DeleteMemberButton" Content="Löschen" IsEnabled="False"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="DeleteMemberButton_Click"/>
+                    Click="DeleteMemberButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Alt+Entf</TextBlock>
+                </Button.ToolTip>
+            </Button>
 
             <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="SaveButton_Click"/>
+                    Click="SaveButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+S</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="ResetButton_Click"/>
+                    Click="ResetButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Strg+Z</TextBlock>
+                </Button.ToolTip>
+            </Button>
             <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
                     HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelButton_Click"/>
+                    Click="CancelButton_Click">
+                <Button.ToolTip>
+                    <TextBlock FontWeight="Bold">Esc</TextBlock>
+                </Button.ToolTip>
+            </Button>
         </Grid>
 
         <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
@@ -268,8 +327,8 @@
                     <TextBox x:Name="EmailAddress7Input" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                    <Label x:Name="EmailAddress8Label" Content="E-Mail-Adresse:" Margin="10,210,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="EmailAddress8Input" Margin="0,210,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                    <Label x:Name="EmailAddress8Label" Content="E-Mail-Adresse:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress8Input" Margin="0,220,10,0" Grid.Column="1" Grid.ColumnSpan="2"
                              TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
                     <Label x:Name="EmailAddress9Label" Content="E-Mail-Adresse:" Margin="10,250,0,0" Grid.Column="0"/>
@@ -422,7 +481,7 @@
                              TextChanged="TextBox_TextChanged"/>
 
                     <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Checked="ActiveInput_Changed" Unchecked="ActiveInput_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
                     <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"

Elwig/Windows/OriginHierarchyWindow.xaml.cs

@@ -1,8 +1,8 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -20,55 +20,65 @@ namespace Elwig.Windows {
             DeactivateKgButton.IsEnabled = false;
         }
 
-        protected override async Task OnRenewContext() {
-            ControlUtils.RenewItemsSource(WineOrigins, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId, WineOrigins_SelectionChanged);
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            var origins = (await ctx.WineOrigins
+                    .Include("Gems.AtGem.Kgs.WbKg.Gl")
+                    .AsSplitQuery()
+                    .ToListAsync())
+                    .OrderByDescending(o => o.SortKey)
+                    .ThenBy(o => o.HkId);
+            ControlUtils.RenewItemsSource(WineOrigins, origins, WineOrigins_SelectionChanged);
             if (WineOrigins.SelectedItem == null) {
-                var hkid = await Context.WbKgs
-                    .GroupBy(k => k.AtKg.Gem.WbGem.HkId)
+                var hkid = await ctx.WbKgs
+                    .GroupBy(k => k.AtKg.Gem.WbGem!.HkId)
                     .Where(g => g.Count() > 0)
                     .OrderByDescending(g => g.Count())
                     .Select(g => g.Key)
                     .FirstOrDefaultAsync();
-                ControlUtils.SelectListBoxItem(WineOrigins, o => (o as WineOrigin)?.HkId, hkid);
+                ControlUtils.SelectItemWithPk(WineOrigins, hkid);
             }
-            ControlUtils.RenewItemsSource(WbGls, await Context.WbGls.OrderBy(g => g.GlNr).ToListAsync(), g => (g as WbGl)?.GlNr, WbGls_SelectionChanged, ControlUtils.RenewSourceDefault.First);
-            await UpdateWbGems();
-            await UpdateWbKgs();
-            await UpdateWbGlKgs();
-            await UpdateWbRds();
+            var gls = await ctx.WbGls
+                .OrderBy(g => g.GlNr)
+                .Include("Kgs.Rds")
+                .AsSplitQuery()
+                .ToListAsync();
+            ControlUtils.RenewItemsSource(WbGls, gls, WbGls_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+            UpdateWbGems();
+            UpdateWbKgs();
+            UpdateWbGlKgs();
+            UpdateWbRds();
         }
 
-        private async Task UpdateWbGems() {
+        private void UpdateWbGems() {
             WbGemsHeader.Content = "Gemeinden" + (WineOrigins.SelectedItem is WineOrigin o ? $" ({o.Name})" : "");
-            var selHkId = (WineOrigins.SelectedItem as WineOrigin)?.HkId;
-            ControlUtils.RenewItemsSource(WbGems, await Context.WbGems.Where(g => g.HkId == selHkId).Select(g => g.AtGem).OrderBy(g => g.Name).ToListAsync(), g => (g as AT_Gem)?.Gkz, WbGems_SelectionChanged);
-            await UpdateWbKgs();
+            var origin = (WineOrigins.SelectedItem as WineOrigin);
+            var gems = origin?.Gems.Select(g => g.AtGem).OrderBy(g => g.Name).ToList();
+            ControlUtils.RenewItemsSource(WbGems, gems, WbGems_SelectionChanged);
+            UpdateWbKgs();
         }
 
-        private async Task UpdateWbKgs() {
+        private void UpdateWbKgs() {
             WbKgsHeader.Content = "Verfügbare KG";
-            IQueryable<AT_Kg>? kgs = null;
+            IEnumerable<AT_Kg>? kgs = null;
             if (WbGems.SelectedItem is AT_Gem g) {
                 WbKgsHeader.Content += $" ({g.Name})";
-                kgs = Context.Katastralgemeinden.Where(k => k.Gkz == g.Gkz);
+                kgs = g.Kgs;
             } else if (WineOrigins.SelectedItem is WineOrigin o) {
                 WbKgsHeader.Content += $" ({o.Name})";
-                kgs = Context.WbGems.Where(g => g.HkId == o.HkId).SelectMany(g => g.AtGem.Kgs);
+                kgs = o.Gems.SelectMany(g => g.AtGem.Kgs);
             } else {
                 kgs = null;
             }
-            if (kgs == null) {
-                WbKgs.ItemsSource = null;
-            } else {
-                ControlUtils.RenewItemsSource(WbKgs, await kgs.OrderBy(k => k.WbKg.Gl == null).ThenBy(k => k.WbKg.GlNr).ThenBy(k => k.Name).ToListAsync(), k => (k as AT_Kg)?.KgNr, WbKgs_SelectionChanged);
-            }
+            var kgList = kgs?.OrderBy(k => k.WbKg?.Gl == null).ThenBy(k => k.WbKg?.GlNr).ThenBy(k => k.Name).ToList();
+            ControlUtils.RenewItemsSource(WbKgs, kgList, WbKgs_SelectionChanged);
         }
 
-        private async Task UpdateWbGlKgs() {
+        private void UpdateWbGlKgs() {
             WbGlKgsHeader.Content = "Aktive KG";
             if (WbGls.SelectedItem is WbGl g) {
                 WbGlKgsHeader.Content += $" ({g.Name})";
-                ControlUtils.RenewItemsSource(WbGlKgs, await Context.WbKgs.Where(k => k.GlNr == g.GlNr).Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), k => (k as AT_Kg)?.KgNr, WbGlKgs_SelectionChanged);
+                var kgs = g.Kgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToList();
+                ControlUtils.RenewItemsSource(WbGlKgs, kgs, WbGlKgs_SelectionChanged);
             } else {
                 WbGlKgs.ItemsSource = null;
             }
@@ -82,18 +92,19 @@ namespace Elwig.Windows {
             StatusAreaCommitments.Text = "Flächenbindungen: ";
             StatusDeliveries.Text = "Lieferungen: ";
             if (WbGlKgs.SelectedItem is AT_Kg k && k.WbKg != null) {
+                using var ctx = new AppDbContext();
                 StatusKgName.Text += $"{k.Name} ({k.KgNr:00000})";
-                var reeds = await Context.WbRde.Where(r => r.KgNr == k.KgNr).CountAsync();
+                var reeds = await ctx.WbRde.Where(r => r.KgNr == k.KgNr).CountAsync();
                 StatusWbRds.Text += $"{reeds:N0}";
-                var activeMembers = await Context.Members.Where(m => m.IsActive && m.DefaultKgNr == k.KgNr).CountAsync();
-                var allMembers = await Context.Members.Where(m => m.DefaultKgNr == k.KgNr).CountAsync();
+                var activeMembers = await ctx.Members.Where(m => m.IsActive && m.DefaultKgNr == k.KgNr).CountAsync();
+                var allMembers = await ctx.Members.Where(m => m.DefaultKgNr == k.KgNr).CountAsync();
                 StatusDefaultKgs.Text += $"{activeMembers:N0} ({allMembers:N0})";
                 var year = Utils.CurrentNextSeason;
-                var activeAreaComs = await Context.AreaCommitments.Where(c => c.KgNr == k.KgNr && c.YearFrom <= year && (c.YearTo == null || c.YearTo >= year)).CountAsync();
-                var allAreaComs = await Context.AreaCommitments.Where(c => c.KgNr == k.KgNr).CountAsync();
+                var activeAreaComs = await Utils.ActiveAreaCommitments(ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr), year).CountAsync();
+                var allAreaComs = await ctx.AreaCommitments.Where(c => c.KgNr == k.KgNr).CountAsync();
                 StatusAreaCommitments.Text += $"{activeAreaComs:N0} ({allAreaComs:N0})";
-                var deliveryParts = await Context.DeliveryParts.Where(p => p.KgNr == k.KgNr).CountAsync();
-                var deliveries = await Context.Deliveries.Where(d => d.Parts.Any(p => p.KgNr == k.KgNr)).CountAsync();
+                var deliveryParts = await ctx.DeliveryParts.Where(p => p.KgNr == k.KgNr).CountAsync();
+                var deliveries = await ctx.Deliveries.Where(d => d.Parts.Any(p => p.KgNr == k.KgNr)).CountAsync();
                 StatusDeliveries.Text += $"{deliveries:N0} ({deliveryParts:N0})";
             } else {
                 StatusKgName.Text += "-";
@@ -104,36 +115,37 @@ namespace Elwig.Windows {
             }
         }
 
-        private async Task UpdateWbRds() {
+        private void UpdateWbRds() {
             WbRdsHeader.Content = "Riede";
             if (WbGlKgs.SelectedItem is AT_Kg k) {
                 WbRdsHeader.Content += $" ({k.Name})";
-                ControlUtils.RenewItemsSource(WbRds, await Context.WbRde.Where(r => r.KgNr == k.KgNr).OrderBy(r => r.Name).ToListAsync(), k => (k as AT_Kg)?.KgNr);
+                var rds = k.WbKg?.Rds.OrderBy(r => r.Name).ToList();
+                ControlUtils.RenewItemsSource(WbRds, rds);
             } else {
                 WbRds.ItemsSource = null;
             }
             UpdateButtons();
         }
 
-        private async void WineOrigins_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            await UpdateWbGems();
+        private void WineOrigins_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            UpdateWbGems();
         }
 
-        private async void WbGls_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
-            await UpdateWbGlKgs();
+        private void WbGls_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
+            UpdateWbGlKgs();
         }
 
-        private async void WbGems_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
-            await UpdateWbKgs();
+        private void WbGems_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
+            UpdateWbKgs();
         }
 
         private async void WbGlKgs_SelectionChanged(object sender, SelectionChangedEventArgs e) {
-            await UpdateWbRds();
+            UpdateWbRds();
             if (!isUpdating && WbGlKgs.SelectedItem is AT_Kg k) {
                 isUpdating = true;
-                ControlUtils.SelectListBoxItem(WineOrigins, o => (o as WineOrigin)?.HkId, k.Gem.WbGem?.HkId);
-                ControlUtils.SelectListBoxItem(WbGems, g => (g as AT_Gem)?.Gkz, k.Gkz);
-                ControlUtils.SelectListBoxItem(WbKgs, k => (k as AT_Kg)?.KgNr, k.KgNr);
+                ControlUtils.SelectItemWithPk(WineOrigins, k.Gem.WbGem?.HkId);
+                ControlUtils.SelectItemWithPk(WbGems, k.Gkz);
+                ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
                 isUpdating = false;
             }
             await UpdateStatusBar();
@@ -143,8 +155,8 @@ namespace Elwig.Windows {
             UpdateButtons();
             if (!isUpdating && WbKgs.SelectedItem is AT_Kg k && k.WbKg != null && ((WbGls.SelectedItem as WbGl)?.GlNr == k.WbKg?.GlNr || WbGls.SelectedItem == null)) {
                 isUpdating = true;
-                ControlUtils.SelectListBoxItem(WbGls, g => (g as WbGl)?.GlNr, k.WbKg?.GlNr);
-                ControlUtils.SelectListBoxItem(WbGlKgs, k => (k as AT_Kg)?.KgNr, k.KgNr);
+                ControlUtils.SelectItemWithPk(WbGls, k.WbKg?.GlNr);
+                ControlUtils.SelectItemWithPk(WbGlKgs, k.KgNr);
                 isUpdating = false;
             }
         }
@@ -170,18 +182,17 @@ namespace Elwig.Windows {
         private async void ActivateKgButton_Click(object sender, RoutedEventArgs e) {
             if (WbKgs.SelectedItem is not AT_Kg k || WbGls.SelectedItem is not WbGl g) return;
             try {
-                if (k.WbKg != null) {
-                    k.WbKg.GlNr = g.GlNr;
-                    Context.Update(k.WbKg);
-                } else {
-                    var wbKg = Context.CreateProxy<WbKg>();
-                    wbKg.KgNr = k.KgNr;
-                    wbKg.GlNr = g.GlNr;
-                    await Context.AddAsync(wbKg);
+                var kg = new WbKg { KgNr = k.KgNr, GlNr = g.GlNr };
+                using (var ctx = new AppDbContext()) {
+                    if (k.WbKg != null) {
+                        ctx.Update(kg);
+                    } else {
+                        ctx.Add(kg);
+                    }
+                    await ctx.SaveChangesAsync();
                 }
-                await Context.SaveChangesAsync();
                 await App.HintContextChange();
-                ControlUtils.SelectListBoxItem(WbGlKgs, kg => (kg as AT_Kg)?.KgNr, k.KgNr);
+                ControlUtils.SelectItemWithPk(WbGlKgs, k.KgNr);
             } 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;
@@ -196,10 +207,12 @@ namespace Elwig.Windows {
                 "Katastralgemeinde deaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r != MessageBoxResult.Yes) return;
             try {
-                Context.Remove(k.WbKg);
-                await Context.SaveChangesAsync();
+                using (var ctx = new AppDbContext()) {
+                    ctx.Remove(k.WbKg);
+                    await ctx.SaveChangesAsync();
+                }
                 await App.HintContextChange();
-                ControlUtils.SelectListBoxItem(WbKgs, kg => (kg as AT_Kg)?.KgNr, k.KgNr);
+                ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
             } catch (Exception exc) {
                 await HintContextChange();
                 var str = "Der Eintrag konnte nicht aus der Datenbank gelöscht werden!\n\n" + exc.Message;
@@ -209,10 +222,12 @@ namespace Elwig.Windows {
         }
 
         public void FocusKgNr(int kgnr) {
-            var kg = Context.Katastralgemeinden.Find(kgnr);
-            ControlUtils.SelectListBoxItem(WbGls, kg.WbKg.Gl, g => (g as WbGl)?.GlNr);
-            ControlUtils.SelectListBoxItem(WbGlKgs, kg, k => (k as AT_Kg)?.KgNr);
+            using var ctx = new AppDbContext();
+            var kg = ctx.Katastralgemeinden.Find(kgnr);
+            ControlUtils.SelectItemWithPk(WbGls, kg?.WbKg?.GlNr);
+            ControlUtils.SelectItemWithPk(WbGlKgs, kg?.KgNr);
             WbGlKgs.Focus();
+            WbGlKgs.ScrollIntoView(kg?.WbKg?.Gl);
         }
     }
 }

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -5,6 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
         Title="Auszahlungsvarianten - Elwig" Height="510" Width="820" MinHeight="500" MinWidth="820">
     <Window.Resources>
@@ -86,6 +87,11 @@
         <TextBox x:Name="TransferDateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
                  TextChanged="TransferDateInput_TextChanged"/>
 
+        <Label Content="Rebelzuschlag:" Margin="10,130,0,0" Grid.Column="1"/>
+        <ctrl:UnitTextBox x:Name="WeightModifierInput" Grid.Column="2" Width="60" Margin="0,130,10,0" Unit="%"
+                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                          TextChanged="WeightModifierInput_TextChanged" LostFocus="WeightModifierInput_LostFocus"/>
+
         <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="2"/>
         <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
                   Margin="110,95,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -20,25 +20,32 @@ namespace Elwig.Windows {
         public readonly bool SeasonLocked;
         private bool DataValid, DataChanged, NameChanged, CommentChanged, TransferDateValid, TransferDateChanged;
         private BillingData? BillingData;
+        private bool WeightModifierChanged = false;
 
         private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
 
         public PaymentVariantsWindow(int year) {
             InitializeComponent();
             Year = year;
-            SeasonLocked = Context.Seasons.Find(Year + 1) != null;
+            using (var ctx = new AppDbContext()) {
+                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
+            }
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
                 DataInput.Visibility = Visibility.Hidden;
             }
         }
 
-        protected override async Task OnRenewContext() {
-            ControlUtils.RenewItemsSource(PaymentVariantList, await Context.PaymentVariants.Where(v => v.Year == Year).OrderBy(v => v.AvNr).ToListAsync(), v => (v as PaymentVar)?.AvNr);
-            Update();
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(PaymentVariantList, await ctx.PaymentVariants
+                .Where(v => v.Year == Year)
+                .OrderBy(v => v.AvNr)
+                .Include(v => v.Season.Currency)
+                .ToListAsync());
+            await Update();
         }
 
-        private void Update() {
+        private async Task Update() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
                 var locked = !v.TestVariant;
                 DeleteButton.IsEnabled = !locked;
@@ -70,6 +77,13 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
                     ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
                     ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
+                    if (BillingData.NetWeightModifier != 0) {
+                        WeightModifierInput.Text = $"{Math.Round(BillingData.NetWeightModifier * 100.0, 8)}";
+                    } else if (BillingData.GrossWeightModifier != 0) {
+                        WeightModifierInput.Text = $"{Math.Round(BillingData.GrossWeightModifier * 100.0, 8)}";
+                    } else {
+                        WeightModifierInput.Text = "";
+                    }
                     DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
                 } catch {
                     BillingData = null;
@@ -77,8 +91,10 @@ namespace Elwig.Windows {
                     ConsiderPenaltiesInput.IsChecked = false;
                     ConsiderPenaltyInput.IsChecked = false;
                     ConsiderAutoInput.IsChecked = false;
+                    WeightModifierInput.Text = "";
                     DataInput.Text = v.Data;
                 }
+                WeightModifierInput.TextBox.IsReadOnly = false;
                 ConsiderModifiersInput.IsEnabled = !locked;
                 ConsiderPenaltiesInput.IsEnabled = !locked;
                 ConsiderPenaltyInput.IsEnabled = !locked;
@@ -109,6 +125,8 @@ namespace Elwig.Windows {
                 DateInput.IsReadOnly = true;
                 TransferDateInput.Text = "";
                 TransferDateInput.IsReadOnly = true;
+                WeightModifierInput.Text = "";
+                WeightModifierInput.TextBox.IsReadOnly = true;
                 ConsiderModifiersInput.IsChecked = false;
                 ConsiderModifiersInput.IsEnabled = false;
                 ConsiderPenaltiesInput.IsChecked = false;
@@ -120,7 +138,7 @@ namespace Elwig.Windows {
                 DataInput.Text = "";
                 DataInput.IsReadOnly = true;
             }
-            UpdateSums();
+            await UpdateSums();
             UpdateSaveButton();
         }
 
@@ -131,24 +149,33 @@ namespace Elwig.Windows {
                 (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
                 (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
                 (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
-                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares));
+                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares) ||
+                WeightModifierChanged);
             CalculateButton.IsEnabled = !SaveButton.IsEnabled && PaymentVariantList.SelectedItem is PaymentVar { TestVariant: true };
             CommitButton.IsEnabled = CalculateButton.IsEnabled;
         }
 
-        private void UpdateSums() {
+        private async Task UpdateSums() {
             if (PaymentVariantList.SelectedItem is PaymentVar v) {
+                using var ctx = new AppDbContext();
                 var sym = v.Season.Currency.Symbol;
-                ModifierSum.Text = $"{v.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount):N2} {sym}";
-                TotalSum.Text = $"{v.MemberPayments.Sum(p => p.Amount):N2} {sym}";
-                if (v.Credits.Count == 0) {
+                var modSum = await ctx.PaymentDeliveryParts
+                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                    .SumAsync(p => p.AmountValue - p.NetAmountValue);
+                ModifierSum.Text = $"{v.Season.DecFromDb(modSum):N2} {sym}";
+                var totalSum = await ctx.MemberPayments
+                    .Where(p => p.Year == v.Year && p.AvNr == v.AvNr)
+                    .SumAsync(p => p.AmountValue);
+                TotalSum.Text = $"{v.Season.DecFromDb(totalSum):N2} {sym}";
+                var credits = ctx.Credits.Where(c => c.Year == v.Year && c.AvNr == v.AvNr);
+                if (!credits.Any()) {
                     VatSum.Text = $"- {sym}";
                     DeductionSum.Text = $"- {sym}";
                     PaymentSum.Text = $"- {sym}";
                 } else {
-                    VatSum.Text = $"{v.Credits.Sum(c => c.VatAmount):N2} {sym}";
-                    DeductionSum.Text = $"{-v.Credits.Sum(c => c.Modifiers ?? 0):N2} {sym}";
-                    PaymentSum.Text = $"{v.Credits.Sum(c => c.Amount):N2} {sym}";
+                    VatSum.Text = $"{v.Season.DecFromDb(await credits.SumAsync(c => c.VatAmountValue)):N2} {sym}";
+                    DeductionSum.Text = $"{-v.Season.DecFromDb(await credits.SumAsync(c => c.ModifiersValue ?? 0)):N2} {sym}";
+                    PaymentSum.Text = $"{v.Season.DecFromDb(await credits.SumAsync(c => c.AmountValue)):N2} {sym}";
                 }
             } else {
                 ModifierSum.Text = "-";
@@ -159,26 +186,27 @@ namespace Elwig.Windows {
             }
         }
 
-        private void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            Update();
+        private async void PaymentVariantList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            await Update();
         }
 
         private async void AddButton_Click(object sender, RoutedEventArgs evt) {
             try {
-                PaymentVar v = Context.CreateProxy<PaymentVar>();
+                using var ctx = new AppDbContext();
+                var v = new PaymentVar {
+                    Year = Year,
+                    AvNr = await ctx.NextAvNr(Year),
+                    Name = "Neue Auszahlungsvariante",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                };
 
-                v.Year = Year;
-                v.AvNr = await Context.NextAvNr(Year);
-                v.Name = "Neue Auszahlungsvariante";
-                v.TestVariant = true;
-                v.DateString = $"{DateTime.Today:yyyy-MM-dd}";
-                v.Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}";
-
-                await Context.AddAsync(v);
-                await Context.SaveChangesAsync();
+                ctx.Add(v);
+                await ctx.SaveChangesAsync();
                 await App.HintContextChange();
 
-                ControlUtils.SelectListBoxItem(PaymentVariantList, v, v => (v as PaymentVar)?.AvNr);
+                ControlUtils.SelectItem(PaymentVariantList, v);
             } 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;
@@ -189,20 +217,21 @@ namespace Elwig.Windows {
         private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
             try {
-                PaymentVar n = Context.CreateProxy<PaymentVar>();
+                using var ctx = new AppDbContext();
+                var n = new PaymentVar {
+                    Year = orig.Year,
+                    AvNr = await ctx.NextAvNr(Year),
+                    Name = $"{orig.Name} (Kopie)",
+                    TestVariant = true,
+                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                    Data = orig.Data,
+                };
 
-                n.Year = orig.Year;
-                n.AvNr = await Context.NextAvNr(Year);
-                n.Name = $"{orig.Name} (Kopie)";
-                n.TestVariant = true;
-                n.DateString = $"{DateTime.Today:yyyy-MM-dd}";
-                n.Data = orig.Data;
-
-                await Context.AddAsync(n);
-                await Context.SaveChangesAsync();
+                ctx.Add(n);
+                await ctx.SaveChangesAsync();
                 await App.HintContextChange();
 
-                ControlUtils.SelectListBoxItem(PaymentVariantList, n, v => (v as PaymentVar)?.AvNr);
+                ControlUtils.SelectItem(PaymentVariantList, n);
             } 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;
@@ -213,8 +242,9 @@ namespace Elwig.Windows {
         private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
             try {
-                Context.Remove(v);
-                await Context.SaveChangesAsync();
+                using var ctx = new AppDbContext();
+                ctx.Remove(v);
+                await ctx.SaveChangesAsync();
                 await App.HintContextChange();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -248,7 +278,8 @@ namespace Elwig.Windows {
         private async void MailButton_Click(object sender, RoutedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar pv)
                 return;
-            var vars = await Context.PaymentVariants
+            using var ctx = new AppDbContext();
+            var vars = await ctx.PaymentVariants
                 .Where(v => pv.Year == v.Year)
                 .OrderBy(v => v.AvNr)
                 .Select(v => v.AvNr)
@@ -340,7 +371,8 @@ namespace Elwig.Windows {
                 TransactionButton.IsEnabled = false;
                 Mouse.OverrideCursor = Cursors.AppStarting;
                 try {
-                    var tbl = await CreditNoteData.ForPaymentVariant(Context, v.Year, v.AvNr);
+                    using var ctx = new AppDbContext();
+                    var tbl = await CreditNoteData.ForPaymentVariant(ctx, v.Year, v.AvNr);
                     using var ods = new OdsFile(d.FileName);
                     await ods.AddTable(tbl);
                 } catch (Exception exc) {
@@ -362,15 +394,24 @@ namespace Elwig.Windows {
                 d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
                 d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
                 d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
+                var modVal = WeightModifierInput.Text.Length > 0 ? double.Parse(WeightModifierInput.Text) : 0;
+                d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
+                d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;
+                WeightModifierChanged = false;
                 v.Data = JsonSerializer.Serialize(d.Data);
-                Context.Update(v);
-                await Context.SaveChangesAsync();
+
+                using (var ctx = new AppDbContext()) {
+                    ctx.Update(v);
+                    await ctx.SaveChangesAsync();
+                }
+
                 await App.HintContextChange();
                 CommentInput_TextChanged(null, null);
                 ConsiderModifiersInput_Changed(null, null);
                 ConsiderPenaltiesInput_Changed(null, null);
                 ConsiderPenaltyInput_Changed(null, null);
                 ConsiderAutoInput_Changed(null, null);
+                WeightModifierInput_TextChanged(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -511,5 +552,27 @@ namespace Elwig.Windows {
             }
             UpdateSaveButton();
         }
+
+        private void WeightModifierInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
+            var res = Validator.CheckDecimal(WeightModifierInput.TextBox, false, 3, 2, true);
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(WeightModifierInput.TextBox);
+                return;
+            }
+            var val = WeightModifierInput.Text.Length > 0 && res.IsValid ? double.Parse(WeightModifierInput.Text) : 0;
+            WeightModifierChanged = (val != Math.Round(BillingData.NetWeightModifier * 100.0, 8) && val != Math.Round(BillingData.GrossWeightModifier * 100.0, 8)) ||
+                (val == 0 && (BillingData.NetWeightModifier != 0 || BillingData.GrossWeightModifier != 0));
+            if (WeightModifierChanged) {
+                ControlUtils.SetInputChanged(WeightModifierInput.TextBox);
+            } else {
+                ControlUtils.ClearInputState(WeightModifierInput.TextBox);
+            }
+            UpdateSaveButton();
+        }
+
+        private void WeightModifierInput_LostFocus(object sender, RoutedEventArgs evt) {
+            if (WeightModifierInput.Text.EndsWith(','))
+                WeightModifierInput.Text = WeightModifierInput.Text[..^1];
+        }
     }
 }

Elwig/Windows/QueryWindow.xaml

@@ -1,19 +1,33 @@
 <Window x:Class="Elwig.Windows.QueryWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Datenbankabfragen - Elwig" Height="450" Width="800">
+        xmlns:local="clr-namespace:Elwig.Windows"
+        Title="Datenbankabfragen - Elwig" Height="450" Width="800" MinWidth="400" MinHeight="300">
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*" MinHeight="100"/>
+            <RowDefinition Height="5"/>
+            <RowDefinition Height="3*" MinHeight="100"/>
+        </Grid.RowDefinitions>
+
         <TextBox x:Name="QueryInput" Text="SELECT * FROM v_delivery"
                  AcceptsReturn="True" VerticalScrollBarVisibility="Visible" TextWrapping="Wrap"
-                 HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,10,120,10" Height="100"
-                 FontFamily="Cascadia Code Light" FontSize="13"/>
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,120,5"
+                 FontFamily="Cascadia Code Light" FontSize="13">
+            <TextBox.InputBindings>
+                <KeyBinding Key="Return" Modifiers="Control" Command="{Binding EnterCommand,  RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:QueryWindow}}}" />
+            </TextBox.InputBindings>
+        </TextBox>
         <Button x:Name="QueryButton" Content="Abfragen"
-                HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10,10,10,10"
-                Click="QueryButton_Click" Height="100" Width="100"
+                HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="10,10,10,5"
+                Click="QueryButton_Click" Width="100"
                 FontSize="14"/>
-        <DataGrid x:Name="DataList"
-                  AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+
+        <GridSplitter Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <DataGrid x:Name="DataList" Grid.Row="2"
+                  AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Extended"
                   CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
-                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,120,10,10"/>
+                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,5,10,10"/>
     </Grid>
 </Window>

Elwig/Windows/QueryWindow.xaml.cs

@@ -6,14 +6,26 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
 
 namespace Elwig.Windows {
     public partial class QueryWindow : Window {
+
+        private ICommand? _enterCommand;
+        public ICommand EnterCommand => _enterCommand ??= new ActionCommand(async () => {
+            await ExecuteQuery();
+        });
+
+
         public QueryWindow() {
             InitializeComponent();
         }
 
         private async void QueryButton_Click(object sender, RoutedEventArgs evt) {
+            await ExecuteQuery();
+        }
+
+        private async Task ExecuteQuery() {
             try {
                 await ExecuteQuery(QueryInput.Text);
             } catch (Exception e) {

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -19,13 +19,15 @@ namespace Elwig.Windows {
             SeasonInput.Value = Utils.CurrentLastSeason;
         }
 
-        protected override async Task OnRenewContext() {
+        protected override Task OnRenewContext(AppDbContext ctx) {
             SeasonInput_ValueChanged(null, null);
+            return Task.CompletedTask;
         }
 
         private async void SeasonInput_ValueChanged(object? sender, RoutedEventArgs? evt) {
-            var s0 = await Context.Seasons.FindAsync(SeasonInput.Value);
-            var s1 = await Context.Seasons.FindAsync(SeasonInput.Value + 1);
+            using var ctx = new AppDbContext();
+            var s0 = await ctx.Seasons.FindAsync(SeasonInput.Value);
+            var s1 = await ctx.Seasons.FindAsync(SeasonInput.Value + 1);
             var valid = (s0 != null);
             var last = (s1 == null);
             CalculateBucketsButton.IsEnabled = valid && last;
@@ -42,22 +44,28 @@ namespace Elwig.Windows {
         }
 
         private async void CalculateBucketsButton_Click(object sender, RoutedEventArgs evt) {
-            if (SeasonInput.Value is not int year || await Context.Seasons.FindAsync(year) is not Season s)
+            if (SeasonInput.Value is not int year)
                 return;
             CalculateBucketsButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
 
             try {
+                using var ctx = new AppDbContext();
+                if (await ctx.Seasons.FindAsync(year) is not Season s)
+                    return;
+
                 s.Billing_AllowAttrsIntoLower = AllowAttrIntoLowerInput.IsChecked ?? false;
                 s.Billing_AvoidUnderDeliveries = AvoidUnderDeliveriesInput.IsChecked ?? false;
                 s.Billing_HonorGebunden = HonorGebundenInput.IsChecked ?? false;
-                Context.Update(s);
-                await Context.SaveChangesAsync();
+                ctx.Update(s);
+                await ctx.SaveChangesAsync();
             } catch { }
 
             var b = new Billing(year);
             await b.FinishSeason();
             await b.CalculateBuckets();
+            await App.HintContextChange();
+
             Mouse.OverrideCursor = null;
             CalculateBucketsButton.IsEnabled = true;
         }
@@ -83,9 +91,10 @@ namespace Elwig.Windows {
 
             Mouse.OverrideCursor = Cursors.AppStarting;
             try {
-                var tbl1 = await OverUnderDeliveryData.ForSeason(Context.OverUnderDeliveryRows, year);
-                var tbl2 = await AreaComUnderDeliveryData.ForSeason(Context.AreaComUnderDeliveryRows, year);
-                var tbl3 = await MemberDeliveryPerVariantData.ForSeason(Context.MemberDeliveryPerVariantRows, year);
+                using var ctx = new AppDbContext();
+                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
+                var tbl2 = await AreaComUnderDeliveryData.ForSeason(ctx.AreaComUnderDeliveryRows, year);
+                var tbl3 = await MemberDeliveryPerVariantData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
                 using var ods = new OdsFile(d.FileName);
                 await ods.AddTable(tbl1);
                 await ods.AddTable(tbl2);

Tests/HelperTests/BillingDataTest.cs

@@ -556,7 +556,7 @@ namespace Tests.HelperTests {
         }
 
         [Test]
-        public void TestWrite_06_Cultivation() {
+        public void TestWrite_06_Cultivation_1() {
             List<GraphEntry> entries = [
                 new GraphEntry(0, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
                     [73] = 0.5m,
@@ -604,7 +604,84 @@ namespace Tests.HelperTests {
         }
 
         [Test]
-        public void TestWrite_07_AttributeAndCultivation() {
+        public void TestWrite_07_Cultivation_2() {
+            List<GraphEntry> entries = [
+                new GraphEntry(0, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.6m,
+                    [84] = 1.0m
+                }, null), GetSelection(["GV/-", "GV/-B"])),
+                new GraphEntry(2, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.75m,
+                }, null), GetSelection(["ZW/-", "ZW/-B"])),
+                 new GraphEntry(2, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.8m,
+                }, null), GetSelection(["BP/-", "BP/-B"])),
+           ];
+            var data = BillingData.FromGraphEntries(entries);
+            Assert.That(data.ToJsonString(JsonOpts), Is.EqualTo("""
+                {
+                  "mode": "elwig",
+                  "version": 1,
+                  "payment": {
+                    "GV": "curve:1",
+                    "ZW": 0.75,
+                    "BP": 0.8
+                  },
+                  "curves": [
+                    {
+                      "id": 1,
+                      "mode": "oe",
+                      "data": {
+                        "73oe": 0.6,
+                        "84oe": 1
+                      }
+                    }
+                  ]
+                }
+                """));
+        }
+
+        [Test]
+        public void TestWrite_08_Cultivation_3() {
+            List<GraphEntry> entries = [
+                new GraphEntry(0, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.6m,
+                    [84] = 1.0m
+                }, null), GetSelection(["GV/-", "GV/-B"])),
+                new GraphEntry(2, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.75m,
+                }, null), GetSelection(["BP/-B", "ZW/-B", "FV/-B"])),
+                 new GraphEntry(2, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
+                    [73] = 0.8m,
+                }, null), GetSelection(["BP/-", "ZW/-", "FV/-", "WR/-", "BL/-"])),
+           ];
+            var data = BillingData.FromGraphEntries(entries);
+            Assert.That(data.ToJsonString(JsonOpts), Is.EqualTo("""
+                {
+                  "mode": "elwig",
+                  "version": 1,
+                  "payment": {
+                    "default": 0.8,
+                    "GV": "curve:1",
+                    "GV-B": "curve:1",
+                    "-B": 0.75
+                  },
+                  "curves": [
+                    {
+                      "id": 1,
+                      "mode": "oe",
+                      "data": {
+                        "73oe": 0.6,
+                        "84oe": 1
+                      }
+                    }
+                  ]
+                }
+                """));
+        }
+
+        [Test]
+        public void TestWrite_09_AttributeAndCultivation() {
             List<GraphEntry> entries = [
                 new GraphEntry(0, 4, new BillingData.Curve(BillingData.CurveMode.Oe, new() {
                     [73] = 0.75m,

Tests/HelperTests/BillingTest.cs

@@ -191,16 +191,13 @@ namespace Tests.HelperTests {
             await b.Calculate(false, false, false);
             var prices = await GetMemberDeliveryPrices(year, mgnr);
             Assert.Multiple(() => {
-                Assert.That(prices, Has.Count.EqualTo(10));
+                Assert.That(prices, Has.Count.EqualTo(7));
                 // Kabinett
-                Assert.That(prices[("20211001X001/1", "GV_")], Is.EqualTo((    0, GV_ungeb)));
                 Assert.That(prices[("20211001X001/1", "GV")] , Is.EqualTo((4_000, GV_geb)));
                 // ohne Attribut
-                Assert.That(prices[("20211001X001/2", "GV_")], Is.EqualTo((    0, GV_ungeb)));
                 Assert.That(prices[("20211001X001/2", "GV")],  Is.EqualTo((4_000, GV_geb)));
                 // Bio
                 Assert.That(prices[("20211001X002/1", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
-                Assert.That(prices[("20211001X002/1", "GV")],  Is.EqualTo((    0, GVB_geb)));
                 // Bio
                 Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((2_000, GVB_ungeb)));
                 Assert.That(prices[("20211001X002/2", "GV")],  Is.EqualTo((2_000, GVB_geb)));
@@ -240,14 +237,12 @@ namespace Tests.HelperTests {
             await b.Calculate(true, false, false);
             var prices = await GetMemberDeliveryPrices(year, mgnr);
             Assert.Multiple(() => {
-                Assert.That(prices, Has.Count.EqualTo(8));
+                Assert.That(prices, Has.Count.EqualTo(6));
                 // Kabinett
-                Assert.That(prices[("20211001X001/1", "GV_")], Is.EqualTo((    0, GV_ungeb)));
                 Assert.That(prices[("20211001X001/1", "GV")],  Is.EqualTo((4_000, GV_geb)));
                 // ohne Attribut
                 Assert.That(prices[("20211001X001/2", "GV_")], Is.EqualTo((4_000, GV_ungeb)));
                 // Bio
-                Assert.That(prices[("20211001X002/1", "GV_")], Is.EqualTo((    0, GVB_ungeb)));
                 Assert.That(prices[("20211001X002/1", "GV")],  Is.EqualTo((4_000, GVB_geb)));
                 // Bio
                 Assert.That(prices[("20211001X002/2", "GV_")], Is.EqualTo((4_000, GVB_ungeb)));
@@ -260,87 +255,101 @@ namespace Tests.HelperTests {
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_04_ComplexNotStrictAreaComs() {
+        public Task Test_04_ComplexNotStrictAreaComs() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_05_ComplexNotStrictAreaComs_HonorGebunden() {
+        public Task Test_05_ComplexNotStrictAreaComs_HonorGebunden() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_06_StrictAreaComs_NoFillLower_NotAllowed() {
+        public Task Test_06_StrictAreaComs_NoFillLower_NotAllowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_07_StrictAreaComs_NoFillLower_Allowed() {
+        public Task Test_07_StrictAreaComs_NoFillLower_Allowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_08_StrictAreaComs_NoFillLower_Allowed_AvoidUnderDeliveries() {
+        public Task Test_08_StrictAreaComs_NoFillLower_Allowed_AvoidUnderDeliveries() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_09_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
+        public Task Test_09_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_10_StrictAreaComs_FillLowerUntilObligation_Allowed() {
+        public Task Test_10_StrictAreaComs_FillLowerUntilObligation_Allowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_11_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
+        public Task Test_11_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
             // TODO
+            return Task.CompletedTask;
         }
 
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_12_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
+        public Task Test_12_StrictAreaComs_FillLowerUntilObligation_NotAllowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_13_StrictAreaComs_FillLowerUntilObligation_Allowed() {
+        public Task Test_13_StrictAreaComs_FillLowerUntilObligation_Allowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_14_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
+        public Task Test_14_StrictAreaComs_FillLowerUntilObligation_Allowed_AvoidUnderDeliveries() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_15_StrictAreaComs_FillLowerUntilRight_NotAllowed() {
+        public Task Test_15_StrictAreaComs_FillLowerUntilRight_NotAllowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_16_StrictAreaComs_FillLowerUntilRight_Allowed() {
+        public Task Test_16_StrictAreaComs_FillLowerUntilRight_Allowed() {
             // TODO
+            return Task.CompletedTask;
         }
 
         [Test]
         [Ignore("Not implemented yet")]
-        public async Task Test_17_StrictAreaComs_FillLowerUntilRight_Allowed_AvoidUnderDeliveries() {
+        public Task Test_17_StrictAreaComs_FillLowerUntilRight_Allowed_AvoidUnderDeliveries() {
             // TODO
+            return Task.CompletedTask;
         }
     }
 }