Bump version to 0.5.1

Elwig/App.xaml

@@ -2,11 +2,12 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Elwig"
-             xmlns:controls="clr-namespace:Elwig.Controls"
+             xmlns:ctrl="clr-namespace:Elwig.Controls"
              StartupUri="Windows\MainWindow.xaml"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
-        <controls:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
@@ -83,6 +84,12 @@
             </DataTemplate.Triggers>
         </DataTemplate>
 
+        <DataTemplate x:Key="WineOriginTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}"/>
+            </StackPanel>
+        </DataTemplate>
         <ControlTemplate x:Key="WineOriginTemplateSimple">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
@@ -94,7 +101,7 @@
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
         </ControlTemplate>
-        <DataTemplate x:Key="WineOriginTemplate">
+        <DataTemplate x:Key="WineOriginComboTemplate">
             <Control x:Name="Control" Focusable="False" Template="{StaticResource WineOriginTemplateExtended}"/>
             <DataTemplate.Triggers>
                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
@@ -102,5 +109,31 @@
                 </DataTrigger>
             </DataTemplate.Triggers>
         </DataTemplate>
+
+        <DataTemplate x:Key="GemTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Gkz, StringFormat='{} ({0:00000})'}"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="WbKgTemplate">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <TextBlock Width="250">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/>
+                </TextBlock>
+                <TextBlock Text="{Binding Gem.WbGem.Origin.Name}"/>
+            </StackPanel>
+        </DataTemplate>
+        <DataTemplate x:Key="WbKgGlTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Width="220">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/>
+                </TextBlock>
+                <TextBlock Text="{Binding WbKg.Gl.Name}"/>
+            </StackPanel>
+        </DataTemplate>
     </Application.Resources>
 </Application>

Elwig/App.xaml.cs

@@ -13,10 +13,16 @@ using System.Threading;
 using System.Windows.Markup;
 using System.Reflection;
 using Elwig.Helpers.Printing;
+using Elwig.Windows;
+using Elwig.Dialogs;
+using System.Threading.Tasks;
 
 namespace Elwig {
     public partial class App : Application {
 
+        protected static App CurrentApp;
+        public static int NumWindows => CurrentApp.Windows.Count;
+
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
@@ -35,6 +41,7 @@ namespace Elwig {
             }
         }
 
+        public static int BranchNum { get; private set; }
         public static string ZwstId { get; private set; }
         public static string BranchName { get; private set; }
         public static int? BranchPlz { get; private set; }
@@ -55,6 +62,7 @@ namespace Elwig {
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
+            CurrentApp = this;
         }
 
         protected override void OnStartup(StartupEventArgs evt) {
@@ -71,7 +79,7 @@ namespace Elwig {
                 new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
             );
 
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
 
             try {
                 AppDbUpdater.CheckDb();
@@ -91,6 +99,7 @@ namespace Elwig {
                     Shutdown();
                     return;
                 }
+                BranchNum = branches.Count;
             }
 
             Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
@@ -128,7 +137,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -139,7 +148,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;
@@ -166,5 +175,74 @@ namespace Elwig {
                 }
             }
         }
+
+        public static async Task HintContextChange() {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is not ContextWindow c) continue;
+                await c.HintContextChange();
+            }
+        }
+
+        private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is T t && (selector == null || selector(t))) {
+                    if (t.WindowState == WindowState.Minimized)
+                        t.WindowState = WindowState.Normal;
+                    t.Activate();
+                    return t;
+                }
+            }
+            var n = constructor();
+            n.Show();
+            return n;
+        }
+
+        public static DeliveryAdminWindow FocusReceipt() {
+            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.IsReceipt);
+        }
+
+        public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
+            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+        }
+
+        public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
+            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+        }
+
+        public static BaseDataWindow FocusBaseData() {
+            return FocusWindow<BaseDataWindow>(() => new());
+        }
+
+        public static BaseDataWindow FocusBaseDataAreaComType() {
+            var w = FocusBaseData();
+            w.AreaCommitmentTypes.Focus();
+            return w;
+        }
+
+        public static SeasonFinishWindow FocusSeasonFinish() {
+            return FocusWindow<SeasonFinishWindow>(() => new());
+        }
+
+        public static DeliveryConfirmationsWindow FocusDeliveryConfirmations(int year) {
+            return FocusWindow<DeliveryConfirmationsWindow>(() => new(year), w => w.Year == year);
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchy() {
+            return FocusWindow<OriginHierarchyWindow>(() => new());
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchyKg(int kgnr) {
+            var w = FocusOriginHierarchy();
+            w.FocusKgNr(kgnr);
+            return w;
+        }
+
+        public static PaymentVariantsWindow FocusPaymentVariantsWindow(int year) {
+            return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
+        }
+
+        public static ChartWindow FocusChartWindow(int year, int avnr) {
+            return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
+        }
     }
 }

Elwig/Controls/BoolToValueConverter.cs

@@ -1,16 +1,17 @@
 using System;
 using System.Windows.Data;
+using System.Globalization;
 
 namespace Elwig.Controls {
     public class BoolToValueConverter<T> : IValueConverter {
         public T FalseValue { get; set; }
         public T TrueValue { get; set; }
 
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
             return (bool)value ? TrueValue : FalseValue;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) {
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
             return value?.Equals(TrueValue) ?? false;
         }
     }

Elwig/Controls/UnitTextBox.xaml

@@ -0,0 +1,11 @@
+<UserControl x:Class="Elwig.Controls.UnitTextBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="25">
+        <TextBox x:Name="TextBox" TextAlignment="Right" FontSize="14" VerticalAlignment="Stretch"
+                 Padding="{Binding ElementName=UnitBlock, Path=ActualWidth, Converter={StaticResource WidthToPaddingConverter}}"
+                 Text="{Binding Path=Text}" TextChanged="TextBox_TextChanged"/>
+        <TextBlock x:Name="UnitBlock" Text="{Binding Path=Unit}" Margin="0,0,4,4" FontSize="10"
+                   HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
+    </Grid>
+</UserControl>

Elwig/Controls/UnitTextBox.xaml.cs

@@ -0,0 +1,37 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Controls {
+    public partial class UnitTextBox : UserControl {
+
+        public event TextChangedEventHandler? TextChanged;
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(UnitTextBox));
+        public string Text {
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value ?? "");
+        }
+
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitTextBox));
+        public string Unit {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value ?? "");
+        }
+
+        public UnitTextBox() {
+            Text = "";
+            Unit = "";
+            InitializeComponent();
+            DataContext = this;
+        }
+
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs evt) {
+            Text = TextBox.Text;
+            TextChanged?.Invoke(sender, evt);
+        }
+
+        public new void Focus() {
+            TextBox.Focus();
+        }
+    }
+}

Elwig/Controls/WidthToPaddingConverter.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Elwig.Controls {
+    public class WidthToPaddingConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return new Thickness(2, 2, 4 + (double)value, 2);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            return ((Thickness)value).Right - 4;
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cs

@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {

Elwig/Documents/BusinessLetter.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class BusinessLetter : BusinessDocument {

Elwig/Documents/CreditNote.cs

@@ -1,40 +1,31 @@
 using Elwig.Helpers;
-using Elwig.Models;
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Linq;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class CreditNote : BusinessDocument {
 
-        public Credit Credit;
+        public Credit? Credit;
+        public CreditNoteData Data;
         public string? Text;
         public string CurrencySymbol;
-        public string[] BucketNames;
         public int Precision;
-        public IEnumerable<DeliveryPart> Parts;
 
-        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
+        public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteData data) :
+            base($"Traubengutschrift {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
-            Credit = c;
+            Data = data;
+            Credit = p.Credit;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{c.TgId}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{c.Payment.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{c.ModifiedTimestamp:dd.MM.yyyy} / {c.ModifiedTimestamp:HH:mm}</td></tr>" +
+                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr}" : "-")}</td></tr>" +
+                $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Datum/Zeit</th><td>{p.Credit?.ModifiedTimestamp:dd.MM.yyyy} / {p.Credit?.ModifiedTimestamp:HH:mm}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
-            DocumentId = $"Tr.-Gutschr. {c.TgId}";
-            CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
-            BucketNames = new string[0]; // FIXME
-            Precision = c.Payment.Variant.Season.Precision;
-            Parts = ctx.DeliveryParts.FromSql($"""
-                SELECT p.*
-                FROM v_delivery v
-                JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
-                WHERE (v.year, v.mgnr) = ({c.Year}, {c.Member.MgNr})
-                ORDER BY sortid, attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, date, time, dpnr
-                """).ToList();
+            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr}" : p.MgNr);
+            CurrencySymbol = p.Variant.Season.Currency.Symbol ?? p.Variant.Season.Currency.Code;
+            Precision = p.Variant.Season.Precision;
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -3,24 +3,22 @@
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
-@{
-    var bucketNum = Model.BucketNames.Length;
-}
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
         <colgroup>
-            <col style="width: 24mm;"/>
-            <col style="width: 6mm;"/>
-            <col style="width: 31mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
-            <col style="width: 8mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 12mm;"/>
-            <col style="width: 10mm;"/>
             <col style="width: 12mm;"/>
             <col style="width: 15mm;"/>
-            <col style="width: 17mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
         </colgroup>
         <thead>
             <tr>
@@ -29,58 +27,64 @@
                 <th rowspan="3" style="text-align: left;">Sorte</th>
                 <th rowspan="3" style="text-align: left;">Attribut</th>
                 <th rowspan="2" colspan="2">Gradation</th>
+                <th rowspan="2" colspan="2">Flächenbindung</th>
+                <th rowspan="2">Preis</th>
                 <th colspan="2">Zu-/Abschläge</th>
-                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
                 <th rowspan="2">Betrag</th>
             </tr>
             <tr>
-                <th>Abs.</th>
                 <th>Rel.</th>
-                <th>Gewicht</th>
-                <th>Preis</th>
+                <th>Abs.</th>
             </tr>
             <tr>
                 <th>[°Oe]</th>
                 <th>[°KMW]</th>
+                <th colspan="2">[kg]</th>
                 <th>[@Model.CurrencySymbol/kg]</th>
                 <th>[%]</th>
-                <th>[kg]</th>
                 <th>[@Model.CurrencySymbol/kg]</th>
                 <th>[@Model.CurrencySymbol]</th>
             </tr>
         </thead>
         <tbody>
-            @{
-                string FormatRow(int? weight, decimal? amount) {
-                    var w = weight == null || weight == 0 ? "-" : $"{weight:N0}";
-                    return $"<td class='weight'>{w}</td><td class='amount'>{amount?.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)))}</td>";
+            @foreach (var p in Model.Data.Rows) {
+                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
+                var first = true;
+                //var pmt = p.Payment;
+                var abs = 0; // pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
+                var rel = 0; // pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(first ? "first" : "") @(rows > i + 1 ? "trailing" : "")">
+                        @if (first) {
+                            <td rowspan="@rows" class="lsnr">@p.LsNr</td>
+                            <td rowspan="@rows" class="dpnr">@p.DPNr</td>
+                            <td class="variant small">@p.Variant</td>
+                            <td class="attribute small">@p.Attribute</td>
+                            <td rowspan="@rows" class="oe">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="kmw">@($"{p.Gradation.Kmw:N1}")</td>
                         }
-                string? last = null;
+                        @if (i > 0 && i <= p.Modifiers.Length) {
+                            <td colspan="2" class="mod">@(p.Modifiers[i - 1])</td>
+                        } else if (i > 0) {
+                            <td colspan="2"></td>
+                        }
+                        @if (i < p.Buckets.Length) {
+                            var bucket = p.Buckets[i];
+                            <td class="geb small">@bucket.Name:</td>
+                            <td class="weight">@($"{bucket.Value:N0}")</td>
+                            <td class="price">@($"{bucket.Price:N4}")</td>
+                        } else {
+                            <td colspan="3"></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="rel">@rel</td>
+                            <td rowspan="@rows" class="abs">@abs</td>
+                            <!-- FIXME rel/abs mods -->
+                            <td rowspan="@rows" class="amount">@($"{p.Buckets.Sum(b => b.Amount):N2}")</td>
+                            first = false;
                         }
-            @foreach (var part in Model.Parts) {
-                var pmt = part.Payment;
-                var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
-                var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@part.Attribute?.Name</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
-                    <!--FIXME price-->
-                    @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(0)?.Value, 0))
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
-                </tr>
-                @for (int i = 1; i < bucketNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
-                        <!--FIXME price-->
-                        @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(i)?.Value, 0))
                     </tr>
                 }
-                last = part.SortId;
             }
         </tbody>
     </table>

Elwig/Documents/CreditNote.css

@@ -32,7 +32,8 @@ table.credit .dpnr {
 }
 
 table.credit .amount,
-table.credit .weight {
+table.credit .weight,
+table.credit .price {
     text-align: right;
 }
 
@@ -62,3 +63,7 @@ table.credit tbody tr.last td {
 table.credit tbody tr.new {
     border-top: 0.5pt solid black;
 }
+
+table.credit .small {
+    font-size: 8pt;
+}

Elwig/Documents/DeliveryConfirmation.cs

@@ -1,33 +1,25 @@
 using Elwig.Helpers;
-using Elwig.Models;
-using Microsoft.EntityFrameworkCore;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
         public Season Season;
-        public IEnumerable<DeliveryPart> Deliveries;
+        public DeliveryConfirmationData Data;
         public string? Text = App.Client.TextDeliveryConfirmation;
         public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, IEnumerable<DeliveryPart>? deliveries = null) :
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationData data) :
             base($"Anlieferungsbestätigung {year}", m) {
             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;
             IncludeSender = true;
             DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
-            Deliveries = deliveries ?? ctx.DeliveryParts.FromSqlRaw($"""
-                SELECT p.*
-                FROM v_delivery v
-                    JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
-                WHERE (v.year, v.mgnr) = ({Season.Year}, {m.MgNr})
-                ORDER BY v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
-                """)
-                .ToList();
+            Data = data;
             MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
     }

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -41,39 +41,35 @@
         </thead>
         <tbody>
             @{
-                var lastSortId = "";
+                var lastVariant = "";
             }
-            @foreach (var p in Model.Deliveries) {
-                var buckets = p.Buckets.Where(b => b.Value > 0).OrderByDescending(b => b.BktNr).ToArray();
-                var rowsBuckets = buckets.Length;
-                var mods = p.Modifiers.Select(m => m.Name).ToArray();
-                var rowsMod = mods.Length + 1;
-                var rows = Math.Max(rowsBuckets, rowsMod);
+            @foreach (var p in Model.Data.Rows) {
+                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
                 var first = true;
                 @for (int i = 0; i < rows; i++) {
-                    <tr class="@(first ? "first" : "") @(p.SortId != lastSortId && lastSortId != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                    <tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
                         @if (first) {
-                            <td rowspan="@rows">@p.Delivery.LsNr</td>
+                            <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
-                            <td class="small">@p.Variant.Name</td>
-                            <td class="small">@p.Attribute?.Name</td>
-                            <td class="small">@p.Quality.Name</td>
-                            <td rowspan="@rows" class="grad">@($"{p.Oe:N0}")</td>
-                            <td rowspan="@rows" class="grad">@($"{p.Kmw:N1}")</td>
+                            <td class="small">@p.Variant</td>
+                            <td class="small">@p.Attribute</td>
+                            <td class="small">@p.QualityLevel</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Gradation.Kmw:N1}")</td>
                         }
-                        @if (i > 0 && i <= mods.Length) {
-                            <td colspan="3" class="mod">@(mods[i - 1])</td>
+                        @if (i > 0 && i <= p.Modifiers.Length) {
+                            <td colspan="3" class="mod">@(p.Modifiers[i - 1])</td>
                         } else if (i > 0) {
                             <td colspan="3"></td>
                         }
-                        @if (i < buckets.Length) {
-                            var bucket = buckets[i];
-                            <td class="geb">@(bucket.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{bucket.Discr}"):</td>
+                        @if (i < p.Buckets.Length) {
+                            var bucket = p.Buckets[i];
+                            <td class="geb">@bucket.Name:</td>
                             <td class="weight">@($"{bucket.Value:N0}")</td>
                         } else {
                             <td colspan="2"></td>
                         }
-                        @if (i == buckets.Length - 1) {
+                        @if (i == p.Buckets.Length - 1) {
                             <td class="weight">@($"{p.Weight:N0}")</td>
                         } else {
                             <td></td>
@@ -83,12 +79,12 @@
                             first = false;
                         }
                     </tr>
-                    lastSortId = p.SortId;
                 }
+                lastVariant = p.Variant;
             }
             <tr class="sum">
                 <td colspan="8">Gesamt:</td>
-                <td colspan="2" class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td colspan="2" class="weight">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
                 <td></td>
             </tr>
         </tbody>

Elwig/Documents/DeliveryJournal.cs

@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;

Elwig/Documents/DeliveryNote.cs

@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Collections.Generic;
 
 namespace Elwig.Documents {

Elwig/Documents/Document.cs

@@ -67,6 +67,8 @@ namespace Elwig.Documents {
                 name = "Letterhead";
             } else if (this is DeliveryConfirmation) {
                 name = "DeliveryConfirmation";
+            } else if (this is MemberDataSheet) {
+                name = "MemberDataSheet";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }

Elwig/Documents/Letterhead.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {

Elwig/Documents/MemberDataSheet.cs

@@ -0,0 +1,21 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class MemberDataSheet : BusinessDocument {
+
+        public Season Season;
+        public int Year = Utils.CurrentYear;
+        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
+        public Dictionary<string, int> BucketAreas;
+
+        public MemberDataSheet(Member m, AppDbContext ctx) : base($"Stammdatenblatt {m.AdministrativeName}", m) {
+            DocumentId = $"Stammdatenblatt {m.MgNr}";
+            Season = ctx.Seasons.Find(Year) ?? throw new ArgumentException("invalid season");
+            MemberBuckets = ctx.GetMemberBuckets(Year, m.MgNr).GetAwaiter().GetResult();
+            BucketAreas = ctx.GetMemberBucketAreas(Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/MemberDataSheet.cshtml

@@ -0,0 +1,324 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.MemberDataSheet>
+@model Elwig.Documents.MemberDataSheet
+@{
+    Layout = "BusinessDocument";
+}
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
+<main>
+    <h1>@Model.Title</h1>
+    <table class="member">
+        <thead>
+            <tr><th colspan="4">Persönliche Daten</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>Mitglieds-Nr.</th>
+                <td>@Model.Member.MgNr</td>
+                <th>Vorgänger MgNr.</th>
+                <td>@Model.Member.PredecessorMgNr</td>
+            </tr>
+            <tr>
+                <th>Titel (vorangestellt)</th>
+                <td>@Model.Member.Prefix</td>
+                <th>Titel (nachgestellt)</th>
+                <td>@Model.Member.Suffix</td>
+            </tr>
+            <tr>
+                <th>Vorname</th>
+                <td>@Model.Member.GivenName</td>
+                <th>Nachname</th>
+                <td>@Model.Member.FamilyName</td>
+            </tr>
+            <tr>
+                <th>Weitere Vornamen</th>
+                <td colspan="3">@Model.Member.MiddleName</td>
+            </tr>
+            <tr>
+                <th>Geburtsjahr/-tag</th>
+                <td colspan="3">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse()??Array.Empty<string>()))</td>
+            </tr>
+        </tbody>
+
+        <thead>
+            <tr><th colspan="4">Anschrift</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>Adresse</th>
+                <td colspan="3">@Model.Member.Address</td>
+            </tr>
+            <tr>
+                <th>PLZ/Ort</th>
+                <td colspan="3">@Model.Member.PostalDest.AtPlz?.Plz @Model.Member.PostalDest.AtPlz?.Dest (@Model.Member.PostalDest.AtPlz?.Ort.Name)</td>
+            </tr>
+        </tbody>
+
+        <thead>
+            <tr><th colspan="4">Rechnungsadresse</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>Name</th>
+                <td colspan="3">@Model.Member.BillingAddress?.Name</td>
+            </tr>
+            <tr>
+                <th>Adresse</th>
+                <td colspan="3">@Model.Member.BillingAddress?.Address</td>
+            </tr>
+            <tr>
+                <th>PLZ/Ort</th>
+                <td colspan="3">@Model.Member.BillingAddress?.PostalDest.AtPlz?.Plz @Model.Member.BillingAddress?.PostalDest.AtPlz?.Dest @((Model.Member.BillingAddress != null && Model.Member.BillingAddress.PostalDest.AtPlz != null) ? "(" + Model.Member.BillingAddress?.PostalDest.AtPlz?.Ort.Name + ")" : "")</td>
+            </tr>
+        </tbody>
+        
+        <thead>
+            <tr><th colspan="4">Kontaktdaten</th></tr>
+        </thead>
+        <tbody>
+            @foreach (var e in Model.Member.EmailAddresses) {
+                var emailNumber = Model.Member.EmailAddresses.Count > 1 ? 1 : 0;
+                <tr>
+                    <th>E-Mail-Adresse @(emailNumber != 0 ? $"({emailNumber})" : "")</th>
+                    <td colspan="3">@e.Address</td>
+                </tr>
+                emailNumber++;
+            }
+            @foreach (var k in Model.Member.TelephoneNumbers) {
+                <tr>
+                    @if (k.Type.Equals("landline")) {
+                        <th>Tel.-Nr. (Festnetz)</th>
+                    } else if (k.Type.Equals("mobile")) {
+                        <th>Tel.-Nr. (mobil)</th>
+                    } else if (k.Type.Equals("fax")) {
+                        <th>Fax-Nr.</th>
+                    }
+                    <td colspan="3">@k.Number</td>
+                </tr>
+            }
+        </tbody>
+
+        <thead>
+            <tr><th colspan="4">Bankverbindung</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>IBAN</th>
+                <td colspan="3">@(Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : "")</td>
+            </tr>
+            <tr>
+                <th>BIC</th>
+                <td colspan="3">@Model.Member.Bic</td>
+            </tr>
+        </tbody>
+
+        <thead>
+            <tr><th colspan="4">Betrieb</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>UID</th>
+                <td>@Model.Member.UstIdNr</td>
+                <th>Betriebs-Nr.</th>
+                <td>@Model.Member.LfbisNr</td>
+            </tr>
+            <tr>
+                <th>Buchführend</th>
+                <td>@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
+                <th>Bio</th>
+                <td>@(Model.Member.IsOrganic ? "Ja" : "Nein")</td>
+            </tr>
+        </tbody>
+
+        <thead>
+            <tr><th colspan="4">Genossenschaft</th></tr>
+        </thead>
+        <tbody>
+            <tr>
+                <th>Eintritt</th>
+                <td>@Model.Member.EntryDate</td>
+                <th>Austritt</th>
+                <td>@Model.Member.ExitDate</td>
+            </tr>
+            <tr>
+                <th>Aktiv</th>
+                <td>@(Model.Member.IsActive ? "Ja" : "Nein")</td>
+                <th>Geschäftsanteile</th>
+                <td>@Model.Member.BusinessShares</td>
+            </tr>
+            <tr>
+                <th>Volllierferant</th>
+                <td>@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td>
+                <th>Funktionär</th>
+                <td>@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Stamm-Zweigstelle</th>
+                <td>@Model.Member.Branch?.Name</td>
+                <th>Stammgemeinde</th>
+                <td>@Model.Member.DefaultKg?.Name</td>
+            </tr>
+            <tr>
+                <th>Kontakt via Post</th>
+                <td>@(Model.Member.ContactViaPost ? "Ja" : "Nein")</td>
+                <th>Kontakt via E-Mail</th>
+                <td>@(Model.Member.ContactViaEmail ? "Ja" : "Nein")</td>
+            </tr>
+        </tbody>
+    </table>
+
+    @{
+        var areaComs = Model.Member.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)
+        }).OrderByDescending(a => a.Size).ToList();
+        var lastContract = "";
+    }
+
+    @if (areaComs.Count != 0) {
+        <h1>Flächenbindungen</h1>
+        <table class="area-commitements">
+            <colgroup>
+                <col style="width: 40mm;" />
+                <col style="width: 30mm;" />
+                <col style="width: 35mm;" />
+                <col style="width: 15mm;" />
+                <col style="width: 25mm;" />
+                <col style="width: 20mm;" />
+            </colgroup>
+            <thead>
+                <tr>
+                    <th rowspan="2" style="text-align: left;">Katastralgemeinde</th>
+                    <th rowspan="2" style="text-align: left;">Ried</th>
+                    <th rowspan="2" style="text-align: left;">Parzelle(n)</th>
+                    <th>Fläche</th>
+                    <th rowspan="2" style="text-align: center;">Bewirt.</th>
+                    <th rowspan="2" style="text-align: center;">Laufzeit</th>
+                </tr>
+                <tr>
+                    <th>[m²]</th>
+                </tr>
+            </thead>
+            <tbody>
+
+                @foreach (var contractType in areaComs) {
+                    <tr class="contract-type @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")">
+                        <th colspan="3" style="text-align: left">
+                            @($"{contractType.AreaComType.WineVar.Name} {(contractType.AreaComType.WineAttr != null ? "(" + contractType.AreaComType.WineAttr + ")" : "")}")
+                        </th>
+                        <th style="text-align: right">@($"{contractType.Size:N0}")</th>
+                        <th colspan="2"></th>
+                    </tr>
+                    @foreach (var areaCom in contractType.AreaComs) {
+                        <tr class="area-commitment">
+                            <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@areaCom.Kg.AtKg.KgNr)</span></td>
+                            <td>@areaCom.Rd?.Name</td>
+                            <td>@areaCom.GstNr.Replace(",", ", ")</td>
+                            <td style="text-align: right;">@($"{areaCom.Area:N0}")</td>
+                            <td style="text-align: center;">@areaCom.WineCult.Name</td>
+                            <td style="text-align: center;">Ab @areaCom.YearFrom</td>
+                        </tr>
+                        lastContract = contractType.AreaComType.DisplayName;
+                    }
+                }
+
+                <tr class="new">
+                    <th colspan="3" style="text-align: left">Gesamt</th>
+                    <th style="text-align: right">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</th>
+                    <th colspan="2"></th>
+                </tr>
+
+            </tbody>
+        </table>
+
+        <table class="delivery-confirmation-stats">
+            <colgroup>
+                <col style="width: 102mm;" />
+                <col style="width: 21mm;" />
+                <col style="width: 21mm;" />
+                <col style="width: 21mm;" />
+            </colgroup>
+            <thead>
+                <tr>
+                    <th rowspan="2"></th>
+                    <th style="text-align: center;">Fläche</th>
+                    <th style="text-align: center;">Lieferpflicht</th>
+                    <th style="text-align: center;">Lieferrecht</th>
+                </tr>
+                <tr>
+                    <th style="text-align: center;">[m²]</th>
+                    <th style="text-align: center;">[kg]</th>
+                    <th style="text-align: center;">[kg]</th>
+                </tr>
+            </thead>
+            <tbody>
+                @{
+                    string FormatRow(int mode, int area, int obligation, int right) {
+                        return $"<td>{(mode == 0 || mode == 1 ? "" : area == 0 ? "-" : $"{area:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>";
+                    }
+                    var mBuckets = Model.MemberBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
+                    var fbVars = mBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
+                    var fbs = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2).OrderBy(b => b.Value.Item1);
+                    var vtr = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2).OrderBy(b => b.Value.Item1);
+                }
+                <tr>
+                    <th>Laut gezeichneten GA</th>
+                    @Raw(FormatRow(
+                        0,
+                        0,
+                        Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
+                        Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare
+                        ))
+                </tr>
+                @if (fbs.Any()) {
+                    <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
+                }
+                @foreach (var (id, (name, right, obligation, _, _)) in fbs) {
+                    <tr>
+                        <th>@name</th>
+                        @Raw(FormatRow(2, Model.BucketAreas[id], obligation, right))
+                    </tr>
+                }
+                @if (vtr.Any()) {
+                    <tr class="subheading"><th colspan="8">Verträge:</th></tr>
+                }
+                @foreach (var (id, (name, right, obligation, _, _)) in vtr) {
+                    <tr>
+                        <th>@name</th>
+                        @Raw(FormatRow(2, Model.BucketAreas[id], obligation, right))
+                    </tr>
+                }
+            </tbody>
+        </table>
+    } else {
+        <table class="delivery-confirmation-stats" style="margin-top: 5mm;">
+            <colgroup>
+                <col style="width: 123mm;" />
+                <col style="width: 21mm;" />
+                <col style="width: 21mm;" />
+            </colgroup>
+            <thead>
+                <tr>
+                    <th rowspan="2"></th>
+                    <th style="text-align: center;">Lieferpflicht</th>
+                    <th style="text-align: center;">Lieferrecht</th>
+                </tr>
+                <tr>
+                    <th style="text-align: center;">[kg]</th>
+                    <th style="text-align: center;">[kg]</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>Laut gezeichneten GA</th>
+                    <td>@($"{Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare:N0}")</td>
+                    <td>@($"{Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare:N0}")</td>
+                </tr>
+            </tbody>
+        </table>
+    }
+
+</main>

Elwig/Documents/MemberDataSheet.css

@@ -0,0 +1,82 @@
+table.member {
+    border: 0.5pt solid black;
+}
+
+table.member, table.area-commitements {
+    font-size: 10pt;
+}
+
+table.member tbody th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: left;
+}
+
+
+table.member thead,
+table.member tbody {
+    border: 0.5pt solid black;
+}
+
+table.area-commitements td {
+    overflow: hidden;
+}
+
+table.area-commitements thead tr th {
+    font-weight: normal;
+    font-style: italic; 
+}
+
+table.area-commitements tbody tr.contract-type {
+    margin-bottom: 10px;
+}
+
+table.area-commitements tbody td {
+    vertical-align: top;
+}
+
+table.area-commitements tr.new th {
+    border-top: 0.5pt solid black;
+}
+
+table.delivery-confirmation-stats {
+    font-size: 10pt;
+    break-inside: avoid;
+}
+
+table.delivery-confirmation-stats th,
+table.delivery-confirmation-stats td {
+    padding: 0.125mm 0;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.delivery-confirmation-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-confirmation-stats thead th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: right;
+    font-size: 10pt;
+}
+
+table.delivery-confirmation-stats thead th:first-child {
+    text-align: left;
+}
+
+table.delivery-confirmation-stats td {
+    text-align: right;
+}
+
+table.delivery-confirmation-stats tbody th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: left;
+}
+
+table.delivery-confirmation-stats tr.subheading th {
+    font-weight: bold;
+    border-top: 0.5pt solid black;
+}

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.4.3</Version>
+    <Version>0.5.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 

Elwig/Helpers/AppDbContext.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Linq;
 using System.Threading.Tasks;
 using System.IO;
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Data.Sqlite;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using Elwig.Models.Dtos;
 
 namespace Elwig.Helpers {
     public class AppDbContext : DbContext {
@@ -26,6 +27,8 @@ namespace Elwig.Helpers {
         public DbSet<WineVar> WineVarieties { get; private set; }
 
         public DbSet<ClientParam> ClientParameters { get; private set; }
+        public DbSet<WbGl> WbGls { get; private set; }
+        public DbSet<WbGem> WbGems { get; private set; }
         public DbSet<WbKg> WbKgs { get; private set; }
         public DbSet<WbRd> WbRde { get; private set; }
         public DbSet<WineAttr> WineAttributes { get; private set; }
@@ -45,6 +48,11 @@ namespace Elwig.Helpers {
         public DbSet<PaymentMember> MemberPayments { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
 
+        public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
+        public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
+        public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
+
         private readonly StreamWriter? LogFile = null;
         public static DateTime LastWriteTime => File.GetLastWriteTime(App.Config.DatabaseFile);
         public DateTime SavedLastWriteTime { get; private set; }
@@ -55,6 +63,7 @@ namespace Elwig.Helpers {
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = new();
         private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberBucketAreas = new();
 
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
@@ -158,6 +167,13 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
+        public async Task<int> NextRdNr(int kgnr) {
+            int c = 0;
+            (await WbRde.Where(r => r.KgNr == kgnr).Select(r => r.RdNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
         public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
@@ -241,6 +257,28 @@ namespace Elwig.Helpers {
             _memberPaymentBuckets[year] = buckets;
         }
 
+        private async Task FetchMemberBucketAreas(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, area FROM v_area_commitment_bucket_strict WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    var v = reader.GetInt32(2);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = v;
+                    if (bucket.Length > 2) {
+                        buckets[mgnr][bucket[..2]] = buckets[mgnr].GetValueOrDefault(bucket[..2], 0) + v;
+                    }
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberBucketAreas[year] = buckets;
+        }
+
         public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberRightsAndObligations.ContainsKey(year))
                 await FetchMemberRightsAndObligations(year, cnx);
@@ -259,6 +297,12 @@ namespace Elwig.Helpers {
             return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, new());
         }
 
+        public async Task<Dictionary<string, int>> GetMemberBucketAreas(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberBucketAreas.ContainsKey(year))
+                await FetchMemberBucketAreas(year, cnx);
+            return _memberBucketAreas[year].GetValueOrDefault(mgnr, new());
+        }
+
         public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();

Elwig/Helpers/AppDbUpdater.cs

@@ -1,14 +1,16 @@
 using Microsoft.Data.Sqlite;
 using System;
+using System.Windows;
 
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 6;
+        public static readonly int RequiredSchemaVersion = 9;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5, UpdateDbSchema_5_To_6
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5,
+            UpdateDbSchema_5_To_6, UpdateDBSchema_6_To_7, UpdateDbSchema_7_To_8, UpdateDbSchema_8_To_9,
         };
 
         private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
@@ -492,5 +494,225 @@ namespace Elwig.Helpers {
                 ORDER BY year, mgnr, bucket;
                 """);
         }
+
+        private static void UpdateDBSchema_6_To_7(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bucket_strict");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bucket_strict AS
+                SELECT s.year, c.mgnr,
+                       t.sortid || COALESCE(a.attrid, '') AS bucket,
+                       t.sortid, a.attrid,
+                       SUM(area) AS area,
+                       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
+                       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
+                FROM season s, area_commitment c
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+                WHERE (year_from IS NULL OR year_from <= s.year) AND
+                      (year_to IS NULL OR year_to >= s.year)
+                GROUP BY s.year, c.mgnr, bucket
+                ORDER BY s.year, c.mgnr, bucket;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery_bucket_strict AS
+                SELECT c.year, c.mgnr, c.bucket, c.min_kg, COALESCE(p.weight, 0) AS weight
+                FROM v_area_commitment_bucket_strict c
+                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                ORDER BY c.year, c.mgnr, c.bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery_bucket AS
+                SELECT u.year, u.mgnr, u.bucket, u.min_kg,
+                       u.weight + SUM(MAX(COALESCE(p.weight - s.min_kg, 0), 0)) AS weight
+                FROM v_under_delivery_bucket_strict u
+                    LEFT JOIN v_payment_bucket_strict p ON (p.year, p.mgnr, p.sortid) = (u.year, u.mgnr, u.bucket) AND p.attrid IS NOT NULL
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN v_area_commitment_bucket_strict s ON (s.year, s.mgnr, s.bucket) = (p.year, p.mgnr, p.bucket)
+                WHERE (p.gebunden IS NULL OR p.gebunden) AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY u.year, u.mgnr, u.bucket
+                ORDER BY u.year, u.mgnr, u.bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_under_delivery AS
+                SELECT year, mgnr, bucket, min_kg, weight, weight - min_kg AS diff
+                FROM v_under_delivery_bucket
+                WHERE diff < 0;
+                """);
+        }
+
+        private static void UpdateDbSchema_7_To_8(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT a.gkz, 'WLNO'
+                FROM AT_gem a
+                    LEFT JOIN wb_gem w ON w.gkz = a.gkz
+                WHERE a.gkz / 10000 = 3 AND w.hkid IS NULL;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'SLVL'
+                FROM AT_gem
+                WHERE gkz / 100 IN (617, 622, 623);
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'SLSS'
+                FROM AT_gem
+                WHERE gkz / 100 = 610;
+                """);
+            ExecuteNonQuery(cnx, """
+                UPDATE wb_gem
+                SET hkid = 'SLVL'
+                WHERE gkz IN (61007, 61052, 61001, 61055, 61027, 61057, 61008, 61057);
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'SLWS'
+                FROM AT_gem
+                WHERE gkz / 100 IN (603, 616) OR gkz IN (60101, 60663, 60651, 60659, 60664, 60647, 60641, 60639, 60665, 60669, 60618, 60629, 60608, 60670, 60624, 60660, 60656, 60655);
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT g.gkz, 'SLVL'
+                FROM AT_gem g
+                    LEFT JOIN wb_gem w ON w.gkz = g.gkz
+                WHERE g.gkz / 100 = 606 AND w.hkid IS NULL;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT g.gkz, 'SLST'
+                FROM AT_gem g
+                    LEFT JOIN wb_gem w ON w.gkz = g.gkz
+                WHERE g.gkz / 10000 = 6 AND w.hkid IS NULL;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'BLOO'
+                FROM AT_gem
+                WHERE gkz / 10000 = 4;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'BLKA'
+                FROM AT_gem
+                WHERE gkz / 10000 = 2;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'BLSB'
+                FROM AT_gem
+                WHERE gkz / 10000 = 5;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'BLTI'
+                FROM AT_gem
+                WHERE gkz / 10000 = 7;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO wb_gem
+                SELECT gkz, 'BLVO'
+                FROM AT_gem
+                WHERE gkz / 10000 = 8;
+                """);
+        }
+
+        private static void UpdateDbSchema_8_To_9(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE payment_delivery_part_bucket (
+                    year   INTEGER NOT NULL,
+                    did    INTEGER NOT NULL,
+                    dpnr   INTEGER NOT NULL,
+                    bktnr  INTEGER NOT NULL,
+                    avnr   INTEGER NOT NULL,
+
+                    price  INTEGER NOT NULL,
+                    amount INTEGER NOT NULL,
+
+                    CONSTRAINT pk_payment_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr, avnr),
+                    CONSTRAINT fk_payment_delivery_part_bucket_delivery_part_bucket FOREIGN KEY (year, did, dpnr, bktnr) REFERENCES delivery_part_bucket (year, did, dpnr, bktnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE,
+                    CONSTRAINT fk_payment_delivery_part_bucket_payment_variant FOREIGN KEY (year, avnr) REFERENCES payment_variant (year, avnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE
+                ) STRICT;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_i");
+            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_u");
+            ExecuteNonQuery(cnx, "DROP TRIGGER IF EXISTS t_payment_delivery_part_d");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part RENAME COLUMN amount TO net_amount");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_abs)) VIRTUAL");
+
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_bucket_i
+                    AFTER INSERT ON payment_delivery_part_bucket FOR EACH ROW
+                BEGIN
+                    INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount)
+                    VALUES (NEW.year, NEW.did, NEW.dpnr, NEW.avnr, NEW.amount)
+                    ON CONFLICT DO UPDATE SET net_amount = net_amount + NEW.amount;
+                END;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_bucket_u
+                    AFTER UPDATE OF amount ON payment_delivery_part_bucket FOR EACH ROW
+                BEGIN
+                    UPDATE payment_delivery_part
+                    SET net_amount = net_amount - OLD.amount
+                    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
+                    UPDATE payment_delivery_part
+                    SET net_amount = net_amount + NEW.amount
+                    WHERE (year, did, dpnr, avnr) = (NEW.year, NEW.did, NEW.dpnr, NEW.avnr);
+                END;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_bucket_d
+                    AFTER DELETE ON payment_delivery_part_bucket FOR EACH ROW
+                BEGIN
+                    UPDATE payment_delivery_part
+                    SET net_amount = net_amount - OLD.amount
+                    WHERE (year, did, dpnr, avnr) = (OLD.year, OLD.did, OLD.dpnr, OLD.avnr);
+                END;
+                """);
+
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_member RENAME COLUMN amount TO net_amount");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN mod_abs INTEGER NOT NULL DEFAULT 0");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN mod_rel REAL NOT NULL DEFAULT 0");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_member ADD COLUMN amount INTEGER NOT NULL GENERATED ALWAYS AS (ROUND(net_amount * (1 + mod_rel) + mod_rel)) VIRTUAL");
+
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_i
+                    AFTER INSERT ON payment_delivery_part FOR EACH ROW
+                BEGIN
+                    INSERT INTO payment_member (year, avnr, mgnr, net_amount)
+                    VALUES (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)), NEW.amount)
+                    ON CONFLICT DO UPDATE SET net_amount = net_amount + excluded.net_amount;
+                END;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_u
+                    AFTER UPDATE OF amount ON payment_delivery_part FOR EACH ROW
+                BEGIN
+                    UPDATE payment_member
+                    SET net_amount = net_amount - OLD.amount
+                    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
+                    UPDATE payment_member
+                    SET net_amount = net_amount + NEW.amount
+                    WHERE (year, avnr, mgnr) = (NEW.year, NEW.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (NEW.year, NEW.did)));
+                END;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TRIGGER t_payment_delivery_part_d
+                    AFTER DELETE ON payment_delivery_part FOR EACH ROW
+                BEGIN
+                    UPDATE payment_member
+                    SET net_amount = net_amount - OLD.amount
+                    WHERE (year, avnr, mgnr) = (OLD.year, OLD.avnr, (SELECT mgnr FROM delivery WHERE (year, did) = (OLD.year, OLD.did)));
+                END;
+                """);
+        }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -1,4 +1,3 @@
-using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Helpers/Billing/BillingVariant.cs

@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Billing {
@@ -15,6 +13,10 @@ namespace Elwig.Helpers.Billing {
 
         protected async Task DeleteInDb() {
             using var cnx = await AppDbContext.ConnectAsync();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_delivery_part_bucket WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
                 await cmd.ExecuteNonQueryAsync();
@@ -27,15 +29,41 @@ namespace Elwig.Helpers.Billing {
 
         public async Task CalculatePrices() {
             await DeleteInDb();
-            var tasks = new List<Task>();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMemberPrices(mgnr)));
+            using var cnx = await AppDbContext.ConnectAsync();
+
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string Discr, int Value, bool MinQuw, double Oe, double Kmw)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, b.discr, b.value, d.min_quw, d.oe, d.kmw
+                    FROM delivery_part_bucket b
+                        JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr)
+                    WHERE b.year = {Year}
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    parts.Add((
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3),
+                        reader.GetString(4), reader.GetString(5), reader.GetInt32(6),
+                        reader.GetBoolean(7), reader.GetDouble(8), reader.GetDouble(9)
+                    ));
                 }
-            await Task.WhenAll(tasks);
             }
 
-        protected async Task CalculateMemberPrices(int mgnr) {
+            var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
+            foreach (var part in parts) {
+                var price = !part.MinQuw ? 0.5m : ((part.BktNr == 2 ? 0.8m : (part.BktNr == 1 ? 0.7m : 0.6m)) + ((decimal)(part.Oe - 73) * 0.005m));  // TODO
+                var priceL = Utils.DecToDb(price, 4);
+                var amount = Utils.DecToDb(price * part.Value, 4);
+                inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, amount));
+            }
 
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))}
+                    """;
+                await cmd.ExecuteNonQueryAsync();
+            }
         }
     }
 }

Elwig/Helpers/Billing/Transaction.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Helpers/ClientParameters.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
 using System.Linq;

Elwig/Helpers/ControlUtils.cs

@@ -5,7 +5,8 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Media;
+using Brush = System.Windows.Media.Brush;
+using Brushes = System.Windows.Media.Brushes;
 
 namespace Elwig.Helpers {
     public class ControlUtils {
@@ -16,7 +17,7 @@ namespace Elwig.Helpers {
             First
         }
 
-        private static void SetControlBrush(Control input, Brush brush) {
+        private static void SetControlBorderBrush(Control input, Brush brush) {
             if (input is ComboBox cb) {
                 var border = GetComboBoxBorder(cb);
                 if (border != null) border.BorderBrush = brush;
@@ -26,15 +27,15 @@ namespace Elwig.Helpers {
         }
 
         public static void SetInputNotDefault(Control input) {
-            SetControlBrush(input, Brushes.Gold);
+            SetControlBorderBrush(input, Brushes.Gold);
         }
 
         public static void SetInputChanged(Control input) {
-            SetControlBrush(input, Brushes.Orange);
+            SetControlBorderBrush(input, Brushes.Orange);
         }
 
         public static void SetInputInvalid(Control input) {
-            SetControlBrush(input, Brushes.Red);
+            SetControlBorderBrush(input, Brushes.Red);
         }
 
         public static void ClearInputState(Control input) {
@@ -182,6 +183,15 @@ namespace Elwig.Helpers {
             SelectComboBoxItem(cb, getId, getId(item));
         }
 
+        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 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) {
             if (source == null)
                 return Array.Empty<object>();

Elwig/Helpers/Export/Ebics.cs

@@ -1,5 +1,5 @@
 using Elwig.Helpers.Billing;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;

Elwig/Helpers/Export/Ods.cs

@@ -0,0 +1,285 @@
+using Elwig.Models.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public class OdsFile : IDisposable {
+
+        protected readonly string FileName;
+        protected readonly ZipArchive ZipArchive;
+        protected StreamWriter? Content;
+        private readonly List<string> _tables;
+
+        public OdsFile(string filename) {
+            FileName = filename;
+            File.Delete(filename);
+            ZipArchive = ZipFile.Open(FileName, ZipArchiveMode.Create);
+            _tables = new();
+        }
+
+        public void Dispose() {
+            AddTrailer().GetAwaiter().GetResult();
+            ZipArchive?.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        private async Task AddHeader() {
+            var mimetype = ZipArchive.CreateEntry("mimetype", CompressionLevel.NoCompression);
+            using (var writer = new StreamWriter(mimetype.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("application/vnd.oasis.opendocument.spreadsheet");
+            }
+
+            var manifest = ZipArchive.CreateEntry("META-INF/manifest.xml");
+            using (var writer = new StreamWriter(manifest.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.3">
+                     <manifest:file-entry manifest:full-path="/" manifest:version="1.3" manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"/>
+                     <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
+                    </manifest:manifest>
+
+                    """);
+            }
+
+            var styles = ZipArchive.CreateEntry("styles.xml");
+            using (var writer = new StreamWriter(styles.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.3">
+                    </office:document-styles>
+
+                    """);
+            }
+
+            var meta = ZipArchive.CreateEntry("meta.xml");
+            using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                var now = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ");
+                await writer.WriteAsync($"""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" office:version="1.3">
+                     <office:meta>
+                      <meta:generator>Elwig {App.Version}</meta:generator>
+                      <meta:initial-creator>Elwig</meta:initial-creator>
+                      <dc:creator>Elwig</dc:creator>
+                      <meta:creation-date>{now}</meta:creation-date>
+                      <dc:date>{now}</dc:date>
+                     </office:meta>
+                    </office:document-meta>
+
+                    """);
+            }
+
+            var content = ZipArchive.CreateEntry("content.xml");
+            Content = new StreamWriter(content.Open(), Utils.UTF8);
+            await Content.WriteAsync("""
+                <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                <office:document-content xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3">
+                 <office:automatic-styles>
+                  <style:default-style style:family="table-cell">
+                   <style:text-properties fo:language="de" fo:country="AT"/>
+                  </style:default-style>
+                  <style:style style:name="default" style:family="table-cell">
+                   <style:table-cell-properties style:vertical-align="top"/>
+                  </style:style>
+
+                """);
+
+            for (int i = 1; i <= 100; i++) {
+                await Content.WriteAsync($"  <style:style style:name=\"col{i}mm\" style:family=\"table-column\"><style:table-column-properties style:column-width=\"{i}mm\"/></style:style>\r\n");
+            }
+
+            await Content.WriteAsync("""
+                  <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: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"/>
+                   <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>
+                  <number:number-style style:name="NN0"><number:number number:decimal-places="0" number:min-decimal-places="0" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N0" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN0"/>
+                  <number:number-style style:name="NN1"><number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N1" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN1"/>
+                  <number:number-style style:name="NN2"><number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N2" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN2"/>
+                  <number:number-style style:name="NN3"><number:number number:decimal-places="3" number:min-decimal-places="3" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N3" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN3"/>
+                  <number:number-style style:name="NN4"><number:number number:decimal-places="4" number:min-decimal-places="4" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N4" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN4"/>
+                  <number:number-style style:name="NN5"><number:number number:decimal-places="5" number:min-decimal-places="5" number:min-integer-digits="1"/></number:number-style>
+                  <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:number-style>
+                  <style:style style:name="N6" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN6"/>
+                 </office:automatic-styles>
+                 <office:body>
+                  <office:spreadsheet>
+                   <table:calculation-settings table:case-sensitive="false" table:search-criteria-must-apply-to-whole-cell="true" table:use-wildcards="true" table:use-regular-expressions="false" table:automatic-find-labels="false"/>
+
+                """);
+        }
+
+        private async Task AddTrailer() {
+            if (Content == null) await AddHeader();
+            if (Content == null) return;
+
+            await Content.WriteAsync("""
+                  </office:spreadsheet>
+                 </office:body>
+                </office:document-content>
+
+                """);
+            Content.Close();
+            Content.Dispose();
+            Content = null;
+
+            var settings = ZipArchive.CreateEntry("settings.xml");
+            using (var writer = new StreamWriter(settings.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-settings xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.3">
+                     <office:settings>
+                      <config:config-item-set config:name="ooo:view-settings">
+                       <config:config-item-map-indexed config:name="Views">
+                        <config:config-item-map-entry>
+                         <config:config-item-map-named config:name="Tables">
+
+                    """);
+
+                foreach (var tbl in _tables) {
+                    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-map-entry>
+
+                        """);
+                }
+
+                await writer.WriteAsync("""
+                         </config:config-item-map-named>
+                        </config:config-item-map-entry>
+                       </config:config-item-map-indexed>
+                      </config:config-item-set>
+                     </office:settings>
+                    </office:document-settings>
+
+                    """);
+            }
+        }
+
+        public async Task AddTable<T>(DataTable<T> table, bool mergeSubRowCells = true) {
+            if (Content == null) await AddHeader();
+            if (Content == null) return;
+            var totalSpan = table.ColumnSpans.Sum();
+
+            _tables.Add(table.Name);
+            await Content.WriteAsync($"    <table:table table:name=\"{table.Name}\" table:default-cell-style-name=\"default\">\r\n");
+            foreach (var (s, w) in table.ColumnSpans.Zip(table.ColumnWidths)) {
+                for (int i = 0; i < s; i++) {
+                    await Content.WriteAsync("     <table:table-column" + (w != null ? $" table:style-name=\"col{(int)(w / s)}mm\"" : "") + "/>\r\n");
+                }
+            }
+
+            await Content.WriteAsync(
+                $"     <table:table-row>\r\n" +
+                FormatCell(table.FullName, colSpan: totalSpan, style: "header") +
+                $"     </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");
+            foreach (var (name, span, units) in table.ColumnNames.Zip(table.ColumnSpans, table.ColumnUnits)) {
+                var hasUnits = units.Length > 0;
+                await Content.WriteAsync(FormatCell(name, colSpan: span, rowSpan: hasUnits ? 1 : 2, style: "th"));
+            }
+            await Content.WriteAsync("     </table:table-row>\r\n     <table:table-row>\r\n");
+            foreach (var (span, units) in table.ColumnSpans.Zip(table.ColumnUnits)) {
+                if (units.Length == 0) {
+                    await Content.WriteAsync($"      <table:covered-table-cell table:number-columns-repeated=\"{span}\"/>\r\n");
+                    continue;
+                }
+                foreach (var u in units) {
+                    await Content.WriteAsync(FormatCell(u == null ? null : $"[{u}]", style: "th"));
+                }
+            }
+            await Content.WriteAsync("     </table:table-row>\r\n");
+
+            foreach (var row in table.GetData()) {
+                await FormatRow(row, table.ColumnUnits, mergeSubRowCells);
+            }
+
+            await Content.WriteAsync("    </table:table>\r\n");
+        }
+
+        protected async Task FormatRow(IEnumerable<object?> row, IEnumerable<string?[]?> colUnits, bool mergeSubRowCells) {
+            if (Content == null) throw new InvalidOperationException();
+            var arrays = row.Where(c => c is Array).Cast<Array>().Select(c => c.Length).ToArray();
+            int rowNum = Math.Max(1, arrays.Length > 0 ? arrays.Max() : 0);
+            for (int i = 0; i < rowNum; i++) {
+                await Content.WriteAsync("     <table:table-row>\r\n");
+                foreach (var (data, units) in row.Zip(colUnits)) {
+                    if (data is Array a) {
+                        await Content.WriteAsync(i < a.Length ? FormatCell(a.GetValue(i), units: units) : $"      <table:table-cell table:number-columns-repeated=\"{GetSubCols(a.GetType().GetElementType())}\"/>\r\n");
+                    } else if (!mergeSubRowCells) {
+                        await Content.WriteAsync(FormatCell(data, units: units));
+                    } else {
+                        await Content.WriteAsync(FormatCell(data, rowSpan: i == 0 ? rowNum : 1, isCovered: i > 0, units: units));
+                    }
+                }
+                await Content.WriteAsync("     </table:table-row>\r\n");
+            }
+        }
+
+        private static int GetSubCols(Type? type) {
+            if (type != null && type.IsValueType == true && type.Name.StartsWith("ValueTuple"))
+                return type.GetFields().Length;
+            return 1;
+        }
+
+        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 }))
+                );
+
+            var add = (style != null ? $" table:style-name=\"{style}\"" : "") + (rowSpan > 1 || colSpan > 1 ? $" table:number-rows-spanned=\"{rowSpan}\" table:number-columns-spanned=\"{colSpan}\"" : "");
+            string ct = isCovered ? "table:covered-table-cell" : "table:table-cell";
+            var isPercent = units != null && units.Length > 0 && units[0] == "%";
+
+            string c;
+            if (data == null) {
+                c = $"<{ct}{add}/>";
+            } else if (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");
+                if (units != null && units.Length > 0) {
+                    int n = -1;
+                    switch (units[0]) {
+                        case "%": n = 1; data = $"{v:N1}"; break;
+                        case "°KMW": n = 1; data = $"{v:N1}"; break;
+                        case "°Oe": 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));
+                }
+                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString()?.Replace(",", ".")}\"{add}><text:p>{data}</text:p></{ct}>";
+            } else {
+                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
+            }
+
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+        }
+    }
+}

Elwig/Helpers/IAddress.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public interface IAddress {

Elwig/Helpers/Utils.cs

@@ -10,7 +10,7 @@ using System.Net.Sockets;
 using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -146,6 +146,10 @@ namespace Elwig.Helpers {
             return CalcCrc16Modbus(Encoding.ASCII.GetBytes(data));
         }
 
+        public static string FormatIban(string iban) {
+            return Regex.Replace(iban, ".{4}", "$0 ");
+        }
+
         public static void RunBackground(string title, Func<Task> a) {
             Task.Run(async () => {
                 try {

Elwig/Helpers/Validator.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public static class Validator {
@@ -63,13 +63,15 @@ namespace Elwig.Helpers {
             return CheckDecimal(input, required, -1, -1);
         }
 
-        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal) {
+        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal, bool allowMinus = false) {
             string text = "";
             int pos = input.CaretIndex;
             int v1 = 0, v2 = -1;
             for (int i = 0; i < input.Text.Length; i++) {
                 char ch = input.Text[i];
-                if (char.IsAsciiDigit(ch)) {
+                if (ch == '-' && i == 0 && allowMinus) {
+                    text += ch;
+                } else if (char.IsAsciiDigit(ch)) {
                     if (v2 == -1 && (maxLen == -1 || v1 < maxLen)) {
                         text += ch; v1++;
                     } else if (v2 != -1 && (maxDecimal == -1 || v2 < maxDecimal)) {

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -0,0 +1,105 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class AreaComUnderDeliveryData : DataTable<AreaComUnderDeliveryRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("VtrgIds", "Vertrag", null, 14),
+            ("Areas", "Fläche", "m²", 16),
+            ("DeliveryObligations", "Lieferpflicht", "kg", 22),
+            ("Weights", "Geliefert", "kg", 22),
+            ("UnderDeliveries", "Unterliefert", "kg|%", 34),
+        };
+
+        public AreaComUnderDeliveryData(IEnumerable<AreaComUnderDeliveryRow> rows, int year) :
+            base($"Unterlieferungen FB", $"Unterlieferungen laut Flächenbindungen {year}", rows, FieldNames) {
+        }
+
+        public static async Task<AreaComUnderDeliveryData> ForSeason(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
+            return new AreaComUnderDeliveryData(
+                (await FromDbSet(table, year)).GroupBy(
+                    r => r.MgNr,
+                    (k, g) => new AreaComUnderDeliveryRow(g)
+              ), year);
+        }
+
+        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,
+                            c.bucket, c.area, u.min_kg, u.weight
+                    FROM member m
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                        LEFT JOIN v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
+                        JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
+                    WHERE m.active = 1
+                    ORDER BY m.mgnr, c.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class AreaComUnderDeliveryRow {
+        public int MgNr;
+        public string Name;
+        public string GivenName;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] VtrgIds;
+        public int[] Areas;
+        public int[] DeliveryObligations;
+        public int[] Weights;
+        public (int? Kg, double? Percent)[] UnderDeliveries => Weights.Zip(DeliveryObligations)
+            .Select(v => v.First < v.Second ? ((int?, double?))(v.First - v.Second, v.First * 100.0 / v.Second - 100.0) : (null, null))
+            .ToArray();
+
+        public AreaComUnderDeliveryRow(IEnumerable<AreaComUnderDeliveryRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name = f.Name;
+            GivenName = f.GivenName;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            VtrgIds = rows.Select(r => r.VtrgId).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            DeliveryObligations = rows.Select(r => r.DeliveryObligation).ToArray();
+            Weights = rows.Select(r => r.Weight).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class AreaComUnderDeliveryRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string Locality { get; set; }
+        [Column("bucket")]
+        public string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("min_kg")]
+        public int DeliveryObligation { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Models/Dtos/CreditNoteData.cs

@@ -0,0 +1,140 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class CreditNoteData : DataTable<CreditNoteRow> {
+
+        private static readonly (string, string, string?)[] FieldNames = new[] {
+            ("", "", (string?)null), // TODO
+        };
+
+        private readonly int Year;
+        private readonly int? TgNr;
+        private readonly int? AvNr;
+        private readonly int? MgNr;
+
+        private CreditNoteData(IEnumerable<CreditNoteRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) :
+            base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) {
+            Year = year;
+            TgNr = tgnr;
+            AvNr = avnr;
+            MgNr = mgnr;
+        }
+
+        public static async Task<IDictionary<int, CreditNoteData>> ForPaymentVariant(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
+            return (await FromDbSet(table, year, avnr))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
+                    (k, g) => new CreditNoteRow(g))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
+                    (k, g) => new CreditNoteData(g, k.Year, k.TgNr, mgnr: k.MgNr))
+                .ToDictionary(d => d.MgNr ?? 0);
+        }
+
+        private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int? year = null, int? avnr = null, int? mgnr = null) {
+            var y = year?.ToString() ?? "NULL";
+            var v = avnr?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            return await table.FromSqlRaw($"""
+                SELECT d.year, c.tgnr, p.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, b.bktnr, d.sortid, b.discr, b.value, p.price, p.amount,
+                       v.name AS variant, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
+                FROM v_delivery d
+                    JOIN wine_variety v ON d.sortid = v.sortid
+                    LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                    JOIN wine_quality_level q ON q.qualid = d.qualid
+                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                    LEFT JOIN payment_delivery_part_bucket p ON (p.year, p.did, p.dpnr, p.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
+                    LEFT JOIN credit c ON (c.year, c.avnr, c.mgnr) = (d.year, p.avnr, d.mgnr)
+                WHERE b.value > 0 AND (d.year = {y} OR {y} IS NULL) AND (p.avnr = {v} OR {v} IS NULL OR p.avnr IS NULL) AND (d.mgnr = {m} OR {m} IS NULL)
+                ORDER BY d.year, p.avnr, d.mgnr, d.lsnr, d.dpnr
+                """).ToListAsync();
+        }
+    }
+
+    public class CreditNoteRow {
+
+        public int Year;
+        public int? TgNr;
+        public int AvNr;
+        public int MgNr;
+
+        public string LsNr;
+        public int DPNr;
+        public string Variant;
+        public string? Attribute;
+        public string[] Modifiers;
+        public string QualityLevel;
+        public (double Oe, double Kmw) Gradation;
+        public (string Name, int Value, decimal? Price, decimal? Amount)[] Buckets;
+
+        public CreditNoteRow(IEnumerable<CreditNoteRowSingle> rows) {
+            var f = rows.First();
+            Year = f.Year;
+            TgNr = f.TgNr;
+            MgNr = f.MgNr;
+
+            LsNr = f.LsNr;
+            DPNr = f.DPNr;
+            Variant = f.Variant;
+            Attribute = f.Attribute;
+            Modifiers = Array.Empty<string>();  // TODO
+            QualityLevel = f.QualityLevel;
+            Gradation = (f.Oe, f.Kmw);
+            Buckets = rows
+                .Where(b => b.Value > 0)
+                .OrderByDescending(b => b.BktNr)
+                // FIXME precision
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {f.SortId}{b.Discr}", b.Value,
+                              b.Price != null ? (decimal?)Utils.DecFromDb((long)b.Price, 4) : null,
+                              b.Amount != null ? (decimal?)Utils.DecFromDb((long)b.Amount, 4) : null))
+                .ToArray();
+        }
+    }
+
+    [Keyless]
+    public class CreditNoteRowSingle {
+        [Column("year")]
+        public int Year { get; set; }
+        [Column("tgnr")]
+        public int? TgNr { get; set; }
+        [Column("avnr")]
+        public int? AvNr { get; set; }
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("did")]
+        public int DId { get; set; }
+        [Column("lsnr")]
+        public string LsNr { get; set; }
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+        [Column("bktnr")]
+        public int BktNr { get; set; }
+        [Column("sortid")]
+        public string SortId { get; set; }
+        [Column("discr")]
+        public string Discr { get; set; }
+        [Column("value")]
+        public int Value { get; set; }
+        [Column("price")]
+        public long? Price { get; set; }
+        [Column("amount")]
+        public long? Amount { get; set; }
+        [Column("variant")]
+        public string Variant { get; set; }
+        [Column("attribute")]
+        public string? Attribute { get; set; }
+        [Column("quality_level")]
+        public string QualityLevel { get; set; }
+        [Column("oe")]
+        public double Oe { get; set; }
+        [Column("kmw")]
+        public double Kmw { get; set; }
+    }
+}

Elwig/Models/Dtos/DataTable.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Elwig.Models.Dtos {
+    public class DataTable<T> {
+
+        public string Name { get; set; }
+        public string FullName { get; set; }
+        public IEnumerable<T> Rows { get; private set; }
+        public int RowNum => Rows.Count();
+        public int ColNum => ColumnNames.Count();
+
+        public IEnumerable<(string, Type?)> ColumnDefs => _map.Select(m => (m.Item1, m.Item2?.PropertyType ?? m.Item3?.FieldType));
+        public IEnumerable<string> ColumnNames => ColumnDefs.Select(m => m.Item1);
+        public IEnumerable<Type?> ColumnTypes => ColumnDefs.Select(m => m.Item2);
+        public IEnumerable<Type?> ColumnFlatTypes { get; private set; }
+        public IEnumerable<int> ColumnSpans { get; private set; }
+        public IEnumerable<int?> ColumnWidths { get; private set; }
+        public IEnumerable<string?[]> ColumnUnits { get; private set; }
+
+        private readonly PropertyInfo[] _properties;
+        private readonly FieldInfo[] _fields;
+        private readonly (string, PropertyInfo?, FieldInfo?)[] _map;
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) {
+            _fields = typeof(T).GetFields();
+            _properties = typeof(T).GetProperties();
+            colNames ??= _properties.Select(p => p.Name).Union(_fields.Select(f => f.Name)).Select(i => (i, i, (string?)null, (int?)null)).ToList();
+            _map = colNames.Select(n => (n.Item2, _properties.FirstOrDefault(p => p?.Name == n.Item1, null), _fields.FirstOrDefault(f => f?.Name == n.Item1, null))).ToArray();
+            Name = name;
+            FullName = fullName;
+            Rows = rows;
+            ColumnFlatTypes = ColumnTypes.SelectMany(type => {
+                var elType = type?.GetElementType();
+                return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Select(f => f.FieldType) :
+                       type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Select(f => f.FieldType) :
+                       new Type?[] { type };
+            }).ToList();
+            ColumnSpans = ColumnTypes.Select(type => {
+                var elType = type?.GetElementType();
+                return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Length :
+                       type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Length : 1;
+            }).ToList();
+            ColumnWidths = colNames.Select(c => c.Item4).ToList();
+            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? Array.Empty<string?>()).ToList();
+        }
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :
+            this(name, fullName, rows, colNames?.Select(c => (c.Item1, c.Item2, c.Item3, (int?)null))) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?, int)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int)>? colNames = null) :
+            this(name, fullName, rows, colNames?.Select(c => (c.Item1, c.Item2, c.Item3, (int?)c.Item4))) {
+        }
+
+        protected IEnumerable<(string, object?)> GetNamedRowData(T row) {
+            return _map.Select(i => (i.Item1, i.Item2?.GetValue(row) ?? i.Item3?.GetValue(row)));
+        }
+
+        protected IEnumerable<object?> GetRowData(T row) {
+            return GetNamedRowData(row).Select(i => i.Item2);
+        }
+
+        public IEnumerable<IEnumerable<object?>> GetData() {
+            return Rows.Select(GetRowData);
+        }
+
+        public IEnumerable<IEnumerable<(string, object?)>> GetNamedData() {
+            return Rows.Select(GetNamedRowData);
+        }
+    }
+}

Elwig/Models/Dtos/DeliveryConfirmationData.cs

@@ -0,0 +1,97 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class DeliveryConfirmationData : DataTable<DeliveryConfirmationRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("LsNr", "LsNr.", null, 26),
+            ("DPNr", "Pos.", null, 8),
+            ("Variant", "Sorte", null, 40),
+            ("Attribute", "Attribut", null, 20),
+            ("Modifiers", "Zu-/Abschläge", null, 30),
+            ("QualityLevel", "Qualitätsstufe", null, 25),
+            ("Gradation", "Gradation", "°Oe|°KMW", 32),
+            ("Buckets", "Flächenbindung", "|kg", 36),
+            ("Weight", "Gewicht", "kg", 16),
+        };
+
+        private readonly int MgNr;
+
+        private DeliveryConfirmationData(IEnumerable<DeliveryConfirmationRow> rows, int year, Member m) :
+            base($"Anlieferungsbestätigung", $"Anlieferungsbestätigung {year} – {m.AdministrativeName}", rows, FieldNames) {
+            MgNr = m.MgNr;
+        }
+
+        public static async Task<IDictionary<int, DeliveryConfirmationData>> ForSeason(DbSet<DeliveryPart> table, int year) {
+            return (await FromDbSet(table, year))
+                .GroupBy(
+                    p => p.Delivery.Member,
+                    p => new DeliveryConfirmationRow(p),
+                    (k, g) => new DeliveryConfirmationData(g, year, k)
+                ).ToDictionary(d => d.MgNr, d => d);
+        }
+
+        public static async Task<DeliveryConfirmationData> ForMember(DbSet<DeliveryPart> table, int year, Member m) {
+            return new DeliveryConfirmationData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationRow(p)), year, m);
+        }
+
+        private static async Task<IEnumerable<DeliveryPart>> FromDbSet(DbSet<DeliveryPart> table, int? year = null, int? mgnr = null) {
+            var y = year?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            IQueryable<DeliveryPart> q = table;
+            if (year != null) q = q.Where(p => p.Year == year);
+            if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
+            await q
+                 .Include(p => p.Delivery)
+                 .Include(p => p.Variant)
+                 .Include(p => p.Attribute)
+                 .Include(p => p.Quality)
+                 .Include(p => p.Buckets)
+                 .Include(p => p.PartModifiers)
+                 .ThenInclude(m => m.Modifier)
+                 .LoadAsync();
+            return await table.FromSqlRaw($"""
+                    SELECT p.*
+                    FROM v_delivery v
+                        JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                    WHERE (p.year = {y} OR {y} IS NULL) AND (v.mgnr = {m} OR {m} IS NULL)
+                    ORDER BY p.year, v.mgnr, v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
+                    """).ToListAsync();
+        }
+    }
+
+    public class DeliveryConfirmationRow {
+        public string LsNr;
+        public int DPNr;
+        public string Variant;
+        public string? Attribute;
+        public string QualityLevel;
+        public (double Oe, double Kmw) Gradation;
+        public string[] Modifiers;
+        public int Weight;
+        public (string Name, int Value)[] Buckets;
+
+        public DeliveryConfirmationRow(DeliveryPart p) {
+            var d = p.Delivery;
+            LsNr = d.LsNr;
+            DPNr = p.DPNr;
+            Variant = p.Variant.Name;
+            Attribute = p.Attribute?.Name;
+            QualityLevel = p.Quality.Name;
+            Gradation = (p.Oe, p.Kmw);
+            Modifiers = p.Modifiers
+                .Select(m => m.Name)
+                .ToArray();
+            Weight = p.Weight;
+            Buckets = p.Buckets
+                .Where(b => b.Value > 0)
+                .OrderByDescending(b => b.BktNr)
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))
+                .ToArray();
+        }
+    }
+}

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -0,0 +1,118 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class MemberDeliveryPerVariantData : DataTable<MemberDeliveryPerVariantRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("SortIds", "Sorte", null, 12),
+            ("AttrIds", "Attribut", null, 16),
+            ("Weights", "Geliefert", "kg", 22),
+            ("Areas", "Fläche", "m²", 22),
+            ("Yields", "Ertrag", "kg/ha", 22),
+        };
+
+
+        public MemberDeliveryPerVariantData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
+            base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
+        }
+
+        public static async Task<MemberDeliveryPerVariantData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+            return new MemberDeliveryPerVariantData(
+               (await FromDbSet(table, year)).GroupBy(
+                   r => r.MgNr,
+                   (k, g) => new MemberDeliveryPerVariantRow(g)
+             ), year);
+        }
+
+        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,
+                           v.bucket, v.weight, v.area
+                    FROM (
+                            SELECT c.year AS year,
+                                   c.mgnr AS mgnr,
+                                   c.bucket AS bucket,
+                                   COALESCE(d.weight, 0) AS weight,
+                                   COALESCE(c.area, 0) AS area
+                            FROM v_area_commitment_bucket_strict c
+                                LEFT JOIN v_delivery_bucket_strict d ON (d.year, d.mgnr, d.bucket) = (c.year, c.mgnr, c.bucket)
+                            WHERE c.year = {year}
+                            UNION
+                            SELECT d.year,
+                                   d.mgnr,
+                                   d.bucket,
+                                   COALESCE(d.weight, 0),
+                                   COALESCE(c.area, 0)
+                            FROM v_delivery_bucket_strict d
+                                LEFT JOIN v_area_commitment_bucket_strict c ON (c.year, c.mgnr, c.bucket) = (d.year, d.mgnr, d.bucket)
+                            WHERE d.year = {year}
+                        ) v
+                        LEFT JOIN member m ON m.mgnr = v.mgnr
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                    ORDER BY m.mgnr, v.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class MemberDeliveryPerVariantRow {
+        public int MgNr;
+        public string Name;
+        public string GivenName;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] SortIds;
+        public string[] AttrIds;
+        public int[] Areas;
+        public int[] Weights;
+        public int?[] Yields => Weights.Zip(Areas).Select(i => i.Second > 0 ? (int?)i.First * 10_000 / i.Second : null).ToArray();
+
+        public MemberDeliveryPerVariantRow(IEnumerable<MemberDeliveryPerVariantRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name = f.Name;
+            GivenName = f.GivenName;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
+            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            Weights = rows.Select(r => r.Weight).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class MemberDeliveryPerVariantRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string Locality { get; set; }
+        [Column("bucket")]
+        public string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -0,0 +1,76 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class OverUnderDeliveryData : DataTable<OverUnderDeliveryRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("BusinessShares", "GA", null, 10),
+            ("DeliveryObligation", "Lieferpflicht", "kg", 22),
+            ("DeliveryRight", "Lieferrecht", "kg", 22),
+            ("Weight", "Geliefert", "kg", 22),
+            ("OverUnderDelivery", "Über-/Unterliefert", "kg|%", 34),
+        };
+
+        public OverUnderDeliveryData(IEnumerable<OverUnderDeliveryRow> rows, int year) :
+            base($"Über-Unterlieferungen", $"Über- und Unterlieferungen laut gezeichneten Geschäftsanteilen {year}", rows, FieldNames) {
+        }
+
+        public 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,
+                       m.business_shares * s.min_kg_per_bs AS min_kg,
+                       m.business_shares * s.max_kg_per_bs AS max_kg,
+                       COALESCE(SUM(d.weight), 0) AS sum
+                FROM member m
+                    LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                    LEFT JOIN AT_ort o ON o.okz = p.okz
+                    LEFT JOIN season s ON s.year = {year}
+                    LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
+                WHERE m.active = 1
+                GROUP BY d.year, m.mgnr
+                ORDER BY 100.0 * sum / max_kg, m.mgnr;
+                """).ToListAsync();
+            return new OverUnderDeliveryData(rows, year);
+        }
+    }
+
+    [Keyless]
+    public class OverUnderDeliveryRow {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string LocalityFull { get; set; }
+        [NotMapped]
+        public string Locality => LocalityFull.Split(",")[0];
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+        [Column("min_kg")]
+        public int DeliveryObligation { get; set; }
+        [Column("max_kg")]
+        public int DeliveryRight { get; set; }
+        [Column("sum")]
+        public int Weight { get; set; }
+        [NotMapped]
+        public (int? Kg, double? Percent) OverUnderDelivery =>
+            Weight < DeliveryObligation ? (Weight - DeliveryObligation, Weight * 100.0 / DeliveryObligation - 100.0) :
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100) : (null, null);
+    }
+}

Elwig/Models/Entities/AT_Gem.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_gem"), PrimaryKey("Gkz")]
     public class AT_Gem {
         [Column("gkz")]

Elwig/Models/Entities/AT_Kg.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_kg"), PrimaryKey("KgNr")]
     public class AT_Kg {
         [Column("kgnr")]
@@ -17,6 +17,6 @@ namespace Elwig.Models {
         public virtual AT_Gem Gem { get; private set; }
 
         [InverseProperty("AtKg")]
-        public virtual WbKg WbKg { get; private set; }
+        public virtual WbKg? WbKg { get; private set; }
     }
 }

Elwig/Models/Entities/AT_Ort.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_ort"), PrimaryKey("Okz")]
     public class AT_Ort {
         [Column("okz")]

Elwig/Models/Entities/AT_Plz.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz"), PrimaryKey("Plz")]
     public class AT_Plz {
         [Column("plz")]

Elwig/Models/Entities/AT_PlzDest.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]
     public class AT_PlzDest {
         [Column("plz")]

Elwig/Models/Entities/AreaCom.cs

@@ -1,7 +1,10 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("area_commitment"), PrimaryKey("FbNr")]
     public class AreaCom {
         [Column("fbnr")]
@@ -51,5 +54,12 @@ namespace Elwig.Models {
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            var list = new string?[] {
+                WineCult.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
+            }.ToList();
+            return Utils.GetSearchScore(list, keywords);
+        }
     }
 }

Elwig/Models/Entities/AreaComType.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
     public class AreaComType {
         [Column("vtrgid")]

Elwig/Models/Entities/BillingAddr.cs

@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_billing_address"), PrimaryKey("MgNr")]
     public class BillingAddr : IAddress {
         [Column("mgnr")]

Elwig/Models/Entities/Branch.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]

Elwig/Models/Entities/ClientParam.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("client_parameter"), PrimaryKey("Param")]
     public class ClientParam {
         [Column("param")]

Elwig/Models/Entities/Country.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]
     public class Country {
         [Column("num")]

Elwig/Models/Entities/Credit.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]
     public class Credit {
         [Column("year")]

Elwig/Models/Entities/Currency.cs

@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("currency"), PrimaryKey("Code")]
     public class Currency {
         [Column("code")]

Elwig/Models/Entities/Delivery.cs

@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]
     public class Delivery {
         [Column("year")]

Elwig/Models/Entities/DeliveryPart.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
     public class DeliveryPart {
         [Column("year")]

Elwig/Models/Entities/DeliveryPartBucket.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr")]
     public class DeliveryPartBucket {
         [Column("year")]

Elwig/Models/Entities/DeliveryPartModifier.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part_modifier"), PrimaryKey("Year", "DId", "DPNr", "ModId")]
     public class DeliveryPartModifier {
         [Column("year")]

Elwig/Models/Entities/Member.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member"), PrimaryKey("MgNr")]
     public class Member : IAddress {
         [Column("mgnr")]

Elwig/Models/Entities/MemberEmailAddr.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_email_address"), PrimaryKey("MgNr", "Nr")]
     public class MemberEmailAddr {
         [Column("mgnr")]

Elwig/Models/Entities/MemberTelNr.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_telephone_number"), PrimaryKey("MgNr", "Nr")]
     public class MemberTelNr {
         [Column("mgnr")]

Elwig/Models/Entities/Modifier.cs

@@ -4,7 +4,7 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("modifier"), PrimaryKey("Year", "ModId")]
     public class Modifier {
         [Column("year")]

Elwig/Models/Entities/PaymentDeliveryPart.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
     public class PaymentDeliveryPart {
         [Column("year")]

Elwig/Models/Entities/PaymentDeliveryPartBucket.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr", "AvNr")]
     public class PaymentDeliveryPartBucket {
         [Column("year")]

Elwig/Models/Entities/PaymentMember.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_member"), PrimaryKey("Year", "AvNr", "MgNr")]
     public class PaymentMember {
         [Column("year")]

Elwig/Models/Entities/PaymentVar.cs

@@ -2,9 +2,8 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("payment_variant"), PrimaryKey("Year", "AvNr")]
     public class PaymentVar {
         [Column("year")]

Elwig/Models/Entities/PostalDest.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("postal_dest"), PrimaryKey("CountryNum", "Id")]
     public class PostalDest {
         [Column("country")]

Elwig/Models/Entities/Season.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("season"), PrimaryKey("Year")]
     public class Season {
         [Column("year")]

Elwig/Models/Entities/WbGem.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_gem"), PrimaryKey("Gkz")]
     public class WbGem {
         [Column("gkz")]

Elwig/Models/Entities/WbGl.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_gl"), PrimaryKey("GlNr")]
     public class WbGl {
         [Column("glnr")]

Elwig/Models/Entities/WbKg.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_kg"), PrimaryKey("KgNr")]
     public class WbKg {
         [Column("kgnr")]

Elwig/Models/Entities/WbRd.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wb_rd"), PrimaryKey("KgNr", "RdNr")]
     public class WbRd {
         [Column("kgnr")]

Elwig/Models/Entities/WineAttr.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_attribute"), PrimaryKey("AttrId"), Index("Name", IsUnique = true)]
     public class WineAttr {
         [Column("attrid")]

Elwig/Models/Entities/WineCult.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_cultivation"), PrimaryKey("CultId"), Index("Name", IsUnique = true)]
     public class WineCult {
         [Column("cultid")]
@@ -12,6 +12,6 @@ namespace Elwig.Models {
         public string Name { get; set; }
 
         [Column("description")]
-        public string Description { get; set; }
+        public string? Description { get; set; }
     }
 }

Elwig/Models/Entities/WineOrigin.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]
     public class WineOrigin {
         [Column("hkid")]

Elwig/Models/Entities/WineQualLevel.cs

@@ -2,10 +2,8 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Configuration;
-using System.Security.Cryptography.Pkcs;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_quality_level"), PrimaryKey("QualId")]
     public class WineQualLevel : IEquatable<WineQualLevel> {
         [Column("qualid")]

Elwig/Models/Entities/WineVar.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
     public class WineVar {
         [Column("sortid")]

Elwig/Windows/AdministrationWindow.cs

@@ -1,5 +1,6 @@
+using Elwig.Controls;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -62,16 +63,18 @@ namespace Elwig.Windows {
             OriginalValues = new();
             DefaultValues = new();
             Closing += OnClosing;
+            Loaded -= base.OnLoaded;
             Loaded += OnLoaded;
+            Loaded += base.OnLoaded;
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
+        private new void OnLoaded(object sender, RoutedEventArgs evt) {
             TextBoxInputs = ControlUtils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
             ComboBoxInputs = ControlUtils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
             CheckBoxInputs = ControlUtils.FindAllChildren<CheckBox>(this, ExemptInputs).ToArray();
             CheckComboBoxInputs = ControlUtils.FindAllChildren<CheckComboBox>(this, ExemptInputs).ToArray();
             RadioButtonInputs = ControlUtils.FindAllChildren<RadioButton>(this, ExemptInputs).ToArray();
-            PlzInputs = TextBoxInputs.Where(tb => "PLZ".Equals(tb.Tag)).ToArray();
+            PlzInputs = ControlUtils.FindAllChildren<TextBox>(this).Where(tb => "PLZ".Equals(tb.Tag)).ToArray();
             PlzOrtInputs = PlzInputs.Select(tb => ControlUtils.FindNextSibling<ComboBox>(tb) ?? throw new MissingMemberException()).ToArray();
             foreach (var tb in TextBoxInputs)
                 Valid[tb] = true;
@@ -105,6 +108,7 @@ namespace Elwig.Windows {
         }
 
         protected void ValidateInput(Control input, bool valid) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             Valid[input] = valid;
         }
 
@@ -205,6 +209,7 @@ namespace Elwig.Windows {
         }
 
         protected void SetOriginalValue(Control input, object? value) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             OriginalValues[input] = value is bool b ? b.ToString() : value;
             if (InputHasChanged(input)) {
                 ControlUtils.SetInputChanged(input);
@@ -214,15 +219,18 @@ namespace Elwig.Windows {
         }
 
         protected void SetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             SetOriginalValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             OriginalValues.Remove(input);
             ControlUtils.ClearInputState(input);
         }
 
         protected void SetDefaultValue(Control input, object? value) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             DefaultValues[input] = value is bool b ? b.ToString() : value;
             if (!InputHasChanged(input)) {
                 if (InputIsNotDefault(input)) {
@@ -234,10 +242,12 @@ namespace Elwig.Windows {
         }
 
         protected void SetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             SetDefaultValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             DefaultValues.Remove(input);
             if (!InputHasChanged(input)) {
                 ControlUtils.ClearInputState(input);
@@ -261,10 +271,12 @@ namespace Elwig.Windows {
         protected bool IsValid => Valid.All(kv => kv.Value);
 
         protected bool GetInputValid(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             return Valid[input];
         }
 
         protected bool InputHasChanged(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             if (!OriginalValues.ContainsKey(input)) {
                 return false;
             } else if (input is TextBox tb) {
@@ -283,6 +295,7 @@ namespace Elwig.Windows {
         }
 
         protected bool InputIsNotDefault(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             if (!DefaultValues.ContainsKey(input)) {
                 return false;
             } else if (input is TextBox tb) {
@@ -317,7 +330,7 @@ namespace Elwig.Windows {
             );
 
         protected void UpdatePlz(TextBox plzInput, ComboBox ortInput) {
-            var plzInputValid = GetInputValid(plzInput);
+            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);
@@ -458,15 +471,15 @@ namespace Elwig.Windows {
             UpdateComboBox((Control)sender);
         }
 
-        protected void IntegerInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IntegerInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckInteger);
         }
 
-        protected void DecimalInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DecimalInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckDecimal);
         }
 
-        protected void PartialDateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PartialDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPartialDate);
         }
 
@@ -474,7 +487,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPartialDate);
         }
 
-        protected void DateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckDate);
         }
 
@@ -482,7 +495,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
-        protected void TimeInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TimeInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckTime);
         }
 
@@ -490,7 +503,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckTime);
         }
 
-        protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
             if ("PLZ".Equals(plz.Tag))
@@ -504,7 +517,7 @@ namespace Elwig.Windows {
                 UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
-        protected void EmailAddressInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void EmailAddressInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckEmailAddress);
         }
 
@@ -512,7 +525,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckEmailAddress);
         }
 
-        protected void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
@@ -520,7 +533,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
-        protected void IbanInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IbanInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckIban);
         }
 
@@ -528,7 +541,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckIban);
         }
 
-        protected void BicInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void BicInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckBic);
         }
 
@@ -536,7 +549,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckBic);
         }
 
-        protected void UstIdNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void UstIdNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckUstIdNr);
         }
 
@@ -544,12 +557,24 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckUstIdNr);
         }
 
-        protected void LfbisNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void LfbisNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckLfbisNr);
         }
 
         protected void LfbisNrInput_LostFocus(object sender, RoutedEventArgs evt) {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
+
+        protected void UpperCaseInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckUpperCase);
+        }
+
+        protected void UpperCaseInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckUpperCase);
+        }
+
+        protected void AreaComTypeDetailsButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusBaseDataAreaComType();
+        }
     }
 }

Elwig/Windows/AreaComAdminWindow.xaml

@@ -4,9 +4,10 @@
         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"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindungen - Elwig" Height="480" Width="1100"
+        Title="Flächenbindungen - Elwig" Height="500" MinHeight="440" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -46,62 +47,77 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="24"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" MinWidth="555"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="*" MinWidth="280"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid Grid.Row="0" Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="37"/>
                 <RowDefinition Height="*"/>
+                <RowDefinition Height="42"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="340"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-        <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Flächenbindugen"/>
-        </Menu>
-
-        <Grid Grid.RowSpan="2" Grid.Row="1" Grid.Column="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-            </Grid.ColumnDefinitions>
+            <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,7,145,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged"/>
+            <CheckBox x:Name="ActiveAreaCommitmentInput" Content="Nur aktive anzeigen"
+                      Checked="ActiveAreaCommitmentInput_Changed" Unchecked="ActiveAreaCommitmentInput_Changed"
+                      HorizontalAlignment="Right" Margin="0,12,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
 
             <DataGrid x:Name="AreaCommitmentList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
-                  Margin="5,10,5,42" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
+                      Margin="5,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="2*"/>
-                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="6*"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="4*"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="4*"/>
-                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="3*">
+                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/>
+                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/>
+                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/>
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
-                    <DataGridTextColumn Header="Sorte"           Binding="{Binding AreaComType.WineVar.Name}" Width="4*"/>
-                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr1.Name}" Width="3*"/>
+                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/>
                 </DataGrid.Columns>
             </DataGrid>
 
             <Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <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"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <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"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
 
             <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"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <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"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <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"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
         </Grid>
 
-        <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
+        <GridSplitter Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <Grid Grid.Column="2" Grid.Row="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+
+            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
@@ -111,24 +127,27 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="FbNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="FbNrInput" Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
                              TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
                     <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
                     <TextBox x:Name="MgNrInput" IsEnabled="False"
-                         Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
+                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
 
                     <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="YearFromInput" Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="YearToInput" Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
                              TextChanged="IntegerInput_TextChanged"/>
 
                     <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="AreaComTypeInput" DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
-                          HorizontalAlignment="Stretch" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                              HorizontalAlignment="Stretch" Margin="0,70,40,10" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaComTypeDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="AreaComTypeDetailsButton_Click"
+                            Grid.Column="3" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,70,10,10"/>
 
                     <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                     <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
@@ -140,7 +159,7 @@
                 </Grid>
             </GroupBox>
 
-        <GroupBox Header="Lage" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,10">
+            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="80"/>
@@ -149,21 +168,56 @@
 
                     <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
                     <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,10,10,0" Grid.Column="1"
+                              HorizontalAlignment="Stretch" Margin="0,10,40,10" Grid.Column="1"
                               SelectionChanged="KgInput_SelectionChanged"/>
+                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="KgDetailsButton_Click"
+                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,10,10,10"/>
 
                     <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,40,10,0" Grid.Column="1"/>
+                    <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name" IsEditable="True"
+                              HorizontalAlignment="Stretch" Margin="0,40,40,10" Grid.Column="1"
+                              SelectionChanged="RdInput_SelectionChanged"/>
+                    <Button x:Name="RdAddButton" Content="&#xE73E;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0,0,0,0" IsEnabled="False"
+                            Click="RdAddButton_Click"
+                            Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,40,10,10"/>
 
                     <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
                     <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
                              TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
 
                     <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AreaInput" Margin="0,100,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" TextChanged="IntegerInput_TextChanged"
+                                      Grid.Column="1" Width="70" Margin="0,100,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
                 </Grid>
             </GroupBox>
         </Grid>
+
+        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="160"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusAreaCommitments" Text="Flächenbindungen: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusArea" Text="Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusContracts" Text="Vertragsarten: -"/>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
 </local:AdministrationWindow>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System;
 using System.Threading.Tasks;
 using System.Collections.Generic;
@@ -12,7 +12,11 @@ using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Elwig.Windows {
     public partial class AreaComAdminWindow : AdministrationWindow {
+
+        public int MgNr => Member.MgNr;
+
         private readonly Member Member;
+        private List<string> TextFilter = new();
 
         public AreaComAdminWindow(int mgnr) {
             InitializeComponent();
@@ -21,15 +25,16 @@ namespace Elwig.Windows {
             ExemptInputs = new Control[] {
                 MgNrInput, AreaCommitmentList, NewAreaCommitmentButton, 
                 EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
-                AreaCommitmentResetButton, AreaCommitmentCancelButton
+                AreaCommitmentResetButton, AreaCommitmentCancelButton, SearchInput, ActiveAreaCommitmentInput
             };
             RequiredInputs = new Control[] {
                 FbNrInput, YearFromInput, KgInput, RdInput,
-                GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
+                GstNrInput, AreaInput.TextBox, AreaComTypeInput, WineCultivationInput
             };
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e) {
+            ActiveAreaCommitmentInput.IsChecked = true;
             LockInputs();
         }
 
@@ -38,11 +43,85 @@ namespace Elwig.Windows {
             await RefreshAreaCommitmentListQuery();
         }
 
-        private async Task RefreshAreaCommitmentListQuery() {
-            List<AreaCom> areaComs = await Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr).ToListAsync();
+        private async Task RefreshAreaCommitmentListQuery(bool updateSort = false) {
+            var (_, areaComQuery, filter) = await GetFilters();
+            var areaComs = await areaComQuery.ToListAsync();
+
+            if (filter.Count > 0 && areaComs.Count > 0) {
+                var dict = areaComs.AsParallel()
+                    .ToDictionary(d => d, d => d.SearchScore(TextFilter))
+                    .OrderByDescending(c => c.Value);
+                var threshold = dict.Select(a => a.Value).Max() * 3 / 4;
+                areaComs = dict
+                    .Where(a => a.Value > threshold)
+                    .Select(a => a.Key)
+                    .ToList();
+            }
+
             ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr,
-                AreaCommitmentList_SelectionChanged, ControlUtils.RenewSourceDefault.None);
+                AreaCommitmentList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
             RefreshInputs();
+
+            if(filter.Count == 0) {
+                StatusAreaCommitments.Text = $"Flächenbindungen: {await areaComQuery.CountAsync()}";
+                StatusArea.Text = $"Fläche: {await areaComQuery.Select(a => a.Area).SumAsync():N0} m²";
+            } else {
+                StatusAreaCommitments.Text = $"Flächenbindungen: {areaComs.Count}";
+                StatusArea.Text = $"Fläche: {areaComs.Select(a => a.Area).Sum():N0} m²";
+            }
+            var groups = areaComs.GroupBy(a => $"{a.AreaComType.SortId}{a.AreaComType.AttrId}").Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
+            StatusContracts.Text = $"Vertragsarten: {groups.Count} (" + string.Join(", ", groups.Select(g => $"{g.Key}: {g.Item2:N0} m²")) + ")";
+            groups = areaComs.GroupBy(a => a.AreaComType.DisplayName).Select(a => (a.Key, a.Sum(b => b.Area))).OrderByDescending(a => a.Item2).ToList();
+            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() {
+            List<string> filterNames = new();
+            IQueryable<AreaCom> areaComQuery = Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr);
+            if (ActiveAreaCommitmentInput.IsChecked == true) {
+                areaComQuery = areaComQuery.Where(a => (a.YearFrom <= Utils.CurrentNextSeason) && (a.YearTo == null || a.YearTo >= Utils.CurrentNextSeason));
+                filterNames.Add("aktiv");
+            }
+
+            var filterVar = new List<string>();
+            var filterNotVar = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+
+            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);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                        filterVar.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add(var[e.ToUpper()].Name);
+                    } else if (e.Length == 3 && e[0] == '!' && var.ContainsKey(e[1..].ToUpper())) {
+                        filterNotVar.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (attr.ContainsKey(e.ToLower())) {
+                        var a = attr[e.ToLower()];
+                        filterAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Attribut {a.Name}");
+                    } else if (e[0] == '!' && attr.ContainsKey(e[1..].ToLower())) {
+                        var a = attr[e[1..].ToLower()];
+                        filterNotAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Attribut {a.Name}");
+                    }
+                }
+
+                if (filterVar.Count > 0) areaComQuery = areaComQuery.Where(a => filterVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterNotVar.Count > 0) areaComQuery = areaComQuery.Where(a => !filterNotVar.Contains(a.AreaComType.WineVar.SortId));
+                if (filterAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr != null && a.AreaComType.WineAttr.AttrId != null && filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
+                if (filterNotAttr.Count > 0) areaComQuery = areaComQuery.Where(a => a.AreaComType.WineAttr == null || a.AreaComType.WineAttr.AttrId == null || !filterAttr.Contains(a.AreaComType.WineAttr.AttrId));
+            }
+
+           return (filterNames, areaComQuery, filter);
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -90,6 +169,7 @@ namespace Elwig.Windows {
 
             FbNrInput.Text = (await Context.NextFbNr()).ToString();
             MgNrInput.Text = Member.MgNr.ToString();
+            YearFromInput.Text = DateTime.Now.Year.ToString();
 
             SetDefaultValue(FbNrInput);
             ValidateRequiredInputs();
@@ -111,6 +191,7 @@ namespace Elwig.Windows {
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
             InitInputs();
+            LockSearchInputs();
         }
 
         private void EditAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -123,6 +204,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentNewEditDeleteButtons();
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
+            LockSearchInputs();
         }
 
         private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -154,11 +236,21 @@ namespace Elwig.Windows {
 
             EntityEntry<AreaCom>? tr = 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));
+                    tr = await Context.AddAsync(a);
                 } else {
                     throw new Exception();
                 }
@@ -194,6 +286,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentSaveResetCancelButtons();
             ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
+            UnlockSearchInputs();
             await RefreshAreaCommitmentList();
             AreaCommitmentList.SelectedItem = a;
         }
@@ -216,6 +309,7 @@ namespace Elwig.Windows {
             RefreshInputs();
             ClearInputStates();
             LockInputs();
+            UnlockSearchInputs();
         }
 
         override protected void UpdateButtons() {
@@ -269,6 +363,16 @@ namespace Elwig.Windows {
             DeleteAreaCommitmentButton.Visibility = Visibility.Hidden;
         }
 
+        private void LockSearchInputs() {
+            SearchInput.IsEnabled = false;
+            ActiveAreaCommitmentInput.IsEnabled = false;
+        }
+
+        private void UnlockSearchInputs() {
+            SearchInput.IsEnabled = true;
+            ActiveAreaCommitmentInput.IsEnabled = true;
+        }
+
         private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             RefreshInputs();
         }
@@ -277,6 +381,15 @@ namespace Elwig.Windows {
 
         }
 
+        private async void ActiveAreaCommitmentInput_Changed(object sender, RoutedEventArgs evt) {
+            await RefreshAreaCommitmentListQuery();
+        }
+
+        private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
+            TextFilter = SearchInput.Text.ToLower().Split(" ").ToList().FindAll(e => e.Length > 0);
+            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();
@@ -289,6 +402,27 @@ namespace Elwig.Windows {
             ComboBox_SelectionChanged(sender, evt);
         }
 
+        private void KgDetailsButton_Click(object sender, RoutedEventArgs evt) {
+            if (KgInput.SelectedItem is AT_Kg kg) {
+                App.FocusOriginHierarchyKg(kg.KgNr);
+            } else {
+                App.FocusOriginHierarchy();
+            }
+        }
+
+        private void RdInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            RdAddButton.IsEnabled = RdInput.SelectedIndex == -1;
+        }
+
+        private async 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.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));
         }

Elwig/Windows/BaseDataWindow.xaml

@@ -1,11 +1,13 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.BaseDataWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.BaseDataWindow"
         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"
         mc:Ignorable="d"
-        Title="Stammdaten - Elwig" Height="500" MinHeight="400" Width="800" MinWidth="800"
+        Title="Stammdaten - Elwig" Height="500" MinHeight="400" Width="850" MinWidth="810"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -133,21 +135,258 @@
                 </Grid>
             </TabItem>
             <TabItem Header="Zweigstellen">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="260"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="BranchList" Margin="10,10,35,10"
+                             SelectionChanged="BranchList_SelectionChanged" Grid.Column="0">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding ZwstId}" Width="20"/>
+                                    <TextBlock Text="{Binding Name}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button x:Name="BranchAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="BranchAddButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,30" Grid.Column="0"/>
+                    <Button x:Name="BranchDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="BranchDeleteButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,30,5,0" Grid.Column="0"/>
 
+                    <Grid Grid.Column="1" Margin="0,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="110"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Identifikator:" Margin="10,10,0,10"/>
+                        <TextBox x:Name="BranchIdInput" Grid.Column="1" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left"
+                                 TextChanged="Branch_Changed"/>
+
+                        <Label Content="Name:" Margin="10,40,0,10"/>
+                        <TextBox x:Name="BranchNameInput" Grid.Column="1" Margin="0,40,10,10" Width="150" HorizontalAlignment="Left"
+                                 TextChanged="Branch_Changed"/>
+
+                        <Label Content="PLZ/Ort:" Margin="10,70,0,10"/>
+                        <TextBox x:Name="BranchPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                                 TextChanged="BranchPlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                        <ComboBox x:Name="BranchOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                                  Margin="47,70,10,0" Grid.Column="1" Grid.ColumnSpan="3" Width="253" HorizontalAlignment="Left"
+                                  SelectionChanged="Branch_Changed"/>
+
+                        <Label Content="Adresse:" Margin="10,100,0,10"/>
+                        <TextBox x:Name="BranchAddressInput" Grid.Column="1" Margin="0,100,10,10" Width="300" HorizontalAlignment="Left"
+                                 TextChanged="Branch_Changed"/>
+
+                        <Label Content="Tel.-Nr. (Festnetz):" Margin="10,130,0,10"/>
+                        <TextBox x:Name="BranchPhoneNrInput" Grid.Column="1" Margin="0,130,10,10" Width="200" HorizontalAlignment="Left"
+                                 TextChanged="BranchPhoneNr_TextChanged"/>
+
+                        <Label Content="Fax-Nr.:" Margin="10,160,0,10"/>
+                        <TextBox x:Name="BranchFaxNrInput" Grid.Column="1" Margin="0,160,10,10" Width="200" HorizontalAlignment="Left"
+                                 TextChanged="BranchPhoneNr_TextChanged"/>
+
+                        <Label Content="Tel.-Nr. (mobil):" Margin="10,190,0,10"/>
+                        <TextBox x:Name="BranchMobileNrInput" Grid.Column="1" Margin="0,190,10,10" Width="200" HorizontalAlignment="Left"
+                                 TextChanged="BranchPhoneNr_TextChanged"/>
+                    </Grid>
+                </Grid>
             </TabItem>
             <TabItem Header="Sortenattribute">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="280"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="WineAttributeList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,35,10"
+                             SelectionChanged="WineAttributeList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding AttrId}" Width="30"/>
+                                    <TextBlock Text="{Binding Name}" Width="80"/>
+                                    <TextBlock Text="{Binding MaxKgPerHa, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Margin="0,0,5,0"/>
+                                    <CheckBox IsChecked="{Binding IsActive}" IsEnabled="False" Margin="10,0,10,0"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button x:Name="WineAttributeAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="WineAttributeAddButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,30"/>
+                    <Button x:Name="WineAttributeDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="WineAttributeDeleteButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,30,5,0"/>
 
+                    <Grid Grid.Column="1" Margin="0,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Identifikator:" Margin="10,10,0,10"/>
+                        <TextBox x:Name="WineAttributeIdInput" Grid.Column="1" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left"
+                                 TextChanged="WineAttributeIdInput_TextChanged"/>
+
+                        <Label Content="Name:" Margin="10,40,0,10"/>
+                        <TextBox x:Name="WineAttributeNameInput" Grid.Column="1" Margin="0,40,10,10" Width="150" HorizontalAlignment="Left"
+                                 TextChanged="WineAttribute_Changed"/>
+
+                        <CheckBox x:Name="WineAttributeActiveInput" Content="In Übernahme-Fenster anzeigen"
+                                  Grid.Column="1" Margin="0,74,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                  Checked="WineAttribute_Changed" Unchecked="WineAttribute_Changed"/>
+
+                        <GroupBox Header="Auszahlung" Grid.ColumnSpan="2" Margin="10,100,10,10">
+                            <Grid>
+                                <Label Content="Max. Ertrag:" Margin="10,10,0,10"/>
+                                <ctrl:UnitTextBox x:Name="WineAttributeMaxKgPerHaInput" Unit="kg/ha" TextChanged="WineAttributeMaxKgPerHaInput_TextChanged"
+                                                  Grid.Column="1" Width="80" Margin="84,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                                <CheckBox x:Name="WineAttributeStrictInput" Content="Strikte Trennung zu Flächenbindung ohne Attribut"
+                                          Margin="10,50,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          Checked="WineAttributeStrictInput_Changed" Unchecked="WineAttributeStrictInput_Changed"/>
+
+                                <Label x:Name="WineAttributeFillLowerLabel" Content="Wenn möglich, Flächenbindung ohne Attribut..." Margin="10,75,10,10"/>
+                                <ComboBox x:Name="WineAttributeFillLowerInput" Width="300"
+                                          Margin="10,100,10,10" HorizontalAlignment="Left"
+                                          SelectionChanged="WineAttribute_Changed">
+                                    <ComboBoxItem>...nicht auffüllen</ComboBoxItem>
+                                    <ComboBoxItem>...bis Lieferpflicht auffüllen</ComboBoxItem>
+                                    <ComboBoxItem>...bis Lieferrecht auffüllen</ComboBoxItem>
+                                </ComboBox>
+                            </Grid>
+                        </GroupBox>
+                    </Grid>
+                </Grid>
             </TabItem>
             <TabItem Header="Bewirtschaftungsarten">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="260"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="WineCultivationList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,35,10"
+                             SelectionChanged="WineCultivationList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding CultId}" Width="30"/>
+                                    <TextBlock Text="{Binding Name}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button x:Name="WineCultivationAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="WineCultivationAddButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,30"/>
+                    <Button x:Name="WineCultivationDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="WineCultivationDeleteButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,30,5,0"/>
 
+                    <Grid Grid.Column="1" Margin="0,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Identifikator:" Margin="10,10,0,10"/>
+                        <TextBox x:Name="WineCultivationIdInput" Grid.Column="1" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left"
+                                 TextChanged="WineCultivationIdInput_TextChanged"/>
+
+                        <Label Content="Name:" Margin="10,40,0,10"/>
+                        <TextBox x:Name="WineCultivationNameInput" Grid.Column="1" Margin="0,40,10,10" Width="150" HorizontalAlignment="Left"
+                                 TextChanged="WineCultivation_Changed"/>
+
+                        <Label Content="Beschreibung:" Margin="10,70,0,10"/>
+                        <TextBox x:Name="WineCultivationDescriptionInput" Grid.Column="1" Margin="0,70,10,10"
+                                 TextChanged="WineCultivation_Changed"/>
+                    </Grid>
+                </Grid>
             </TabItem>
-            <TabItem Header="Flächenbindungsverträge">
 
+            <TabItem Header="Flächenbindungsverträge" x:Name="AreaCommitmentTypes">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="260"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="AreaCommitmentTypeList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,35,10"
+                             SelectionChanged="AreaCommitmentTypeList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding WineAttr.Name}" Width="70"/>
+                                    <TextBlock Text="{Binding Discriminator}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+                    <Button x:Name="AreaCommitmentTypeAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="AreaCommitmentTypeAddButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,30"/>
+                    <Button x:Name="AreaCommitmentTypeDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                            Click="AreaCommitmentTypeDeleteButton_Click"
+                            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,30,5,0"/>
+
+                    <Grid Grid.Column="1" Margin="0,10,0,10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="80"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Identifikator:" Margin="10,10,0,10"/>
+                        <TextBox x:Name="AreaCommitmentTypeIdInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left" IsEnabled="False"/>
+
+                        <Label Content="Sorte:" Margin="10,40,0,10"/>
+                        <ComboBox x:Name="AreaCommitmentTypeWineVariantInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,40,10,10" Width="250" HorizontalAlignment="Left"
+                                  ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
+                                  SelectionChanged="AreaCommitmentType_Changed"/>
+
+                        <Label Content="Attribut:" Margin="10,70,0,10"/>
+                        <ComboBox x:Name="AreaCommitmentTypeWineAttributeInput" Grid.Column="1" Grid.ColumnSpan="2" Margin="0,70,10,10" Width="250" HorizontalAlignment="Left"
+                                  SelectionChanged="AreaCommitmentType_Changed"/>
+
+                        <Label Content="Lieferpflicht:" Margin="10,100,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypeMinKgPerHaInput" Unit="kg/ha" Grid.Column="2" Margin="0,100,10,10" Width="80" HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypeMinKgPerHa_TextChanged"/>
+
+                        <Label Content="Strafe (pro unterl. kg):" Margin="10,130,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyPerKgInput" Unit="€/kg" Grid.Column="2" Margin="0,130,10,10" Width="80"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyPerKgInput_TextChanged"/>
+
+                        <Label Content="Strafe (bei Unterlieferung):" Margin="10,160,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyInput" Unit="€" Grid.Column="2" Margin="0,160,10,10" Width="68"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyInput_TextChanged"/>
+
+                        <Label Content="Strafe (bei Nicht-Lieferung):" Margin="10,190,0,10" Grid.ColumnSpan="2"/>
+                        <ctrl:UnitTextBox x:Name="AreaCommitmentTypePenaltyNoneInput" Unit="€" Grid.Column="2" Margin="0,190,10,10" Width="68"
+                                          HorizontalAlignment="Left" VerticalAlignment="Top"
+                                          TextChanged="AreaCommitmentTypePenaltyInput_TextChanged"/>
+                    </Grid>
+                </Grid>
             </TabItem>
 
             <TabItem Header="Saisons">
                 <Grid>
-                    <ListBox x:Name="SeasonList" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="150" Margin="10,10,10,10"
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="180"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="180"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+
+                    <ListBox x:Name="SeasonList" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Grid.RowSpan="2"
                              SelectionChanged="SeasonList_SelectionChanged">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
@@ -160,7 +399,56 @@
                         </ListBox.ItemTemplate>
                     </ListBox>
 
-                    <GroupBox Header="Zu-/Abschläge" Margin="170,150,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                    <Grid Grid.Column="1" Margin="0,10,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="130"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Label Content="Maximaler Ertrag:" Margin="10,10,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerHaInput" Unit="kg/ha" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="1" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="MwSt. (buchführend):" Margin="10,40,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonVatNormalInput" Unit="%" TextChanged="SeasonVatInput_TextChanged"
+                                          Grid.Column="1" Width="48" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="MwSt. (pauschaliert):" Margin="10,70,0,10"/>
+                        <ctrl:UnitTextBox x:Name="SeasonVatFlatrateInput" Unit="%" TextChanged="SeasonVatInput_TextChanged"
+                                          Grid.Column="1" Width="48" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Übernahme-Beginn:" Margin="10,100,0,10"/>
+                        <TextBox x:Name="SeasonStartInput" Grid.Column="1" Margin="0,100,10,10" Width="78" IsEnabled="False"
+                                 HorizontalAlignment="Left"/>
+
+                        <Label Content="Übernahme-Ende:" Margin="10,130,0,10"/>
+                        <TextBox x:Name="SeasonEndInput" Grid.Column="1" Margin="0,130,10,10" Width="78" IsEnabled="False"
+                                 HorizontalAlignment="Left"/>
+
+                        <Label Content="Lieferpflicht:" Margin="10,10,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMinKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Lieferrecht:" Margin="10,40,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonMaxKgPerBsInput" Unit="kg/GA" TextChanged="SeasonMinMaxKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,40,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (pro unterl. kg):" Margin="10,70,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyPerKgInput" Unit="€/kg" TextChanged="SeasonPenaltyPerKgInput_TextChanged"
+                                          Grid.Column="3" Width="80" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (Unterlieferung):" Margin="10,100,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="68" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="Strafe (Nicht-Lieferung):" Margin="10,130,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="68" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    </Grid>
+
+                    <GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
                         <Grid>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="400"/>
@@ -198,15 +486,15 @@
 
                             <Label Content="Name:" Grid.Column="1" Margin="10,40,10,10"/>
                             <TextBox x:Name="SeasonModifierNameInput" Grid.Column="2" Margin="0,40,10,10"
-                                     TextChanged="SeasonModifierNameInput_TextChanged"/>
+                                     TextChanged="SeasonModifier_Changed"/>
 
                             <Label Content="Relativ:" Grid.Column="1" Margin="10,70,10,10"/>
-                            <TextBox x:Name="SeasonModifierRelInput" Grid.Column="2" Margin="0,70,10,10"
-                                     TextChanged="SeasonModifierRelInput_TextChanged"/>
+                            <ctrl:UnitTextBox x:Name="SeasonModifierRelInput" Unit="%" TextChanged="SeasonModifierRelInput_TextChanged"
+                                             Grid.Column="2" Width="68" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                             <Label Content="Absolut:" Grid.Column="1" Margin="10,100,10,10"/>
-                            <TextBox x:Name="SeasonModifierAbsInput" Grid.Column="2" Margin="0,100,10,10"
-                                     TextChanged="SeasonModifierAbsInput_TextChanged"/>
+                            <ctrl:UnitTextBox x:Name="SeasonModifierAbsInput" Unit="€/kg" TextChanged="SeasonModifierAbsInput_TextChanged"
+                                             Grid.Column="2" Width="86" Margin="0,100,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                         </Grid>
                     </GroupBox>
                 </Grid>
@@ -257,6 +545,10 @@
             </TabItem>
         </TabControl>
 
+        <Button x:Name="OriginButton" Content="Herkunftshierarchie"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10,10,10,10" Width="150"
+                Click="OriginButton_Click"/>
+
         <Button x:Name="EditButton" Content="Bearbeiten"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Width="120"
                 Click="EditButton_Click"/>

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -0,0 +1,154 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _acts = null;
+        private Dictionary<AreaComType, string>? _actIds = null;
+        private ObservableCollection<AreaComType>? _actList = null;
+        private bool _actChanged = false;
+        private bool _actUpdate = false;
+
+        private void AreaCommitmentTypesInitEditing() {
+            _actList = new(Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToList());
+            _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);
+            AreaCommitmentTypeList_SelectionChanged(null, null);
+        }
+
+        private void AreaCommitmentTypesFinishEditing() {
+            ControlUtils.RenewItemsSource(AreaCommitmentTypeList, Context.AreaCommitmentTypes.OrderBy(v => v.SortId).ToList(), v => (v as AreaComType)?.VtrgId);
+            _actList = null;
+            _acts = null;
+            _actIds = null;
+            _actChanged = false;
+
+            AreaCommitmentTypeAddButton.IsEnabled = false;
+            AreaCommitmentTypeDeleteButton.IsEnabled = false;
+        }
+
+        private async Task AreaCommitmentTypesSave() {
+            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));
+            }
+            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));
+            }
+            await Context.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 Context.SaveChangesAsync();
+
+            foreach (var type in _actList.Where(a => !_actIds.ContainsKey(a))) {
+                if (type.VtrgId == null) continue;
+                await Context.AddAsync(type);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void AreaCommitmentTypeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _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);
+                AreaCommitmentTypeMinKgPerHaInput.Text = $"{type.MinKgPerHa}";
+                AreaCommitmentTypePenaltyPerKgInput.Text = $"{type.PenaltyPerKg}";
+                AreaCommitmentTypePenaltyInput.Text = $"{type.PenaltyAmount}";
+                AreaCommitmentTypePenaltyNoneInput.Text = $"{type.PenaltyNone}";
+            } else {
+                AreaCommitmentTypeIdInput.Text = "";
+                AreaCommitmentTypeWineVariantInput.SelectedItem = null;
+                AreaCommitmentTypeWineAttributeInput.SelectedItem = null;
+                AreaCommitmentTypeMinKgPerHaInput.Text = "";
+                AreaCommitmentTypePenaltyPerKgInput.Text = "";
+                AreaCommitmentTypePenaltyInput.Text = "";
+                AreaCommitmentTypePenaltyNoneInput.Text = "";
+            }
+            _actUpdate = false;
+        }
+
+        private void AreaCommitmentTypeAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_actList == null) return;
+            _actChanged = true;
+            var item = Context.CreateProxy<AreaComType>();
+            _actList.Add(item);
+            AreaCommitmentTypeList.SelectedItem = item;
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentTypeDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_actList == null || _acts == null) return;
+            _actChanged = true;
+            var idx = AreaCommitmentTypeList.SelectedIndex;
+            var item = _actList[idx];
+            _acts[item.VtrgId] = null;
+            _actList.RemoveAt(idx);
+            AreaCommitmentTypeList.SelectedIndex = idx < _actList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentType_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_actUpdate || (!IsEditing && !IsCreating) || AreaCommitmentTypeList.SelectedItem is not AreaComType attr || _acts == null || _actIds == null) return;
+            _actChanged = true;
+
+            var v = AreaCommitmentTypeWineVariantInput.SelectedItem as WineVar;
+            var a = AreaCommitmentTypeWineAttributeInput.SelectedItem as WineAttr;
+            AreaCommitmentTypeIdInput.Text = $"{v?.SortId}{a?.AttrId}";
+
+            var old = _actIds.GetValueOrDefault(attr);
+            var id = AreaCommitmentTypeIdInput.Text;
+            if (old != null) _acts[old] = id;
+            attr.VtrgId = id;
+            attr.SortId = v?.SortId;
+            attr.AttrId = a?.AttrId;
+            attr.MinKgPerHa = AreaCommitmentTypeMinKgPerHaInput.Text.Length > 0 ? int.Parse(AreaCommitmentTypeMinKgPerHaInput.Text) : null;
+            attr.PenaltyPerKg = AreaCommitmentTypePenaltyPerKgInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyPerKgInput.Text) : null;
+            attr.PenaltyAmount = AreaCommitmentTypePenaltyInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyInput.Text) : null;
+            attr.PenaltyNone = AreaCommitmentTypePenaltyNoneInput.Text.Length > 0 ? decimal.Parse(AreaCommitmentTypePenaltyNoneInput.Text) : null;
+
+            CollectionViewSource.GetDefaultView(_actList).Refresh();
+            UpdateButtons();
+        }
+
+        private void AreaCommitmentTypeIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpperCaseInput_TextChanged(sender, evt);
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypeMinKgPerHa_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, false, 5));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypePenaltyPerKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+
+        private void AreaCommitmentTypePenaltyInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, 2));
+            AreaCommitmentType_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -0,0 +1,151 @@
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Windows.Controls;
+using System.Windows;
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _branches = null;
+        private Dictionary<Branch, string>? _branchIds = null;
+        private ObservableCollection<Branch>? _branchList = null;
+        private bool _branchChanged = false;
+        private bool _branchUpdate = false;
+
+        private void BranchesInitEditing() {
+            _branchList = new(Context.Branches.OrderBy(b => b.Name).ToList());
+            _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);
+            BranchList_SelectionChanged(null, null);
+        }
+
+        private void BranchesFinishEditing() {
+            ControlUtils.RenewItemsSource(BranchList, Context.Branches.OrderBy(b => b.Name).ToList(), b => (b as Branch)?.ZwstId);
+            _branchList = null;
+            _branches = null;
+            _branchIds = null;
+            _branchChanged = false;
+
+            BranchAddButton.IsEnabled = false;
+            BranchDeleteButton.IsEnabled = false;
+        }
+
+        private async Task BranchesSave() {
+            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));
+            }
+            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));
+            }
+            await Context.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 Context.SaveChangesAsync();
+
+            foreach (var branch in _branchList.Where(b => !_branchIds.ContainsKey(b))) {
+                if (branch.ZwstId == null) continue;
+                await Context.AddAsync(branch);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void BranchList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _branchUpdate = true;
+            if (BranchList.SelectedItem is not Branch branch) {
+                BranchIdInput.Text = "";
+                BranchNameInput.Text = "";
+                BranchPlzInput.Text = "";
+                BranchAddressInput.Text = "";
+                BranchPhoneNrInput.Text = "";
+                BranchFaxNrInput.Text = "";
+                BranchMobileNrInput.Text = "";
+            } else {
+                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);
+                BranchAddressInput.Text = branch.Address;
+                BranchPhoneNrInput.Text = branch.PhoneNr;
+                BranchFaxNrInput.Text = branch.FaxNr;
+                BranchMobileNrInput.Text = branch.MobileNr;
+            }
+            _branchUpdate = false;
+        }
+
+        private void BranchAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_branchList == null) return;
+            _branchChanged = true;
+            var item = Context.CreateProxy<Branch>();
+            _branchList.Add(item);
+            BranchList.SelectedItem = item;
+            UpdateButtons();
+        }
+
+        private void BranchDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_branchList == null || _branches == null) return;
+            _branchChanged = true;
+            var idx = BranchList.SelectedIndex;
+            var item = _branchList[idx];
+            _branches[item.ZwstId] = null;
+            _branchList.RemoveAt(idx);
+            BranchList.SelectedIndex = idx < _branchList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void Branch_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_branchUpdate || (!IsEditing && !IsCreating) || BranchList.SelectedItem is not Branch branch || _branches == null || _branchIds == null) return;
+            _branchChanged = _branchChanged ||
+                BranchIdInput.Text != branch.ZwstId ||
+                BranchNameInput.Text != branch.Name ||
+                BranchPlzInput.Text != (branch.PostalDest?.AtPlz?.Plz.ToString() ?? "") ||
+                (BranchOrtInput.SelectedItem as AT_PlzDest)?.Okz != branch.PostalDest?.AtPlz?.Okz ||
+                BranchAddressInput.Text != branch.Address ||
+                BranchPhoneNrInput.Text != (branch.PhoneNr ?? "") ||
+                BranchFaxNrInput.Text != (branch.FaxNr ?? "") ||
+                BranchMobileNrInput.Text != (branch.MobileNr ?? "");
+
+            var old = _branchIds.GetValueOrDefault(branch);
+            var id = BranchIdInput.Text;
+            if (old != null) _branches[old] = id;
+            branch.ZwstId = id;
+            branch.Name = BranchNameInput.Text;
+            branch.PostalDestId = (BranchOrtInput.SelectedItem as AT_PlzDest)?.Id;
+            branch.Address = BranchAddressInput.Text;
+            branch.PhoneNr = BranchPhoneNrInput.Text;
+            branch.FaxNr = BranchFaxNrInput.Text;
+            branch.MobileNr = BranchMobileNrInput.Text;
+            if (branch.PhoneNr.Length == 0) branch.PhoneNr = null;
+            if (branch.FaxNr.Length == 0) branch.FaxNr = null;
+            if (branch.MobileNr.Length == 0) branch.MobileNr = null;
+
+            CollectionViewSource.GetDefaultView(_branchList).Refresh();
+            UpdateButtons();
+        }
+
+        private void BranchPlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            PlzInput_TextChanged(sender, evt);
+            Branch_Changed(sender, evt);
+        }
+
+        private void BranchPhoneNr_TextChanged(object sender, TextChangedEventArgs evt) {
+            PhoneNrInput_TextChanged(sender, evt);
+            Branch_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -0,0 +1,176 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _mods = null;
+        private Dictionary<Modifier, string>? _modIds = null;
+        private ObservableCollection<Modifier>? _modList = null;
+        private bool _modChanged = false;
+        private bool _modUpdate = false;
+
+        private void ModifiersInitEditing() {
+            SeasonList.IsEnabled = false;
+            var year = (SeasonList.SelectedItem as Season)?.Year;
+            _modList = new(Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToList());
+            _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);
+            SeasonModifierList_SelectionChanged(null, null);
+        }
+
+        private void ModifiersFinishEditing() {
+            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);
+            _modList = null;
+            _mods = null;
+            _modIds = null;
+            _modChanged = false;
+
+            SeasonModifierUpButton.IsEnabled = false;
+            SeasonModifierDownButton.IsEnabled = false;
+            SeasonModifierAddButton.IsEnabled = false;
+            SeasonModifierDeleteButton.IsEnabled = false;
+            SeasonList.IsEnabled = true;
+        }
+
+        private async Task ModifiersSave() {
+            if (!_modChanged || _modList == null || _mods == null || _modIds == null)
+                return;
+
+            int i = 0;
+            foreach (var mod in _modList) mod.Ordering = ++i;
+
+            var year = (SeasonList.SelectedItem as Season)?.Year;
+            foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
+                Context.Remove(Context.Modifiers.Find(new object?[] { 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(new object?[] { year, old }));
+            }
+            await Context.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 Context.SaveChangesAsync();
+
+            foreach (var mod in _modList.Where(m => !_modIds.ContainsKey(m))) {
+                if (mod.ModId == null) continue;
+                await Context.AddAsync(mod);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void SeasonModifierUpButton_Click(object sender, RoutedEventArgs evt) {
+            if (_modList == null) return;
+            _modChanged = true;
+            var idx = SeasonModifierList.SelectedIndex;
+            var item = _modList[idx];
+            _modList.RemoveAt(idx);
+            idx--;
+            _modList.Insert(idx, item);
+            SeasonModifierList.SelectedIndex = idx;
+            UpdateButtons();
+        }
+
+        private void SeasonModifierDownButton_Click(object sender, RoutedEventArgs evt) {
+            if (_modList == null) return;
+            _modChanged = true;
+            var idx = SeasonModifierList.SelectedIndex;
+            var item = _modList[idx];
+            _modList.RemoveAt(idx);
+            idx++;
+            _modList.Insert(idx, item);
+            SeasonModifierList.SelectedIndex = idx;
+            UpdateButtons();
+        }
+
+        private void SeasonModifierAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_modList == null || SeasonList.SelectedItem is not Season s) return;
+            _modChanged = true;
+            var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : _modList.Count;
+            var item = Context.CreateProxy<Modifier>();
+            item.Year = s.Year;
+            _modList.Insert(idx, item);
+            SeasonModifierList.SelectedIndex = idx;
+            UpdateButtons();
+        }
+
+        private void SeasonModifierDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_modList == null || _mods == null) return;
+            _modChanged = true;
+            var idx = SeasonModifierList.SelectedIndex;
+            var item = _modList[idx];
+            _mods[item.ModId] = null;
+            _modList.RemoveAt(idx);
+            SeasonModifierList.SelectedIndex = idx < _modList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void SeasonModifierList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _modUpdate = true;
+            if (SeasonModifierList.SelectedItem is not Modifier mod) {
+                SeasonModifierIdInput.Text = "";
+                SeasonModifierNameInput.Text = "";
+                SeasonModifierRelInput.Text = "";
+                SeasonModifierAbsInput.Text = "";
+            } else {
+                SeasonModifierIdInput.Text = mod.ModId;
+                SeasonModifierNameInput.Text = mod.Name;
+                SeasonModifierRelInput.Text = (mod.Rel * 100)?.ToString() ?? "";
+                SeasonModifierAbsInput.Text = mod.Abs?.ToString() ?? "";
+            }
+            _modUpdate = false;
+        }
+
+        private void SeasonModifier_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_modUpdate || (!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod || SeasonList.SelectedItem is not Season s || _mods == null || _modIds == null) return;
+            _modChanged = true;
+
+            var old = _modIds.GetValueOrDefault(mod);
+            var id = SeasonModifierIdInput.Text ?? "";
+            if (old != null) _mods[old] = id;
+            mod.ModId = id;
+            mod.Name = SeasonModifierNameInput.Text;
+            mod.Rel = decimal.TryParse(SeasonModifierRelInput.Text, out var vRel) ? vRel / 100 : null;
+            mod.AbsValue = decimal.TryParse(SeasonModifierAbsInput.Text, out var vAbs) ? Utils.DecToDb(vAbs, s.Precision) : null;
+
+            CollectionViewSource.GetDefaultView(_modList).Refresh();
+            UpdateButtons();
+        }
+
+        private void SeasonModifierIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpperCaseInput_TextChanged(sender, evt);
+            SeasonModifier_Changed(sender, evt);
+        }
+
+        private void SeasonModifierRelInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 3, 2, true));
+            if (SeasonModifierRelInput.Text.Length > 0 && SeasonModifierAbsInput.Text.Length > 0)
+                SeasonModifierAbsInput.Text = "";
+            SeasonModifier_Changed(sender, evt);
+        }
+
+        private void SeasonModifierAbsInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision, true));
+            if (SeasonModifierAbsInput.Text.Length > 0 && SeasonModifierRelInput.Text.Length > 0)
+                SeasonModifierRelInput.Text = "";
+            SeasonModifier_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -0,0 +1,113 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        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);
+            SeasonList_SelectionChanged(null, null);
+        }
+
+        private void SeasonsFinishEditing() {
+            ControlUtils.RenewItemsSource(SeasonList, Context.Seasons.OrderByDescending(s => s.Year).ToList(), s => (s as Season)?.Year);
+            _seasonChanged = false;
+        }
+
+        private async Task SeasonsSave() {
+            if (!_seasonChanged || SeasonList.SelectedItem is not Season s)
+                return;
+            Context.Update(s);
+            await Context.SaveChangesAsync();
+        }
+
+        private async 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();
+                SeasonMaxKgPerHaInput.Text = s.MaxKgPerHa.ToString();
+                SeasonVatNormalInput.Text = (s.VatNormal * 100).ToString();
+                SeasonVatFlatrateInput.Text = (s.VatFlatrate * 100).ToString();
+                SeasonStartInput.Text = $"{s.StartDate:dd.MM.yyyy}";
+                SeasonEndInput.Text = $"{s.EndDate:dd.MM.yyyy}";
+                SeasonMinKgPerBsInput.Text = s.MinKgPerBusinessShare.ToString();
+                SeasonMaxKgPerBsInput.Text = s.MaxKgPerBusinessShare.ToString();
+                SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
+                SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
+                SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
+
+                var sym = s.Currency.Symbol ?? "";
+                SeasonModifierAbsInput.Unit = $"{sym}/kg";
+                SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
+                SeasonPenaltyInput.Unit = sym;
+                SeasonPenaltyNoneInput.Unit = sym;
+                AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
+                AreaCommitmentTypePenaltyInput.Unit = sym;
+                AreaCommitmentTypePenaltyNoneInput.Unit = sym;
+            } else {
+                SeasonModifierList.ItemsSource = null;
+                SeasonMaxKgPerHaInput.Text = "";
+                SeasonVatNormalInput.Text = "";
+                SeasonVatFlatrateInput.Text = "";
+                SeasonStartInput.Text = "";
+                SeasonEndInput.Text = "";
+                SeasonMinKgPerBsInput.Text = "";
+                SeasonMaxKgPerBsInput.Text = "";
+                SeasonPenaltyPerKgInput.Text = "";
+                SeasonPenaltyInput.Text = "";
+                SeasonPenaltyNoneInput.Text = "";
+            }
+            _seasonUpdate = false;
+        }
+
+        private void Season_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_seasonUpdate || (!IsEditing && !IsCreating) || SeasonList.SelectedItem is not Season s) return;
+            _seasonChanged = true;
+
+            if (SeasonMaxKgPerHaInput.Text.Length > 0)
+                s.MaxKgPerHa = int.Parse(SeasonMaxKgPerHaInput.Text);
+            if (SeasonVatNormalInput.Text.Length > 0)
+                s.VatNormal = double.Parse(SeasonVatNormalInput.Text) / 100;
+            if (SeasonVatFlatrateInput.Text.Length > 0)
+                s.VatFlatrate = double.Parse(SeasonVatFlatrateInput.Text) / 100;
+            if (SeasonMinKgPerBsInput.Text.Length > 0)
+                s.MinKgPerBusinessShare = int.Parse(SeasonMinKgPerBsInput.Text);
+            if (SeasonMaxKgPerBsInput.Text.Length > 0)
+                s.MaxKgPerBusinessShare = int.Parse(SeasonMaxKgPerBsInput.Text);
+            s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
+            s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
+            s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
+
+            UpdateButtons();
+        }
+
+        private void SeasonMinMaxKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, true, 5));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonVatInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, true, 2, 1));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonPenaltyPerKgInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            if (SeasonList.SelectedItem is not Season s) return;
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, s.Precision));
+            Season_Changed(sender, evt);
+        }
+
+        private void SeasonPenaltyInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 4, 2));
+            Season_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.WineAttr.cs

@@ -0,0 +1,149 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _attrs = null;
+        private Dictionary<WineAttr, string>? _attrIds = null;
+        private ObservableCollection<WineAttr>? _attrList = null;
+        private bool _attrChanged = false;
+        private bool _attrUpdate = false;
+
+        private void WineAttributesInitEditing() {
+            _attrList = new(Context.WineAttributes.OrderBy(a => a.Name).ToList());
+            _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);
+            WineAttributeList_SelectionChanged(null, null);
+        }
+
+        private void WineAttributesFinishEditing() {
+            ControlUtils.RenewItemsSource(WineAttributeList, Context.WineAttributes.OrderBy(a => a.Name).ToList(), a => (a as WineAttr)?.AttrId);
+            _attrList = null;
+            _attrs = null;
+            _attrIds = null;
+            _attrChanged = false;
+
+            WineAttributeAddButton.IsEnabled = false;
+            WineAttributeDeleteButton.IsEnabled = false;
+        }
+
+        private async Task WineAttributesSave() {
+            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));
+            }
+            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));
+            }
+            await Context.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 Context.SaveChangesAsync();
+
+            foreach (var attr in _attrList.Where(a => !_attrIds.ContainsKey(a))) {
+                if (attr.AttrId == null) continue;
+                await Context.AddAsync(attr);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void WineAttributeList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _attrUpdate = true;
+            if (WineAttributeList.SelectedItem is not WineAttr attr) {
+                WineAttributeIdInput.Text = "";
+                WineAttributeNameInput.Text = "";
+                WineAttributeActiveInput.IsChecked = false;
+                WineAttributeMaxKgPerHaInput.Text = "";
+                WineAttributeStrictInput.IsChecked = false;
+                WineAttributeFillLowerInput.SelectedItem = null;
+            } else {
+                WineAttributeIdInput.Text = attr.AttrId;
+                WineAttributeNameInput.Text = attr.Name;
+                WineAttributeActiveInput.IsChecked = attr.IsActive;
+                WineAttributeMaxKgPerHaInput.Text = attr.MaxKgPerHa?.ToString() ?? "";
+                WineAttributeStrictInput.IsChecked = attr.IsStrict;
+                WineAttributeFillLowerInput.SelectedIndex = attr.FillLower;
+            }
+            _attrUpdate = false;
+        }
+
+        private void WineAttributeAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_attrList == null) return;
+            _attrChanged = true;
+            var item = Context.CreateProxy<WineAttr>();
+            _attrList.Add(item);
+            WineAttributeList.SelectedItem = item;
+            UpdateButtons();
+        }
+
+        private void WineAttributeDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_attrList == null || _attrs == null) return;
+            _attrChanged = true;
+            var idx = WineAttributeList.SelectedIndex;
+            var item = _attrList[idx];
+            _attrs[item.AttrId] = null;
+            _attrList.RemoveAt(idx);
+            WineAttributeList.SelectedIndex = idx < _attrList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void WineAttribute_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_attrUpdate || (!IsEditing && !IsCreating) || WineAttributeList.SelectedItem is not WineAttr attr || _attrs == null || _attrIds == null) return;
+            _attrChanged = _attrChanged ||
+                WineAttributeIdInput.Text != attr.AttrId ||
+                WineAttributeNameInput.Text != attr.Name ||
+                WineAttributeActiveInput.IsChecked != attr.IsActive ||
+                WineAttributeMaxKgPerHaInput.Text != attr.MaxKgPerHa?.ToString() ||
+                WineAttributeStrictInput.IsChecked != attr.IsStrict ||
+                WineAttributeFillLowerInput.SelectedIndex != attr.FillLower;
+
+            var old = _attrIds.GetValueOrDefault(attr);
+            var id = WineAttributeIdInput.Text;
+            if (old != null) _attrs[old] = id;
+            attr.AttrId = id;
+            attr.Name = WineAttributeNameInput.Text ?? "";
+            attr.IsActive = WineAttributeActiveInput.IsChecked ?? false;
+            attr.MaxKgPerHa = WineAttributeMaxKgPerHaInput.Text.Length > 0 ? int.Parse(WineAttributeMaxKgPerHaInput.Text) : null;
+            attr.IsStrict = WineAttributeStrictInput.IsChecked ?? false;
+            attr.FillLower = WineAttributeFillLowerInput.SelectedIndex;
+
+            CollectionViewSource.GetDefaultView(_attrList).Refresh();
+            CollectionViewSource.GetDefaultView(_attrList).Refresh();
+            UpdateButtons();
+        }
+
+        private void WineAttributeIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpperCaseInput_TextChanged(sender, evt);
+            WineAttribute_Changed(sender, evt);
+        }
+
+        private void WineAttributeMaxKgPerHaInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckInteger((TextBox)sender, false, 5));
+            WineAttribute_Changed(sender, evt);
+        }
+
+        private void WineAttributeStrictInput_Changed(object sender, RoutedEventArgs evt) {
+            WineAttributeFillLowerInput.Visibility = WineAttributeStrictInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            WineAttributeFillLowerLabel.Visibility = WineAttributeFillLowerInput.Visibility;
+            WineAttribute_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.WineCult.cs

@@ -0,0 +1,126 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class BaseDataWindow {
+
+        private Dictionary<string, string?>? _cults = null;
+        private Dictionary<WineCult, string>? _cultIds = null;
+        private ObservableCollection<WineCult>? _cultList = null;
+        private bool _cultChanged = false;
+        private bool _cultUpdate = false;
+
+        private void WineCultivationsInitEditing() {
+            _cultList = new(Context.WineCultivations.OrderBy(c => c.Name).ToList());
+            _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);
+            WineCultivationList_SelectionChanged(null, null);
+        }
+
+        private void WineCultivationsFinishEditing() {
+            ControlUtils.RenewItemsSource(WineCultivationList, Context.WineCultivations.OrderBy(c => c.Name).ToList(), c => (c as WineCult)?.CultId);
+            _cultList = null;
+            _cults = null;
+            _cultIds = null;
+            _cultChanged = false;
+
+            WineCultivationAddButton.IsEnabled = false;
+            WineCultivationDeleteButton.IsEnabled = false;
+        }
+
+        private async Task WineCultivationsSave() {
+            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));
+            }
+            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));
+            }
+            await Context.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 Context.SaveChangesAsync();
+
+            foreach (var cult in _cultList.Where(c => !_cultIds.ContainsKey(c))) {
+                if (cult.CultId == null) continue;
+                await Context.AddAsync(cult);
+            }
+            await Context.SaveChangesAsync();
+        }
+
+        private void WineCultivationList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
+            UpdateButtons();
+            _cultUpdate = true;
+            if (WineCultivationList.SelectedItem is not WineCult cult) {
+                WineCultivationIdInput.Text = "";
+                WineCultivationNameInput.Text = "";
+                WineCultivationDescriptionInput.Text = "";
+            } else {
+                WineCultivationIdInput.Text = cult.CultId;
+                WineCultivationNameInput.Text = cult.Name;
+                WineCultivationDescriptionInput.Text = cult.Description;
+            }
+            _cultUpdate = false;
+        }
+
+        private void WineCultivationAddButton_Click(object sender, RoutedEventArgs evt) {
+            if (_cultList == null) return;
+            _cultChanged = true;
+            var item = Context.CreateProxy<WineCult>();
+            _cultList.Add(item);
+            WineCultivationList.SelectedItem = item;
+            UpdateButtons();
+        }
+
+        private void WineCultivationDeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (_cultList == null || _cults == null) return;
+            _cultChanged = true;
+            var idx = WineCultivationList.SelectedIndex;
+            var item = _cultList[idx];
+            _cults[item.CultId] = null;
+            _cultList.RemoveAt(idx);
+            WineCultivationList.SelectedIndex = idx < _cultList.Count ? idx : idx - 1;
+            UpdateButtons();
+        }
+
+        private void WineCultivation_Changed(object? sender, RoutedEventArgs? evt) {
+            if (_cultUpdate || (!IsEditing && !IsCreating) || WineCultivationList.SelectedItem is not WineCult cult || _cults == null || _cultIds == null) return;
+            _cultChanged = _cultChanged ||
+                WineCultivationIdInput.Text != cult.CultId ||
+                WineCultivationNameInput.Text != cult.Name ||
+                WineCultivationDescriptionInput.Text != (cult.Description ?? "");
+
+            var old = _cultIds.GetValueOrDefault(cult);
+            var id = WineCultivationIdInput.Text ?? "";
+            if (old != null) _cults[old] = id;
+            cult.CultId = id;
+            cult.Name = WineCultivationNameInput.Text ?? "";
+            cult.Description = WineCultivationDescriptionInput.Text ?? "";
+            if (cult.Description.Length == 0) cult.Description = null;
+
+            CollectionViewSource.GetDefaultView(_cultList).Refresh();
+            UpdateButtons();
+        }
+
+        private void WineCultivationIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpperCaseInput_TextChanged(sender, evt);
+            WineCultivation_Changed(sender, evt);
+        }
+    }
+}

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -1,24 +1,15 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 
 namespace Elwig.Windows {
     public partial class BaseDataWindow : AdministrationWindow {
 
-        private Dictionary<string, string?>? Modifiers = null;
-        private Dictionary<Modifier, string>? ModifierIds = null;
-        private ObservableCollection<Modifier>? ModifierList = null;
-        private bool ModifiersChanged = false;
-        private bool ModifierUpdate = false;
-
         public BaseDataWindow() {
             InitializeComponent();
             RequiredInputs = new Control[] {
@@ -27,100 +18,157 @@ namespace Elwig.Windows {
             };
             ExemptInputs = new Control[] {
                 ClientNameFull,
-                SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput, SeasonModifierAbsInput,
+                BranchIdInput, BranchNameInput, BranchPlzInput, BranchOrtInput,
+                BranchAddressInput, BranchPhoneNrInput, BranchFaxNrInput, BranchMobileNrInput,
+                WineAttributeIdInput, WineAttributeNameInput, WineAttributeActiveInput,
+                WineAttributeMaxKgPerHaInput.TextBox, WineAttributeStrictInput, WineAttributeFillLowerInput,
+                WineCultivationIdInput, WineCultivationNameInput, WineCultivationDescriptionInput,
+                AreaCommitmentTypeIdInput, AreaCommitmentTypeWineVariantInput, AreaCommitmentTypeWineAttributeInput,
+                AreaCommitmentTypeMinKgPerHaInput.TextBox, AreaCommitmentTypePenaltyPerKgInput.TextBox,
+                AreaCommitmentTypePenaltyInput.TextBox, AreaCommitmentTypePenaltyNoneInput.TextBox,
+                SeasonMaxKgPerHaInput.TextBox, SeasonVatNormalInput.TextBox, SeasonVatFlatrateInput.TextBox, SeasonStartInput, SeasonEndInput,
+                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
+                SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput.TextBox, SeasonModifierAbsInput.TextBox,
             };
+            WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
+            WineAttributeFillLowerLabel.Visibility = Visibility.Hidden;
         }
 
         new protected void LockInputs() {
             base.LockInputs();
+
+            BranchIdInput.IsReadOnly = true;
+            BranchNameInput.IsReadOnly = true;
+            BranchPlzInput.IsReadOnly = true;
+            BranchOrtInput.IsEnabled = false;
+            BranchAddressInput.IsReadOnly = true;
+            BranchPhoneNrInput.IsReadOnly = true;
+            BranchFaxNrInput.IsReadOnly = true;
+            BranchMobileNrInput.IsReadOnly = true;
+
+            WineAttributeIdInput.IsReadOnly = true;
+            WineAttributeNameInput.IsReadOnly = true;
+            WineAttributeActiveInput.IsEnabled = false;
+            WineAttributeMaxKgPerHaInput.TextBox.IsReadOnly = true;
+            WineAttributeStrictInput.IsEnabled = false;
+            WineAttributeFillLowerInput.IsEnabled = false;
+
+            WineCultivationIdInput.IsReadOnly = true;
+            WineCultivationNameInput.IsReadOnly = true;
+            WineCultivationDescriptionInput.IsReadOnly = true;
+
+            AreaCommitmentTypeWineVariantInput.IsEnabled = false;
+            AreaCommitmentTypeWineAttributeInput.IsEnabled = false;
+            AreaCommitmentTypeMinKgPerHaInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyPerKgInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyInput.TextBox.IsReadOnly = true;
+            AreaCommitmentTypePenaltyNoneInput.TextBox.IsReadOnly = true;
+
+            SeasonMaxKgPerHaInput.TextBox.IsReadOnly = true;
+            SeasonVatNormalInput.TextBox.IsReadOnly = true;
+            SeasonVatFlatrateInput.TextBox.IsReadOnly = true;
+            SeasonMinKgPerBsInput.TextBox.IsReadOnly = true;
+            SeasonMaxKgPerBsInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyPerKgInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyInput.TextBox.IsReadOnly = true;
+            SeasonPenaltyNoneInput.TextBox.IsReadOnly = true;
+
             SeasonModifierIdInput.IsReadOnly = true;
             SeasonModifierNameInput.IsReadOnly = true;
-            SeasonModifierRelInput.IsReadOnly = true;
-            SeasonModifierAbsInput.IsReadOnly = true;
+            SeasonModifierRelInput.TextBox.IsReadOnly = true;
+            SeasonModifierAbsInput.TextBox.IsReadOnly = true;
         }
 
         new protected void UnlockInputs() {
             base.UnlockInputs();
+
+            BranchIdInput.IsReadOnly = false;
+            BranchNameInput.IsReadOnly = false;
+            BranchPlzInput.IsReadOnly = false;
+            BranchOrtInput.IsEnabled = true;
+            BranchAddressInput.IsReadOnly = false;
+            BranchPhoneNrInput.IsReadOnly = false;
+            BranchFaxNrInput.IsReadOnly = false;
+            BranchMobileNrInput.IsReadOnly = false;
+
+            WineAttributeIdInput.IsReadOnly = false;
+            WineAttributeNameInput.IsReadOnly = false;
+            WineAttributeActiveInput.IsEnabled = true;
+            WineAttributeMaxKgPerHaInput.TextBox.IsReadOnly = false;
+            WineAttributeStrictInput.IsEnabled = true;
+            WineAttributeFillLowerInput.IsEnabled = true;
+
+            WineCultivationIdInput.IsReadOnly = false;
+            WineCultivationNameInput.IsReadOnly = false;
+            WineCultivationDescriptionInput.IsReadOnly = false;
+
+            AreaCommitmentTypeWineVariantInput.IsEnabled = true;
+            AreaCommitmentTypeWineAttributeInput.IsEnabled = true;
+            AreaCommitmentTypeMinKgPerHaInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyPerKgInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyInput.TextBox.IsReadOnly = false;
+            AreaCommitmentTypePenaltyNoneInput.TextBox.IsReadOnly = false;
+
+            SeasonMaxKgPerHaInput.TextBox.IsReadOnly = false;
+            SeasonVatNormalInput.TextBox.IsReadOnly = false;
+            SeasonVatFlatrateInput.TextBox.IsReadOnly = false;
+            SeasonMinKgPerBsInput.TextBox.IsReadOnly = false;
+            SeasonMaxKgPerBsInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyPerKgInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyInput.TextBox.IsReadOnly = false;
+            SeasonPenaltyNoneInput.TextBox.IsReadOnly = false;
+
             SeasonModifierIdInput.IsReadOnly = false;
             SeasonModifierNameInput.IsReadOnly = false;
-            SeasonModifierRelInput.IsReadOnly = false;
-            SeasonModifierAbsInput.IsReadOnly = false;
+            SeasonModifierRelInput.TextBox.IsReadOnly = false;
+            SeasonModifierAbsInput.TextBox.IsReadOnly = false;
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
             LockInputs();
-            FillInputs(App.Client);
         }
 
         protected override async Task OnRenewContext() {
             await base.OnRenewContext();
+            FillInputs(App.Client);
             ControlUtils.RenewItemsSource(SeasonList, await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync(), s => (s as Season)?.Year, null, ControlUtils.RenewSourceDefault.First);
             var year = (SeasonList.SelectedItem as Season)?.Year;
-            ControlUtils.RenewItemsSource(SeasonModifierList, await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync(), m => (m as Modifier)?.ModId);
+            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();
+            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);
         }
 
         protected override void UpdateButtons() {
             if (!IsEditing && !IsCreating) return;
-            bool ch = ModifiersChanged || HasChanged, v = IsValid;
+            bool ch = _branchChanged || _attrChanged || _cultChanged || _actChanged ||
+                      _seasonChanged || _modChanged || HasChanged,
+                v = IsValid;
             CancelButton.IsEnabled = true;
             ResetButton.IsEnabled = ch;
             SaveButton.IsEnabled = ch && v;
+
+            BranchAddButton.IsEnabled = true;
+            BranchDeleteButton.IsEnabled = BranchList.SelectedIndex != -1;
+            WineAttributeAddButton.IsEnabled = true;
+            WineAttributeDeleteButton.IsEnabled = WineAttributeList.SelectedIndex != -1;
+            WineCultivationAddButton.IsEnabled = true;
+            WineCultivationDeleteButton.IsEnabled = WineCultivationList.SelectedIndex != -1;
+            AreaCommitmentTypeAddButton.IsEnabled = true;
+            AreaCommitmentTypeDeleteButton.IsEnabled = AreaCommitmentTypeList.SelectedIndex != -1;
             SeasonModifierUpButton.IsEnabled = SeasonModifierList.SelectedIndex >= 1;
-            SeasonModifierDownButton.IsEnabled = SeasonModifierList.SelectedIndex != -1 && SeasonModifierList.SelectedIndex < (ModifierList?.Count - 1 ?? 0);
+            SeasonModifierDownButton.IsEnabled = SeasonModifierList.SelectedIndex != -1 && SeasonModifierList.SelectedIndex < (_modList?.Count - 1 ?? 0);
             SeasonModifierAddButton.IsEnabled = true;
             SeasonModifierDeleteButton.IsEnabled = SeasonModifierList.SelectedIndex != -1;
         }
 
-        private void ModifiersInitEditing() {
-            var year = (SeasonList.SelectedItem as Season)?.Year;
-            Context.ChangeTracker.Clear();
-            ModifierList = new(Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToList());
-            Modifiers = ModifierList.ToDictionary(m => m.ModId, m => m.ModId);
-            ModifierIds = ModifierList.ToDictionary(m => m, m => m.ModId);
-            ControlUtils.RenewItemsSource(SeasonModifierList, ModifierList, m => (m as Modifier)?.ModId);
-        }
-
-        private void ModifiersFinishEditing() {
-            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);
-            ModifierList = null;
-            Modifiers = null;
-            ModifierIds = null;
-            ModifiersChanged = false;
-
-            SeasonModifierUpButton.IsEnabled = false;
-            SeasonModifierDownButton.IsEnabled = false;
-            SeasonModifierAddButton.IsEnabled = false;
-            SeasonModifierDeleteButton.IsEnabled = false;
-        }
-
-        private async Task ModifiersSave() {
-            if (!ModifiersChanged || ModifierList == null || Modifiers == null || ModifierIds == null) return;
-            int i = 0;
-            foreach (var mod in ModifierList) mod.Ordering = ++i;
-
-            var year = (SeasonList.SelectedItem as Season)?.Year;
-            foreach (var (modid, _) in Modifiers.Where(m => m.Value == null)) {
-                Context.Remove(Context.Modifiers.Find(new object?[] { year, modid }));
-            }
-            foreach (var (mod, old) in ModifierIds) {
-                mod.ModId = old;
-            }
-            foreach (var (old, modid) in Modifiers.Where(m => m.Value != null)) {
-                Context.Update(Context.Modifiers.Find(new object?[] { year, old }));
-            }
-            await Context.SaveChangesAsync();
-
-            foreach (var (old, modid) in Modifiers.Where(m => m.Value != null)) {
-                await Context.Database.ExecuteSqlAsync($"UPDATE modifier SET modid = {modid} WHERE (year, modid) = ({year}, {old})");
-            }
-            await Context.SaveChangesAsync();
-
-            foreach (var mod in ModifierList.Where(m => !ModifierIds.ContainsKey(m))) {
-                if (mod.ModId == null) continue;
-                await Context.AddAsync(mod);
-            }
-            await Context.SaveChangesAsync();
+        private void OriginButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusOriginHierarchy();
         }
 
         private void EditButton_Click(object sender, RoutedEventArgs evt) {
@@ -128,7 +176,13 @@ namespace Elwig.Windows {
             EditButton.Visibility = Visibility.Hidden;
             ResetButton.Visibility = Visibility.Visible;
 
+            BranchesInitEditing();
+            WineAttributesInitEditing();
+            WineCultivationsInitEditing();
+            AreaCommitmentTypesInitEditing();
+            SeasonsInitEditing();
             ModifiersInitEditing();
+
             UnlockInputs();
             UpdateButtons();
         }
@@ -141,6 +195,13 @@ namespace Elwig.Windows {
             CancelButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
+
+            Context.ChangeTracker.Clear();
+            BranchesFinishEditing();
+            WineCultivationsFinishEditing();
+            WineAttributesFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -149,8 +210,19 @@ namespace Elwig.Windows {
         }
 
         private void ResetButton_Click(object sender, RoutedEventArgs evt) {
-            ModifiersChanged = false;
+            _branchChanged = false;
+            _attrChanged = false;
+            _cultChanged = false;
+            _modChanged = false;
+            Context.ChangeTracker.Clear();
+
+            BranchesInitEditing();
+            WineAttributesInitEditing();
+            WineCultivationsInitEditing();
+            AreaCommitmentTypesInitEditing();
+            SeasonsInitEditing();
             ModifiersInitEditing();
+
             ClearInputStates();
             FillInputs(App.Client);
             UpdateButtons();
@@ -159,6 +231,11 @@ namespace Elwig.Windows {
         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();
             } catch (Exception exc) {
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -173,6 +250,12 @@ namespace Elwig.Windows {
             CancelButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
+
+            BranchesFinishEditing();
+            WineAttributesFinishEditing();
+            WineCultivationsFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -238,123 +321,10 @@ namespace Elwig.Windows {
             await p.UpdateValues();
         }
 
-        private void SeasonModifierUpButton_Click(object sender, RoutedEventArgs evt) {
-            if (ModifierList == null) return;
-            ModifiersChanged = true;
-            var idx = SeasonModifierList.SelectedIndex;
-            var item = ModifierList[idx];
-            ModifierList.RemoveAt(idx);
-            idx--;
-            ModifierList.Insert(idx, item);
-            SeasonModifierList.SelectedIndex = idx;
-            UpdateButtons();
-        }
-
-        private void SeasonModifierDownButton_Click(object sender, RoutedEventArgs evt) {
-            if (ModifierList == null) return;
-            ModifiersChanged = true;
-            var idx = SeasonModifierList.SelectedIndex;
-            var item = ModifierList[idx];
-            ModifierList.RemoveAt(idx);
-            idx++;
-            ModifierList.Insert(idx, item);
-            SeasonModifierList.SelectedIndex = idx;
-            UpdateButtons();
-        }
-
-        private void SeasonModifierAddButton_Click(object sender, RoutedEventArgs evt) {
-            if (ModifierList == null || SeasonList.SelectedItem is not Season s) return;
-            ModifiersChanged = true;
-            var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : ModifierList.Count;
-            var item = Context.CreateProxy<Modifier>();
-            item.Year = s.Year;
-            ModifierList.Insert(idx, item);
-            SeasonModifierList.SelectedIndex = idx;
-            UpdateButtons();
-        }
-
-        private void SeasonModifierDeleteButton_Click(object sender, RoutedEventArgs evt) {
-            if (ModifierList == null || Modifiers == null) return;
-            ModifiersChanged = true;
-            var idx = SeasonModifierList.SelectedIndex;
-            var item = ModifierList[idx];
-            Modifiers[item.ModId] = null;
-            ModifierList.RemoveAt(idx);
-            SeasonModifierList.SelectedIndex = idx < ModifierList.Count ? idx : idx - 1;
-            UpdateButtons();
-        }
-
-
         private void ClientNames_TextChanged(object sender, TextChangedEventArgs evt) {
             var suffix = ClientNameSuffixInput.Text.Length > 0 ? ClientNameSuffixInput.Text : null;
             ClientNameFull.Text = $"{ClientNameInput.Text}{(suffix != null ? $", {suffix}," : "")} {ClientNameTypeInput.Text}";
             TextBox_TextChanged(sender, evt);
         }
-
-        private async void SeasonList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            var year = (SeasonList.SelectedItem as Season)?.Year;
-            SeasonModifierList.ItemsSource = await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync();
-        }
-
-        private void SeasonModifierList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            UpdateButtons();
-            ModifierUpdate = true;
-            if (SeasonModifierList.SelectedItem is not Modifier mod) {
-                SeasonModifierIdInput.Text = "";
-                SeasonModifierNameInput.Text = "";
-                SeasonModifierRelInput.Text = "";
-                SeasonModifierAbsInput.Text = "";
-            } else {
-                SeasonModifierIdInput.Text = mod.ModId;
-                SeasonModifierNameInput.Text = mod.Name;
-                SeasonModifierRelInput.Text = (mod.Rel * 100)?.ToString();
-                SeasonModifierAbsInput.Text = mod.Abs?.ToString();
-            }
-            ModifierUpdate = false;
-        }
-
-        private void SeasonModifierIdInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod || Modifiers == null || ModifierIds == null) return;
-            ModifiersChanged = ModifiersChanged || (SeasonModifierIdInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.ModId ?? "");
-            if (ModifierUpdate) return;
-            var old = ModifierIds.GetValueOrDefault(mod);
-            var id = SeasonModifierIdInput.Text ?? "";
-            if (old != null) Modifiers[old] = id;
-            mod.ModId = id;
-            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
-            UpdateButtons();
-        }
-
-        private void SeasonModifierNameInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod) return;
-            ModifiersChanged = ModifiersChanged || (SeasonModifierNameInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Name ?? "");
-            if (ModifierUpdate) return;
-            mod.Name = SeasonModifierNameInput.Text ?? "";
-            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
-            UpdateButtons();
-        }
-
-        private void SeasonModifierRelInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod) return;
-            ModifiersChanged = ModifiersChanged || (SeasonModifierRelInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Rel?.ToString() ?? "");
-            if (ModifierUpdate) return;
-            mod.Rel = decimal.TryParse(SeasonModifierRelInput.Text, out var v) ? v / 100 : null;
-            if (mod.Rel != null) SeasonModifierAbsInput.Text = "";
-            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
-            UpdateButtons();
-        }
-
-        private void SeasonModifierAbsInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod || SeasonList.SelectedItem is not Season s) return;
-            ModifiersChanged = ModifiersChanged || (SeasonModifierAbsInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Abs?.ToString() ?? "");
-            if (ModifierUpdate) return;
-            // FIXME ValueStr does not work in ModifierList when modifier is newly created
-            mod.AbsValue = decimal.TryParse(SeasonModifierAbsInput.Text, out var v) ? Utils.DecToDb(v, s.Precision) : null;
-            if (mod.AbsValue != null) SeasonModifierRelInput.Text = "";
-            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
-            UpdateButtons();
-        }
     }
 }

Elwig/Windows/ChartWindow.xaml

@@ -1,4 +1,5 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.ChartWindow"
+<local:AdministrationWindow
+        x:Class="Elwig.Windows.ChartWindow"
         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"

Elwig/Windows/ChartWindow.xaml.cs

@@ -9,7 +9,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using ScottPlot;
@@ -18,8 +18,8 @@ using ScottPlot.Plottable;
 namespace Elwig.Windows {
     public partial class ChartWindow : AdministrationWindow {
 
-        private readonly int Year = 2021;
-        private readonly int AvNr = 2;
+        public readonly int Year;
+        public readonly int AvNr;
 
         private ScatterPlot OechslePricePlotScatter;
         private MarkerPlot HighlightedPoint;
@@ -39,9 +39,12 @@ namespace Elwig.Windows {
 
         private Graph? Graph;
 
-        public ChartWindow() {
+        public ChartWindow(int year, int avnr) {
             InitializeComponent();
-
+            Year = year;
+            AvNr = avnr;
+            var v = Context.PaymentVariants.Find(year, avnr);
+            Title = $"{v?.Name} - Lese {year} - Elwig";
             ExemptInputs = new Control[] {
                 GraphList, OechsleInput, PriceInput, FreeZoomInput, GradationLinesInput, TooltipInput
             };
@@ -375,7 +378,7 @@ namespace Elwig.Windows {
             OechslePricePlot.Plot.Legend(false, Alignment.UpperRight);
         }
 
-        private void OechsleInput_TextChanged(object sender, RoutedEventArgs evt) {
+        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
             IntegerInput_TextChanged(sender, evt);
 
             bool success = int.TryParse(OechsleInput.Text, out int oechsle);

Elwig/Windows/ContextWindow.cs

@@ -24,15 +24,19 @@ namespace Elwig.Windows {
             Loaded += OnLoaded;
         }
 
-        private async void OnShouldRenewContext(object? sender, EventArgs evt) {
-            if (!Context.HasBackendChanged) return;
+        public async Task HintContextChange() {
             _renewPending = true;
             if (LockContext) return;
             await RenewContext();
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
-            OnRenewContext().GetAwaiter().GetResult();
+        private async void OnShouldRenewContext(object? sender, EventArgs? evt) {
+            if (!Context.HasBackendChanged) return;
+            await HintContextChange();
+        }
+
+        protected async void OnLoaded(object? sender, RoutedEventArgs? evt) {
+            await OnRenewContext();
         }
 
         protected override void OnClosed(EventArgs evt) {

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -4,6 +4,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"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
@@ -93,7 +94,7 @@
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
                      TextChanged="SearchInput_TextChanged"
                      ToolTip="Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.&#xA;&#xA;Filtern nach:&#xA;Sorte: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...&#xA;Qualitätsstufe: z.B. QUW, kab, ldw, ...&#xA;Gradation: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...&#xA;Mitglied: z.B. 1234, 987, ...&#xA;Saison: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...&#xA;Zweigstelle: z.B. musterort, ...&#xA;Attribute: z.B. kabinett, !kabinett (alle außer kabinett), ...&#xA;Datum: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...&#xA;Uhrzeit: z.B. 06:00-08:00, 18:00-, ...&#xA;Freitext: z.B. Lieferscheinnummern, &quot;quw&quot; (sucht nach dem Text &quot;quw&quot;)"/>
-            <xctk:IntegerUpDown Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+            <xctk:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>
             <CheckBox x:Name="TodayOnlyInput" Content="Nur heute"
@@ -285,17 +286,12 @@
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
                     <Label Content="Gradation:" Margin="10,10,10,10"/>
-                    <Grid Grid.Column="1" Width="54" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="GradationOeInput"  TextAlignment="Right" Padding="2,2,23,2"
-                                 TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"/>
-                        <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="GradationOeInput" Unit="°Oe" TextChanged="GradationOeInput_TextChanged" KeyUp="Input_KeyUp"
+                                      Grid.Column="1" Width="54" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
                     <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
-                    <Grid Grid.Column="1" Width="68" Height="25" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,34,2" SnapsToDevicePixels="True"
-                                 TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
-                        <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="GradationKmwInput" Unit="°KMW" TextChanged="GradationKmwInput_TextChanged" KeyUp="Input_KeyUp"
+                                      Grid.Column="1" Width="68" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
                     <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
@@ -315,11 +311,8 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="Gewicht:" Margin="10,10,10,10"/>
-                    <Grid Grid.Column="1" Width="70" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
-                        <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2" IsReadOnly="True"
-                                 TextChanged="WeightInput_TextChanged"/>
-                        <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="WeightInput" Unit="kg" TextChanged="WeightInput_TextChanged"
+                                      Grid.Column="1" Width="70" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
 
                     <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
                               VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
@@ -365,18 +358,14 @@
                              TextChanged="TextBox_TextChanged"/>
 
                     <Label Content="Temperatur:" Margin="10,70,0,10"/>
-                    <Grid Grid.Column="1" Height="25" Margin="0,70,10,10" VerticalAlignment="Top">
-                        <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
-                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                        <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="TemperatureInput" Unit="°C"
+                                      TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"
+                                      Grid.Column="1" Margin="0,70,10,10" VerticalAlignment="Top"/>
 
                     <Label Content="Säure:" Margin="10,100,0,10"/>
-                    <Grid Grid.Column="1" Height="25" Margin="0,100,10,10" VerticalAlignment="Top">
-                        <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
-                                 TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
-                        <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
-                    </Grid>
+                    <ctrl:UnitTextBox x:Name="AcidInput" Unit="g/l"
+                                      TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"
+                                      Grid.Column="1" Margin="0,100,10,10" VerticalAlignment="Top"/>
 
                     <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
@@ -428,7 +417,7 @@
 
                     <Label Content="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
                     <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
-                              ItemTemplate="{StaticResource WineOriginTemplate}"/>
+                              ItemTemplate="{StaticResource WineOriginComboTemplate}"/>
 
                     <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
                     <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
@@ -465,23 +454,47 @@
                 </ItemsPanelTemplate>
             </StatusBar.ItemsPanel>
             <StatusBarItem>
-                <TextBlock Name="StatusMembers" Text="Mitglieder: -"/>
+                <TextBlock x:Name="StatusMembers" Text="Mitglieder: -"/>
             </StatusBarItem>
             <Separator Grid.Column="1"/>
             <StatusBarItem Grid.Column="2">
-                <TextBlock Name="StatusDeliveries" Text="Lieferungen: -"/>
+                <TextBlock x:Name="StatusDeliveries" Text="Lieferungen: -"/>
             </StatusBarItem>
             <Separator Grid.Column="3"/>
             <StatusBarItem Grid.Column="4">
-                <TextBlock Name="StatusVarieties" Text="Sorten: -"/>
+                <TextBlock x:Name="StatusVarieties" Text="Sorten: -"/>
             </StatusBarItem>
             <Separator Grid.Column="5"/>
             <StatusBarItem Grid.Column="6">
-                <TextBlock Name="StatusWeight" Text="Gewicht: -"/>
+                <TextBlock x:Name="StatusWeight" Text="Gewicht: -">
+                    <TextBlock.ToolTip>
+                        <Grid x:Name="StatusWeightToolTip">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="10"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="80"/>
+                                <ColumnDefinition Width="50"/>
+                                <ColumnDefinition Width="50"/>
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </TextBlock.ToolTip>
+                </TextBlock>
             </StatusBarItem>
             <Separator Grid.Column="7"/>
             <StatusBarItem Grid.Column="8">
-                <TextBlock Name="StatusGradation" Text="Gradation: -"/>
+                <TextBlock x:Name="StatusGradation" Text="Gradation: -">
+                    <TextBlock.ToolTip>
+                        <Grid x:Name="StatusGradationToolTip">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="10"/>
+                                <ColumnDefinition Width="60"/>
+                                <ColumnDefinition Width="35"/>
+                                <ColumnDefinition Width="35"/>
+                                <ColumnDefinition Width="35"/>
+                            </Grid.ColumnDefinitions>
+                        </Grid>
+                    </TextBlock.ToolTip>
+                </TextBlock>
             </StatusBarItem>
         </StatusBar>
     </Grid>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -1,7 +1,7 @@
 using Elwig.Documents;
 using Elwig.Helpers;
 using Elwig.Helpers.Export;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using LinqKit;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
@@ -19,8 +19,10 @@ using Xceed.Wpf.Toolkit.Primitives;
 namespace Elwig.Windows {
     public partial class DeliveryAdminWindow : AdministrationWindow {
 
+        public readonly bool IsReceipt = false;
+        public int? MgNr => Member?.MgNr;
+
         private bool IsUpdatingGradation = false;
-        private readonly bool IsReceipt = false;
         private Member? Member = null;
         private readonly DispatcherTimer Timer;
         private List<string> TextFilter = new();
@@ -40,9 +42,9 @@ namespace Elwig.Windows {
                 MgNrInput, MemberInput,
                 LsNrInput, DateInput, BranchInput,
                 SortIdInput, WineVarietyInput,
-                GradationOeInput, GradationKmwInput, WineQualityLevelInput,
+                GradationOeInput.TextBox, GradationKmwInput.TextBox, WineQualityLevelInput,
                 WineOriginInput, WineKgInput,
-                WeightInput
+                WeightInput.TextBox
             };
             ExemptInputs = new Control[] {
                 SearchInput, SeasonInput, TodayOnlyInput, AllSeasonsInput,
@@ -282,7 +284,7 @@ namespace Elwig.Windows {
                 SortIdInput.SelectAll();
             } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributeInput) {
                 GradationOeInput.Focus();
-                GradationOeInput.SelectAll();
+                GradationOeInput.TextBox.SelectAll();
             } else if (ctrl == GradationKmwInput || ctrl == GradationOeInput || ctrl == WineQualityLevelInput) {
                 if (WeighingAButton.IsVisible) WeighingAButton.Focus();
                 else WeighingManualButton.Focus();
@@ -296,6 +298,10 @@ namespace Elwig.Windows {
         private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
             List<string> filterNames = new();
             IQueryable<Delivery> deliveryQuery = Context.Deliveries;
+            if (IsReceipt && App.BranchNum > 1) {
+                deliveryQuery = deliveryQuery.Where(d => d.ZwstId == App.ZwstId);
+                filterNames.Add($"Zweigstelle {App.BranchName}");
+            }
             if (Member != null) {
                 deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
                 filterNames.Add(Member.AdministrativeName);
@@ -519,6 +525,38 @@ namespace Elwig.Windows {
             return (filterNames, dpq.Select(p => p.Delivery).Distinct().OrderBy(d => d.DateString).ThenBy(d => d.TimeString), dpq, filter);
         }
 
+        private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
+            var tb = new TextBlock() {
+                Text = text,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
+        private void AddWeightToolTipRow(int row, string? h1, string? h2, int weight, int? total1, int total2) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(StatusWeightToolTip, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(StatusWeightToolTip, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(StatusWeightToolTip, $"{weight:N0} kg", row, 2, 1, bold, true);
+            if (total1 != null && total1 != 0)
+                AddToolTipCell(StatusWeightToolTip, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
+            if (total2 != 0)
+                AddToolTipCell(StatusWeightToolTip, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
+        }
+
+        private void AddGradationToolTipRow(int row, string? h1, string? h2, double min, double avg, double max) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(StatusGradationToolTip, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(StatusGradationToolTip, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(StatusGradationToolTip, $"{min:N1}°", row, 2, 1, bold, true);
+            AddToolTipCell(StatusGradationToolTip, $"{avg:N1}°", row, 3, 1, bold, true);
+            AddToolTipCell(StatusGradationToolTip, $"{max:N1}°", row, 4, 1, bold, true);
+        }
+
         private async Task RefreshDeliveryListQuery(bool updateSort = false) {
             var (_, deliveryQuery, deliveryPartsQuery, filter) = await GetFilters();
             var deliveries = await deliveryQuery.ToListAsync();
@@ -551,47 +589,99 @@ namespace Elwig.Windows {
                 var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
                 StatusVarieties.Text = $"Sorten: {varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
 
+                StatusWeightToolTip.Children.Clear();
+                StatusGradationToolTip.Children.Clear();
+
                 var weight = await deliveryParts.SumAsync(p => p.Weight);
                 StatusWeight.Text = $"Gewicht: {weight:N0} kg";
+                AddWeightToolTipRow(0, "Gewicht", null, weight, null, weight);
 
                 if (n > 0) {
                     var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
                     var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
                     var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
                     StatusGradation.Text = $"Gradation: {kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
-                } else {
-                    StatusGradation.Text = "Gradation: -";
+                    AddToolTipCell(StatusGradationToolTip, "Min.", 0, 2, 1, false, false, true);
+                    AddToolTipCell(StatusGradationToolTip, "⌀", 0, 3, 1, false, false, true);
+                    AddToolTipCell(StatusGradationToolTip, "Max.", 0, 4, 1, false, false, true);
+                    AddGradationToolTipRow(1, "Gradation", null, kmwMin, kmwAvg, kmwMax);
+
+                    var attrGroups = await deliveryParts
+                        .GroupBy(p => p.Attribute.Name)
+                        .Select(g => new {
+                            Attr = g.Key,
+                            Weight = g.Sum(p => p.Weight),
+                            Min = g.Min(p => p.Kmw),
+                            Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
+                            Max = g.Max(p => p.Kmw),
+                        })
+                        .OrderByDescending(g => g.Weight)
+                        .ThenBy(g => g.Attr)
+                        .ToListAsync();
+                    var sortGroups = await deliveryParts
+                        .GroupBy(p => p.SortId)
+                        .Select(g => new {
+                            SortId = g.Key,
+                            Weight = g.Sum(p => p.Weight),
+                            Min = g.Min(p => p.Kmw),
+                            Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
+                            Max = g.Max(p => p.Kmw),
+                        })
+                        .OrderByDescending(g => g.Weight)
+                        .ThenBy(g => g.SortId)
+                        .ToListAsync();
+                    var groups = await deliveryParts
+                        .GroupBy(p => new {
+                            p.Attribute.Name,
+                            p.SortId,
+                        })
+                        .Select(g => new {
+                            Attr = g.Key.Name,
+                            g.Key.SortId,
+                            Weight = g.Sum(p => p.Weight),
+                            Min = g.Min(p => p.Kmw),
+                            Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
+                            Max = g.Max(p => p.Kmw)
+                        })
+                        .OrderByDescending(g => g.SortId)
+                        .ThenBy(g => g.Attr)
+                        .ThenBy(g => g.SortId)
+                        .ToListAsync();
+
+                    int rowNum = 1;
+                    foreach (var attrG in attrGroups) {
+                        rowNum++;
+                        AddWeightToolTipRow(rowNum++, attrG.Attr, null, attrG.Weight, attrG.Weight, weight);
+                        foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                            AddWeightToolTipRow(rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                        }
+                    }
+                    rowNum = 2;
+                    foreach (var attrG in attrGroups) {
+                        rowNum++;
+                        AddGradationToolTipRow(rowNum++, attrG.Attr, null, attrG.Min, attrG.Avg, attrG.Max);
+                        foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
+                            AddGradationToolTipRow(rowNum++, null, g.SortId, g.Min, g.Avg, g.Max);
+                        }
                     }
 
-                if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
-                    var parts = await deliveryParts.ToListAsync();
-                    var groups = parts
-                        .GroupBy(p => p.Attribute?.Name)
-                        .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
-                        .OrderByDescending(g => g.Item2)
-                        .ToList();
-
-                    if (groups.Count == 1) {
-                        var g = groups.First().Key;
-                        if (g != "") {
+                    if (attrGroups.Count == 1) {
+                        var g = attrGroups.First().Attr;
+                        if (g != null) {
                             StatusWeight.Text += $" [{g}]";
                             StatusGradation.Text += $" [{g}]";
                         }
-
-                        var sortGroups = parts
-                            .GroupBy(p => p.SortId)
-                            .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
-                            .OrderByDescending(g => g.Item2)
-                            .ToList();
-
                         if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
-                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
-                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+
                         }
-                    } else if (groups.Count <= 4) {
-                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg ({(double)g.Item2 / weight:0%})" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
-                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" [{g.Key}]")))}";
+                    } else if (attrGroups.Count <= 4) {
+                        StatusWeight.Text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null ? "" : $" [{g.Attr}]")))}";
+                        StatusGradation.Text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Min:N1}/{g.Avg:N1}/{g.Max:N1}" + (g.Attr == null ? "" : $" [{g.Attr}]")))}";
                     }
+                } else {
+                    StatusGradation.Text = "Gradation: -";
                 }
             } else {
                 StatusVarieties.Text = "Sorten: -";
@@ -600,9 +690,6 @@ namespace Elwig.Windows {
             }
 
             StatusVarieties.ToolTip = StatusVarieties.Text;
-            // TODO display Weight/Gradation with newlines in ToolTip and grouped by sortid AND attributes
-            StatusWeight.ToolTip = StatusWeight.Text;
-            StatusGradation.ToolTip = StatusGradation.Text;
         }
 
         protected override async Task OnRenewContext() {
@@ -1367,7 +1454,7 @@ namespace Elwig.Windows {
                 WineOriginInput.IsEnabled = false;
             if (WineKgInput.SelectedItem == null)
                 WineRdInput.IsEnabled = false;
-            WeightInput.IsReadOnly = true;
+            WeightInput.TextBox.IsReadOnly = true;
             AbgewertetInput.IsEnabled = false;
             ManualWeighingInput.IsEnabled = false;
             LsNrInput.IsReadOnly = true;
@@ -1408,12 +1495,12 @@ namespace Elwig.Windows {
             }
         }
 
-        private async void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private new async void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.DateInput_TextChanged(sender, evt);
             if (IsEditing || IsCreating) await UpdateLsNr();
         }
 
-        private async void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private async void BranchInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
             base.ComboBox_SelectionChanged(sender, evt);
             if (IsEditing || IsCreating) {
                 await UpdateLsNr();
@@ -1465,17 +1552,17 @@ namespace Elwig.Windows {
 
         private void UpdateGradationKmw() {
             IsUpdatingGradation = true;
-            var caret = GradationKmwInput.CaretIndex;
+            var caret = GradationKmwInput.TextBox.CaretIndex;
             GradationKmwInput.Text = $"{Utils.OeToKmw(double.Parse(GradationOeInput.Text)):#.0}";
-            GradationKmwInput.CaretIndex = caret;
+            GradationKmwInput.TextBox.CaretIndex = caret;
             IsUpdatingGradation = false;
         }
 
         private void UpdateGradationOe() {
             IsUpdatingGradation = true;
-            var caret = GradationOeInput.CaretIndex;
+            var caret = GradationOeInput.TextBox.CaretIndex;
             GradationOeInput.Text = $"{Utils.KmwToOe(double.Parse(GradationKmwInput.Text)):#}";
-            GradationOeInput.CaretIndex = caret;
+            GradationOeInput.TextBox.CaretIndex = caret;
             IsUpdatingGradation = false;
         }
 

Elwig/Windows/DeliveryConfirmationsWindow.xaml

@@ -23,10 +23,7 @@
         <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
 
-        <ProgressBar x:Name="ProgressBar" Margin="10,10,10,106" Height="27" Width="180"
-                     VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
-        <Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="180" Margin="10,10,10,74" Height="27" Tag="Print" IsEnabled="False"
-                Click="TestButton_Click"
+        <ProgressBar x:Name="ProgressBar" Margin="10,0,0,74" Height="27" Width="180"
                      VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
         <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
                 Click="ShowButton_Click"

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Elwig.Documents;
-using Elwig.Models;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
 using Elwig.Windows;
 using Microsoft.EntityFrameworkCore;
 using System;
@@ -19,15 +20,9 @@ namespace Elwig.Dialogs {
             Year = year;
             Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig";
             TextElement.Text = App.Client.TextDeliveryConfirmation;
-            if (!App.Config.Debug) {
-                TestButton.Visibility = Visibility.Hidden;
-                var m = ProgressBar.Margin;
-                ProgressBar.Margin = new(m.Left, m.Top, m.Right, m.Bottom - 32);
-            }
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
-            TestButton.IsEnabled = App.IsPrintingReady;
             ShowButton.IsEnabled = App.IsPrintingReady;
             PrintButton.IsEnabled = App.IsPrintingReady;
         }
@@ -79,22 +74,9 @@ namespace Elwig.Dialogs {
             }
 
             IEnumerable<Member> list = await members.ToListAsync();
-            if (mode == 0) {
-                var r = new Random().Next(0, 10);
-                list = list.Where((_, n) => n % 10 == r);
-            }
-
-            var deliveries = await Context.DeliveryParts.FromSqlRaw($"""
-                SELECT p.*
-                FROM v_delivery v
-                    JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
-                WHERE v.year = {Year}
-                ORDER BY v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
-                """)
-                .ToListAsync();
-
+            var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year);
             using var doc = Document.Merge(list.Select(m =>
-                new DeliveryConfirmation(Context, Year, m, deliveries.Where(d => d.Delivery.MgNr == m.MgNr).ToList()) {
+                new DeliveryConfirmation(Context, Year, m, data[m.MgNr]) {
                     //DoubleSided = true
                 }
             ));
@@ -116,10 +98,6 @@ namespace Elwig.Dialogs {
             Close();
         }
 
-        private async void TestButton_Click(object sender, RoutedEventArgs evt) {
-            await Generate(0);
-        }
-
         private async void ShowButton_Click(object sender, RoutedEventArgs evt) {
             await Generate(1);
         }

Elwig/Windows/MainWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         Title="Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize"
-        Loaded="Window_Loaded">
+        Loaded="Window_Loaded" Closing="Window_Closing">
     <Window.Resources>
         <Style TargetType="Button">
             <Setter Property="VerticalAlignment" Value="Top"/>

Elwig/Windows/MainWindow.xaml.cs

@@ -1,3 +1,4 @@
+using System.ComponentModel;
 using System.Reflection;
 using System.Windows;
 
@@ -16,6 +17,11 @@ namespace Elwig.Windows {
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) { }
 
+        private void Window_Closing(object sender, CancelEventArgs evt) {
+            if (App.NumWindows > 1)
+                evt.Cancel = true;
+        }
+
         private void MemberAdminButton_Click(object sender, RoutedEventArgs evt) {
             var w = new MemberAdminWindow();
             w.Show();
@@ -27,8 +33,7 @@ namespace Elwig.Windows {
         }
 
         private void ReceiptButton_Click(object sender, RoutedEventArgs evt) {
-            var w = new DeliveryAdminWindow(true);
-            w.Show();
+            App.FocusReceipt();
         }
 
         private void DeliveryAdminButton_Click(object sender, RoutedEventArgs evt) {
@@ -51,13 +56,11 @@ namespace Elwig.Windows {
         }
 
         private void BaseDataButton_Click(object sender, RoutedEventArgs evt) {
-            var w = new BaseDataWindow();
-            w.Show();
+            App.FocusBaseData();
         }
 
         private void SeasonFinishButton_Click(object sender, RoutedEventArgs e) {
-            var w = new SeasonFinishWindow();
-            w.Show();
+            App.FocusSeasonFinish();
         }
     }
 }

Elwig/Windows/MemberAdminWindow.xaml

@@ -53,7 +53,8 @@
             <MenuItem Header="Drucken">
                 <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
                           Click="Menu_Print_Letterhead_Click"/>
-                <MenuItem Header="Stammdatenblatt drucken"/>
+                <MenuItem x:Name="Menu_Show_Memberdata" Header="Stammdatenblatt anzeigen" Click="Menu_Show_Memberdata_Click"/>
+                <MenuItem x:Name="Menu_Print_Memberdata" Header="Stammdatenblatt drucken" Click="Menu_Print_Memberdata_Click"/>
                 <MenuItem Header="Briefköpfe drucken">
                     <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert" IsEnabled="False" Tag="Print"
                               Click="Menu_Print_Letterheads_MgNr_Click"/>
@@ -311,6 +312,10 @@
                     <CheckBox x:Name="BuchführendInput" Content="Buchführend" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+
+                    <CheckBox x:Name="OrganicInput" Content="Bio" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
                 </Grid>
             </GroupBox>
             <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
@@ -377,7 +382,10 @@
 
                     <Label Content="Stammgemeinde:" Margin="10,160,0,0" Grid.Column="0"/>
                     <ComboBox x:Name="DefaultKgInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                              Margin="0,160,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              Margin="0,160,40,10" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <Button x:Name="KgDetailsButton" Content="&#xE712;" FontFamily="Segoe MDL2 Assets" FontSize="14" Padding="0,1,0,0"
+                            Click="KgDetailsButton_Click"
+                            Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,160,10,10"/>
 
                     <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
                     <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -6,7 +6,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;
@@ -57,6 +57,8 @@ namespace Elwig.Windows {
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
             Menu_Print_Letterheads_MgNr.IsEnabled = App.IsPrintingReady;
             Menu_Print_Letterheads_Name.IsEnabled = App.IsPrintingReady;
+            Menu_Show_Memberdata.IsEnabled = App.IsPrintingReady;
+            Menu_Print_Memberdata.IsEnabled = App.IsPrintingReady;
 
             ActiveMemberInput.IsChecked = true;
             UpdatePhoneNrInputVisibility();
@@ -257,13 +259,11 @@ namespace Elwig.Windows {
         }
 
         private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
-            var w = new AreaComAdminWindow(((Member)MemberList.SelectedItem).MgNr);
-            w.Show();
+            App.FocusMemberAreaComs(((Member)MemberList.SelectedItem).MgNr);
         }
 
         private void DeliveryButton_Click(object sender, RoutedEventArgs evt) {
-            var w = new DeliveryAdminWindow(((Member)MemberList.SelectedItem).MgNr);
-            w.Show();
+            App.FocusMemberDeliveries(((Member)MemberList.SelectedItem).MgNr);
         }
 
         private async void SearchInput_TextChanged(object sender, RoutedEventArgs evt) {
@@ -339,6 +339,30 @@ namespace Elwig.Windows {
             await PrintLetterheads(2);
         }
 
+        private async void Menu_Print_Memberdata_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = new MemberDataSheet(m, Context);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async void Menu_Show_Memberdata_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = new MemberDataSheet(m, Context);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            doc.Show();
+        }
+
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
             if (!IsEditing && !IsCreating) {
                 SearchInput.Focus();
@@ -425,6 +449,7 @@ namespace Elwig.Windows {
             m.UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text;
             m.LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text;
             m.IsBuchführend = BuchführendInput.IsChecked ?? false;
+            m.IsOrganic = OrganicInput.IsChecked ?? false;
 
             m.EntryDateString = (EntryDateInput.Text == "") ? null : string.Join("-", EntryDateInput.Text.Split(".").Reverse());
             m.ExitDateString = (ExitDateInput.Text == "") ? null : string.Join("-", ExitDateInput.Text.Split(".").Reverse());
@@ -585,6 +610,7 @@ namespace Elwig.Windows {
             UstIdNrInput.Text = m.UstIdNr;
             LfbisNrInput.Text = m.LfbisNr;
             BuchführendInput.IsChecked = m.IsBuchführend;
+            OrganicInput.IsChecked = m.IsOrganic;
 
             var billingAddr = m.BillingAddress;
             if (billingAddr != null) {
@@ -623,6 +649,8 @@ namespace Elwig.Windows {
 
             Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
             Menu_Print_Letterhead.IsEnabled = true;
+            Menu_Show_Memberdata.IsEnabled = true;
+            Menu_Print_Memberdata.IsEnabled = true;
 
             FinishInputFilling();
         }
@@ -630,6 +658,8 @@ namespace Elwig.Windows {
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
             Menu_Print_Letterhead.IsEnabled = false;
+            Menu_Show_Memberdata.IsEnabled = false;
+            Menu_Print_Memberdata.IsEnabled = false;
             StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
             StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
             StatusAreaCommitment.Text = "Gebundene Fläche: -";
@@ -668,9 +698,17 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPredecessorMgNr);
         }
 
-        private new void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        private new void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.PhoneNrInput_TextChanged(sender, evt);
             UpdatePhoneNrInputVisibility(IsEditing || IsCreating);
         }
+
+        private void KgDetailsButton_Click(object sender, RoutedEventArgs evt) {
+            if (DefaultKgInput.SelectedItem is AT_Kg kg) {
+                App.FocusOriginHierarchyKg(kg.KgNr);
+            } else {
+                App.FocusOriginHierarchy();
+            }
+        }
     }
 }

Elwig/Windows/OriginHierarchyWindow.xaml

@@ -0,0 +1,114 @@
+<local:ContextWindow
+        x:Class="Elwig.Windows.OriginHierarchyWindow"
+        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"
+        mc:Ignorable="d"
+        Title="Herkunftshierarchie - Elwig" Height="800" Width="1200" MinHeight="500" MinWidth="1000">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
+            <ColumnDefinition Width="25"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="25"/>
+            <ColumnDefinition Width="1*" MinWidth="400"/>
+            <ColumnDefinition Width="25"/>
+            <ColumnDefinition Width="1*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="25"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="25"/>
+        </Grid.RowDefinitions>
+
+        <Label Content="Weinbaugebiete" Margin="10,0,0,0" VerticalAlignment="Top" Grid.RowSpan="3"/>
+        <ListBox x:Name="WineOrigins" Margin="10,25,0,10" Grid.RowSpan="3"
+                 ItemTemplate="{StaticResource WineOriginTemplate}"
+                 SelectionChanged="WineOrigins_SelectionChanged"/>
+
+        <Label Content="Großlagen" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Column="2"/>
+        <ListBox x:Name="WbGls" Margin="0,25,0,5" Grid.Column="2"
+                 DisplayMemberPath="Name"
+                 SelectionChanged="WbGls_SelectionChanged"/>
+
+        <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0" Grid.Row="2" Grid.Column="1"
+               VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Label x:Name="WbGemsHeader" Content="Gemeinden" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2"/>
+        <ListBox x:Name="WbGems" Margin="0,25,0,10" Grid.Column="2" Grid.Row="2"
+                 ItemTemplate="{StaticResource GemTemplate}" TextSearch.TextPath="Name"
+                 SelectionChanged="WbGems_SelectionChanged"/>
+
+        <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0" Grid.Column="3"
+               VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Label x:Name="WbGlKgsHeader" Content="Aktive KG" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Column="4"/>
+        <Label Content="Weinbaugebiet" Margin="250,0,0,0" VerticalAlignment="Top" Grid.Column="4" Background="White"/>
+        <ListBox x:Name="WbGlKgs" Margin="0,25,0,5" Grid.Column="4"
+                 ItemTemplate="{StaticResource WbKgTemplate}" TextSearch.TextPath="Name"
+                 SelectionChanged="WbGlKgs_SelectionChanged"/>
+
+        <Button x:Name="ActivateKgButton" Content="&#xF0AD;" Grid.Column="4" Grid.Row="1" Height="25" Width="25" Margin="0,0,30,0"
+                FontFamily="Segoe MDL2 Assets" FontSize="14"
+                Click="ActivateKgButton_Click"
+                VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Button x:Name="DeactivateKgButton" Content="&#xF0AE;" Grid.Column="4" Grid.Row="1" Height="25" Width="25" Margin="30,0,0,0"
+                FontFamily="Segoe MDL2 Assets" FontSize="14"
+                Click="DeactivateKgButton_Click"
+                VerticalAlignment="Center" HorizontalAlignment="Center"/>
+
+        <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0" Grid.Row="2" Grid.Column="3"
+               VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Label x:Name="WbKgsHeader" Content="Verfügbare KG" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Column="4" Grid.Row="2"/>
+        <Label Content="Zugewiesen zu Großlage" Margin="220,0,0,0" VerticalAlignment="Top" Grid.Column="4" Grid.Row="2" Background="White"/>
+        <ListBox x:Name="WbKgs" Margin="0,25,0,10" Grid.Column="4" Grid.Row="2"
+                 ItemTemplate="{StaticResource WbKgGlTemplate}" TextSearch.TextPath="Name"
+                 SelectionChanged="WbKgs_SelectionChanged"/>
+
+        <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Padding="0" Grid.Column="5"
+               VerticalAlignment="Center" HorizontalAlignment="Center"/>
+        <Label x:Name="WbRdsHeader" Content="Riede" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Column="6" Grid.RowSpan="3"/>
+        <ListBox x:Name="WbRds" Margin="0,25,10,10" Grid.Column="6" Grid.RowSpan="3"
+                 DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
+
+        <StatusBar Grid.Row="3" Grid.ColumnSpan="7" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1.5*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusKgName" Text="Katastralgemeinde: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusWbRds" Text="Riede: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusDefaultKgs" Text="Stammgemeinde: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock Name="StatusAreaCommitments" Text="Flächenbindungen: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8">
+                <TextBlock Name="StatusDeliveries" Text="Lieferungen: -"/>
+            </StatusBarItem>
+        </StatusBar>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/OriginHierarchyWindow.xaml.cs

@@ -0,0 +1,218 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Windows {
+
+    public partial class OriginHierarchyWindow : ContextWindow {
+
+        private bool isUpdating = false;
+
+        public OriginHierarchyWindow() {
+            InitializeComponent();
+            ActivateKgButton.IsEnabled = false;
+            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);
+            if (WineOrigins.SelectedItem == null) {
+                var hkid = await Context.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.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();
+        }
+
+        private async Task 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();
+        }
+
+        private async Task UpdateWbKgs() {
+            WbKgsHeader.Content = "Verfügbare KG";
+            IQueryable<AT_Kg>? kgs = null;
+            if (WbGems.SelectedItem is AT_Gem g) {
+                WbKgsHeader.Content += $" ({g.Name})";
+                kgs = Context.Katastralgemeinden.Where(k => k.Gkz == g.Gkz);
+            } 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);
+            } 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);
+            }
+        }
+
+        private async Task 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);
+            } else {
+                WbGlKgs.ItemsSource = null;
+            }
+            UpdateButtons();
+        }
+
+        private async Task UpdateStatusBar() {
+            StatusKgName.Text = "Katastralgemeinde: ";
+            StatusWbRds.Text = "Riede: ";
+            StatusDefaultKgs.Text = "Stammgemeinde: ";
+            StatusAreaCommitments.Text = "Flächenbindungen: ";
+            StatusDeliveries.Text = "Lieferungen: ";
+            if (WbGlKgs.SelectedItem is AT_Kg k && k.WbKg != null) {
+                StatusKgName.Text += $"{k.Name} ({k.KgNr:00000})";
+                var reeds = await Context.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();
+                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();
+                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();
+                StatusDeliveries.Text += $"{deliveries:N0} ({deliveryParts:N0})";
+            } else {
+                StatusKgName.Text += "-";
+                StatusWbRds.Text += "-";
+                StatusDefaultKgs.Text += "-";
+                StatusAreaCommitments.Text += "-";
+                StatusDeliveries.Text += "-";
+            }
+        }
+
+        private async Task 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);
+            } else {
+                WbRds.ItemsSource = null;
+            }
+            UpdateButtons();
+        }
+
+        private async void WineOrigins_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            await UpdateWbGems();
+        }
+
+        private async void WbGls_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
+            await UpdateWbGlKgs();
+        }
+
+        private async void WbGems_SelectionChanged(object? sender, SelectionChangedEventArgs? e) {
+            await UpdateWbKgs();
+        }
+
+        private async void WbGlKgs_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            await 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);
+                isUpdating = false;
+            }
+            await UpdateStatusBar();
+        }
+
+        private void WbKgs_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            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);
+                isUpdating = false;
+            }
+        }
+
+        private void UpdateButtons() {
+            if (WbKgs.SelectedItem is AT_Kg v) {
+                ActivateKgButton.IsEnabled = v.WbKg?.GlNr != (WbGls.SelectedItem as WbGl)?.GlNr;
+                ActivateKgButton.ToolTip = $"KG {v.Name} Großlage {(WbGls.SelectedItem as WbGl)?.Name} zuweisen";
+            } else {
+                ActivateKgButton.IsEnabled = false;
+                ActivateKgButton.ToolTip = $"Verfügbare Katastralgemeinde Großlage {(WbGls.SelectedItem as WbGl)?.Name} zuweisen";
+            }
+
+            if (WbGlKgs.SelectedItem is AT_Kg a) {
+                DeactivateKgButton.IsEnabled = true;
+                DeactivateKgButton.ToolTip = $"KG {a.Name} deaktivieren";
+            } else {
+                DeactivateKgButton.IsEnabled = false;
+                DeactivateKgButton.ToolTip = "Aktive Katastralgemeinde deaktivieren";
+            }
+        }
+
+        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);
+                }
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+                ControlUtils.SelectListBoxItem(WbGlKgs, kg => (kg as AT_Kg)?.KgNr, 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;
+                MessageBox.Show(str, "Katastralgemeinde aktivieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private async void DeactivateKgButton_Click(object sender, RoutedEventArgs e) {
+            if (WbGlKgs.SelectedItem is not AT_Kg k || k.WbKg == null) return;
+            var r = MessageBox.Show(
+                $"Sollen alle Riede und Stammgemeinden-Einträge von der KG {k.Name} wirklich unwiderruflich gelöscht werden?",
+                "Katastralgemeinde deaktivieren", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (r != MessageBoxResult.Yes) return;
+            try {
+                Context.Remove(k.WbKg);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+                ControlUtils.SelectListBoxItem(WbKgs, kg => (kg as AT_Kg)?.KgNr, k.KgNr);
+            } catch (Exception exc) {
+                await HintContextChange();
+                var str = "Der Eintrag konnte nicht aus der Datenbank gelöscht werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Katastralgemeinde deaktivieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        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);
+            WbGlKgs.Focus();
+        }
+    }
+}

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -0,0 +1,99 @@
+<local:ContextWindow
+        x:Class="Elwig.Windows.PaymentVariantsWindow"
+        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"
+        mc:Ignorable="d"
+        Title="Auszahlungsvarianten - Elwig" Height="450" Width="800" MinHeight="400" MinWidth="700">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="320"/>
+            <ColumnDefinition Width="100"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="200"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <ListBox x:Name="PaymentVariantList" Margin="10,10,35,10" Grid.RowSpan="2" SelectionChanged="PaymentVariantList_SelectionChanged">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Name}" Width="200"/>
+                        <TextBlock Text="{Binding Date}" Width="60"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0"
+                Click="AddButton_Click"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"/>
+        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False"
+                Click="CopyButton_Click"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"/>
+        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                Click="DeleteButton_Click"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"/>
+
+        <Label Content="Name:" Margin="10,10,0,0" Grid.Column="1"/>
+        <TextBox x:Name="NameInput" Width="200" Grid.Column="2" HorizontalAlignment="Left" Margin="0,10,0,0"/>
+
+        <Label Content="Beschreibung:" Margin="10,40,0,0" Grid.Column="1"/>
+        <TextBox x:Name="CommentInput" Grid.Column="2" HorizontalAlignment="Stretch" Margin="0,40,10,0"/>
+
+        <Label Content="Erstellt am:" Margin="10,70,0,0" Grid.Column="1"/>
+        <TextBox x:Name="DateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,70,10,0"/>
+
+        <Label Content="Überwiesen am:" Margin="10,100,0,0" Grid.Column="1"/>
+        <TextBox x:Name="TransferDateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"/>
+        <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="1" Grid.ColumnSpan="2"
+                Click="CalculateButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="100" Margin="10,10,115,10"/>
+        <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="1" Grid.ColumnSpan="2"
+                Click="EditButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="100" Margin="10,10,10,10"/>
+
+        <GroupBox Header="Abschluss" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Margin="10,0,10,10">
+            <Grid>
+                <ProgressBar x:Name="ProgressBar" Margin="10,0,0,74" Height="27" Width="180"
+                             VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
+                        Click="ShowButton_Click"
+                        VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                <Button x:Name="PrintButton" Content="Drucken" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" Tag="Print" IsEnabled="False"
+                        Click="PrintButton_Click"
+                        VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+            </Grid>
+        </GroupBox>
+    </Grid>
+</local:ContextWindow>