Setup/Installer: fix Elwig.ico/.png path

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">

Elwig/App.xaml.cs

@@ -11,6 +11,8 @@ using System.Windows.Threading;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Markup;
+using System.Reflection;
+using Elwig.Helpers.Printing;
 
 namespace Elwig {
     public partial class App : Application {
@@ -20,10 +22,23 @@ namespace Elwig {
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
         public static readonly Config Config = new(DataPath + "config.ini");
 
+        public static int VersionMajor { get; private set; }
+        public static int VersionMinor { get; private set; }
+        public static int VersionPatch { get; private set; }
+        public static string Version {
+            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
+            private set {
+                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
+                VersionMajor = p.ElementAtOrDefault(0);
+                VersionMinor = p.ElementAtOrDefault(1);
+                VersionPatch = p.ElementAtOrDefault(2);
+            }
+        }
+
         public static string ZwstId { get; private set; }
         public static string BranchName { get; private set; }
         public static int? BranchPlz { get; private set; }
-        public static string? BranchOrt { get; private set; }
+        public static string? BranchLocation { get; private set; }
         public static string? BranchAddress { get; private set; }
         public static string? BranchPhoneNr { get; private set; }
         public static string? BranchFaxNr { get; private set; }
@@ -31,12 +46,12 @@ namespace Elwig {
         public static IList<IScale> Scales { get; private set; }
         public static ClientParameters Client { get; private set; }
 
-        public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
+        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
 
         public App() : base() {
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-            Directory.CreateDirectory(App.TempPath);
+            Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
@@ -56,31 +71,30 @@ namespace Elwig {
                 new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
             );
 
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+
+            try {
+                AppDbUpdater.CheckDb();
+            } catch (Exception e) {
+                MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                Shutdown();
+                return;
+            }
+
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
             using (var ctx = new AppDbContext()) {
+                branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
                 try {
-                    if (!ctx.Database.CanConnect()) {
-                        MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
-                        Shutdown();
-                        return;
-                    } else {
-                        branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Dest, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
-                        try {
-                            Client = new(ctx);
-                        } catch (Exception e) {
-                            MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                            Shutdown();
-                            return;
-                        }
-                    }
+                    Client = new(ctx);
                 } catch (Exception e) {
-                    MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                     return;
                 }
             }
-            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
-            Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
+
+            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
 
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
@@ -114,7 +128,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchOrt = entry.Item4;
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -125,7 +139,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchOrt = entry.Item4;
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;
@@ -144,9 +158,12 @@ namespace Elwig {
 
         protected void OnPrintingReadyChanged(EventArgs evt) {
             foreach (Window w in Windows) {
-                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) {
+                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
                     b.IsEnabled = IsPrintingReady;
                 }
+                foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
+                    i.IsEnabled = IsPrintingReady;
+                }
             }
         }
     }

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/Dialogs/ManualWeighingDialog.xaml.cs

@@ -9,19 +9,16 @@ namespace Elwig.Dialogs {
         public int Weight = 0;
         public string? Reason = null;
 
-        public ManualWeighingDialog() {
+        public ManualWeighingDialog(string? reason = null) {
             InitializeComponent();
+            ReasonInput.Text = reason;
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
             Weight = int.Parse(WeightInput.Text);
-            Reason = Regex.Replace(ReasonInput.Text, @"\s+", "").Trim();
-            if (Reason == "") {
-                Reason = null;
-            } else if (!Reason.EndsWith(".") || !Reason.EndsWith("!") || !Reason.EndsWith("?")) {
-                Reason += ".";
-            }
+            Reason = Regex.Replace(ReasonInput.Text, @"\s+", " ").Trim();
+            if (Reason == "") Reason = null;
             Close();
         }
 

Elwig/Documents/BusinessDocument.cs

@@ -1,8 +1,11 @@
+using Elwig.Helpers;
 using Elwig.Models;
 
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {
 
+        public bool ShowDateAndLocation = false;
+
         public Member Member;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
@@ -11,7 +14,7 @@ namespace Elwig.Documents {
 
         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
             Member = m;
-            Location = App.BranchName;
+            Location = App.BranchLocation;
             IncludeSender = includeSender;
             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
@@ -24,14 +27,9 @@ namespace Elwig.Documents {
 
         public string Address {
             get {
-                var b = Member.BillingAddress;
-                if (b != null && UseBillingAddress) {
-                    var plz = b.PostalDest.AtPlz;
-                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                } else {
-                    var plz = Member.PostalDest.AtPlz;
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                }
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
+                var plz = addr.PostalDest.AtPlz;
+                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
             }
         }
     }

Elwig/Documents/BusinessDocument.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-businessdocument.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">
@@ -14,5 +14,8 @@
         <address>@Model.Address</address>
     </div>
     <aside>@Raw(Model.Aside)</aside>
+    @if (Model.ShowDateAndLocation) {
+        <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
+    }
 </div>
 @RenderBody()

Elwig/Documents/BusinessDocument.css

@@ -14,6 +14,13 @@
     position: relative;
 }
 
+.info-wrapper .date {
+    text-align: right;
+    position: absolute;
+    right: 0;
+    bottom: -1.5em;
+}
+
 .address-wrapper {
     height: 45mm;
     width: 85mm;
@@ -68,6 +75,14 @@ aside table tbody td {
     font-size: 10pt;
 }
 
+aside table tbody th {
+    padding: 0.25mm 0.5mm 0.25mm 1mm;
+}
+
+aside table tbody td {
+    padding: 0.25mm 0;
+}
+
 aside table tbody th {
     font-weight: normal;
 }
@@ -80,7 +95,7 @@ main > *:first-child {
     margin-top: 0;
 }
 
-.main-wrapper h1, .main-wrapper p {
+main h1, .main-wrapper p {
     font-size: 12pt;
     margin: 1em 0;
     text-align: justify;
@@ -92,12 +107,8 @@ main > *:first-child {
     hyphens: manual;
 }
 
-.main-wrapper .date {
-    margin-bottom: 2em;
-    text-align: right;
-}
-
-.main-wrapper h1 {
+main h1 {
+    margin-top: 0;
     margin-bottom: 2em;
 }
 

Elwig/Documents/CreditNote.cs

@@ -16,6 +16,7 @@ namespace Elwig.Documents {
 
         public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
             UseBillingAddress = true;
+            ShowDateAndLocation = true;
             Credit = c;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
@@ -26,14 +27,14 @@ namespace Elwig.Documents {
             Text = App.Client.TextDeliveryNote;
             DocumentId = $"Tr.-Gutschr. {c.TgId}";
             CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
-            BucketNames = c.Payment.Variant.BucketNames;
+            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, LENGTH(attributes) DESC, attributes, kmw DESC, date, time, dpnr
+                ORDER BY sortid, attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, date, time, dpnr
                 """).ToList();
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -2,12 +2,11 @@
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-creditnote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
 @{
     var bucketNum = Model.BucketNames.Length;
 }
 <main>
-    <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
     <h1>@Model.Title</h1>
     <table class="credit">
         <colgroup>
@@ -28,7 +27,7 @@
                 <th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
                 <th rowspan="3">Pos.</th>
                 <th rowspan="3" style="text-align: left;">Sorte</th>
-                <th rowspan="3" style="text-align: left;">Attribut(e)</th>
+                <th rowspan="3" style="text-align: left;">Attribut</th>
                 <th rowspan="2" colspan="2">Gradation</th>
                 <th colspan="2">Zu-/Abschläge</th>
                 <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
@@ -66,17 +65,19 @@
                     <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">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</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>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
+                    <!--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" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
+                        <!--FIXME price-->
+                        @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(i)?.Value, 0))
                     </tr>
                 }
                 last = part.SortId;

Elwig/Documents/DeliveryConfirmation.cs

@@ -0,0 +1,34 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class DeliveryConfirmation : BusinessDocument {
+
+        public Season Season;
+        public IEnumerable<DeliveryPart> Deliveries;
+        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) :
+            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();
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -0,0 +1,181 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
+@model Elwig.Documents.DeliveryConfirmation
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<main>
+    <h1>@Model.Title</h1>
+    <table class="delivery-confirmation">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 21mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 14mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attribut</th>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Gewicht</th>
+                <th>Davon<br/>abzuwerten</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th colspan="2">[kg]</th>
+                <th>[kg]</th>
+                <th>[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                var lastSortId = "";
+            }
+            @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);
+                var first = true;
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(first ? "first" : "") @(p.SortId != lastSortId && lastSortId != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                        @if (first) {
+                            <td rowspan="@rows">@p.Delivery.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>
+                        }
+                        @if (i > 0 && i <= mods.Length) {
+                            <td colspan="3" class="mod">@(mods[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>
+                            <td class="weight">@($"{bucket.Value:N0}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                        @if (i == buckets.Length - 1) {
+                            <td class="weight">@($"{p.Weight:N0}")</td>
+                        } else {
+                            <td></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="weight"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastSortId = p.SortId;
+                }
+            }
+            <tr class="sum">
+                <td colspan="8">Gesamt:</td>
+                <td colspan="2" class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table>
+    <table class="delivery-confirmation-stats">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 16mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Season.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Zugeteilt</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int mode, int obligation, int right, int sum, int? payment = null) {
+                    var isGa = mode == 0;
+                    payment ??= sum;
+                    return $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment < obligation ? $"<b>{obligation - payment:N0}\x3c/b>" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : obligation == 0 && right == 0 ? "-" : (sum > right ? ((isGa ? "<b>" : "") + $"{sum - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
+                        $"<td>{(mode != 2 ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" +
+                        $"<td>{sum: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);
+                var rem = mBuckets.Where(b => !fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(
+                    0,
+                    Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Season.Year).Sum(d => d.Weight)
+                ))
+            </tr>
+            @if (rem.Any()) {
+                <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in rem) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(1, obligation, right, sum, payment))
+                </tr>
+            }
+            @if (fbs.Any()){
+                <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in fbs) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(2, obligation, right, sum, payment))
+                </tr>
+            }
+            @if (vtr.Any()) {
+                <tr class="subheading"><th colspan="8">Verträge:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in vtr) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(2, obligation, right, sum, payment))
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div class="text" style="margin-top: 2em;">
+        @if (Model.Text != null) {
+            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+        }
+    </div>
+</main>

Elwig/Documents/DeliveryConfirmation.css

@@ -0,0 +1,113 @@
+
+table.delivery-confirmation {
+    font-size: 10pt;
+    margin-bottom: 5mm;
+}
+
+table.delivery-confirmation thead {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation thead th {
+    font-weight: normal;
+    font-style: italic;
+}
+
+table.delivery-confirmation td {
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.delivery-confirmation td[rowspan] {
+    vertical-align: top;
+}
+
+table.delivery-confirmation .weight {
+    text-align: right;
+}
+
+table.delivery-confirmation .grad {
+    text-align: center;
+}
+
+table.delivery-confirmation .geb {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation .mod {
+    font-size: 8pt;
+    padding-left: 5mm;
+}
+
+table.delivery-confirmation .small {
+    font-size: 8pt;
+}
+
+table.delivery-confirmation tr.new td {
+    border-top: 0.5pt solid black;
+}
+
+table.delivery-confirmation tr:not(.first) {
+    break-before: avoid;
+}
+
+table.delivery-confirmation tr:not(.first) td {
+    padding-top: 0;
+}
+
+table.delivery-confirmation tr.trailing td {
+    padding-bottom: 0;
+}
+
+table.delivery-confirmation tr.sum {
+    border-top: 0.5pt solid black;
+    break-before: avoid;
+    font-weight: bold;
+    font-size: 12pt;
+}
+
+table.delivery-confirmation tr.sum td {
+    padding-top: 1mm;
+}
+
+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: 8pt;
+}
+
+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/Documents/DeliveryJournal.cs

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

Elwig/Documents/DeliveryJournal.cshtml

@@ -0,0 +1,67 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryJournal>
+@model Elwig.Documents.DeliveryJournal
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<main>
+    <h1>Lieferjournal</h1>
+    <h2>@Model.Filter</h2>
+    <table class="journal">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 8mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 28mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2">Pos.</th>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">Zeit</th>
+                <th colspan="2" rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th colspan="2">Gradation</th>
+                <th>Gewicht</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th>[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var p in Model.Deliveries) {
+                <tr>
+                    <td>@p.Delivery.LsNr</td>
+                    <td>@p.DPNr</td>
+                    <td>@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
+                    <td>@($"{p.Delivery.Time:HH:mm}")</td>
+                    <td class="mgnr">@p.Delivery.Member.MgNr</td>
+                    <td>@p.Delivery.Member.AdministrativeName</td>
+                    <td>@p.Variant.Name</td>
+                    <td class="grad">@($"{p.Oe:N0}")</td>
+                    <td class="grad">@($"{p.Kmw:N1}")</td>
+                    <td class="weight">@($"{p.Weight:N0}")</td>
+                </tr>
+            }
+            <tr class="sum">
+                @{
+                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
+                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
+                }
+                <td colspan="2">Gesamt:</td>
+                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.Delivery).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
+                <td class="grad">@($"{oe:N0}")</td>
+                <td class="grad">@($"{kmw:N1}")</td>
+                <td class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>

Elwig/Documents/DeliveryJournal.css

@@ -0,0 +1,47 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}
+
+table.journal {
+    font-size: 10pt;
+}
+
+table.journal thead {
+    font-size: 8pt;
+}
+
+table.journal th {
+    font-weight: normal;
+    font-style: italic;
+}
+
+table.journal td {
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.journal .mgnr,
+table.journal .weight {
+    text-align: right;
+}
+
+table.journal .grad {
+    text-align: center;
+}
+
+table.journal tr.sum {
+    font-weight: bold;
+}
+
+table.journal tr.sum td {
+    border-top: 0.5pt solid black;
+}

Elwig/Documents/DeliveryNote.cs

@@ -7,10 +7,17 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
+        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
+
+        // 0 - none
+        // 1 - GA only
+        // 2 - GA only and area commitments of varieties from delivery note
+        // 3 - full
+        public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
         public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
+            ShowDateAndLocation = true;
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
@@ -20,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Member, d.Year).GetAwaiter().GetResult();
+            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -2,48 +2,9 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
 <main>
-<div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 <h1>@Model.Title</h1>
-@{
-    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-}
-<script>
-    document.addEventListener("DOMContentLoaded", () => {
-        const hidden = document.getElementsByClassName("hidden")[0];
-        const table = document.getElementsByClassName("delivery")[0];
-        const stats = document.getElementById("delivery-stats");
-        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
-        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
-
-        if (mm >= heightA4 - heightFooter) {
-            if (heightTable + 10 >= heightMain) {
-                // force page break in table
-                const tblOff = px2mm(0, table.offsetTop);
-                let last = null;
-                for (const tr of table.getElementsByTagName("tr")) {
-                    if (!tr.classList.contains("main")) continue;
-                    const mm2 = tblOff + px2mm(0, tr.offsetTop);
-                    if (mm2 >= heightA4 - heightFooter) {
-                        last.classList.add("page-break");
-                        break;
-                    }
-                    last = tr;
-                }
-            } else {
-                // force page break
-                const hr = document.createElement("hr");
-                hr.classList.add("page-break");
-                table.before(hr);
-
-                const p = document.createElement("p");
-                p.innerText = "Siehe nächste Seite."
-                hr.before(p);
-            }
-        }
-    });
-</script>
 <table class="delivery">
     <colgroup>
         <col style="width: 10.00mm;"/>
@@ -60,7 +21,7 @@
         <tr>
             <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
             <th class="main" rowspan="2" colspan="2">Sorte</th>
-            <th class="main" rowspan="2" colspan="2">Attribut(e)</th>
+            <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
             <th>Gewicht</th>
@@ -76,7 +37,7 @@
             <tr class="main">
                 <td style="text-align: center;">@part.DPNr</td>
                 <td colspan="2">@part.Variant.Name</td>
-                <td colspan="2">@string.Join(" / ", part.Attributes)</td>
+                <td colspan="2">@part.Attribute?.Name</td>
                 <td>@part.Quality.Name</td>
                 <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
                 <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
@@ -91,7 +52,8 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
+                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
@@ -113,60 +75,68 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
-    <div id="delivery-stats">
-        <table class="delivery-stats">
-            <colgroup>
-                <col style="width: 45mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-                <col style="width: 20mm;"/>
-            </colgroup>
-            <thead>
-                <tr>
-                    <th><b>Gesamtlieferung</b> [kg]</th>
-                    <th>Lieferpflicht</th>
-                    <th>Lieferrecht</th>
-                    <th>Unterliefert</th>
-                    <th>Noch zu liefern</th>
-                    <th>Überliefert</th>
-                    <th>Geliefert</th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    string FormatRow(int obligation, int right, int sum) {
-                        return $"<td>{obligation:N0}</td>" +
-                            $"<td>{right:N0}</td>" +
-                            $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                            $"<td>{sum:N0}</td>";
-                    }
-                    var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
+@if (Model.DisplayStats > 0) {
+    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int obligation, int right, int sum) {
+                    return $"<td>{obligation:N0}</td>" +
+                        $"<td>{right:N0}</td>" +
+                        $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
+                        $"<td>{sum:N0}</td>";
                 }
-                <tr>
-                    <th>Geschäftsanteile</th>
-                    @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
+                var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
+                var buckets = Model.MemberBuckets.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(
+                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
+                ))
+            </tr>
+            @if (Model.DisplayStats > 1) {
+                <tr class="subheading">
+                    <th>Flächenbindungen:</th>
                 </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 && obligation > 0) {
+                    @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBuckets.OrderBy(b => b.Key)) {
+                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
                         <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
                             <th>@name</th>
                             @Raw(FormatRow(obligation, right, sum))
                         </tr>
                     }
                 }
-            </tbody>
-        </table>
-    </div>
+            }
+        </tbody>
+    </table>
 }
 </main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "hidden" : "bottom")">
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

Elwig/Documents/DeliveryNote.css

@@ -1,4 +1,8 @@
 
+main h1 {
+    margin-bottom: 1.5em !important;
+}
+
 table.delivery {
     margin-bottom: 5mm;
 }
@@ -35,11 +39,9 @@ table.delivery tr.tight.first td {
     padding-bottom: 0;
 }
 
-/* FIXME update version of WeasyPrint
 table.delivery tr.tight:has(+ tr:not(.tight)) td {
-padding-bottom: 0.5mm !important;
+    padding-bottom: 0.5mm !important;
 }
-*/
 
 table.delivery tr.sum {
     border-top: 0.5pt solid black;
@@ -50,45 +52,45 @@ table.delivery tr.sum td {
     padding-top: 1mm;
 }
 
-table.delivery-stats {
+table.delivery-note-stats {
     font-size: 8pt;
     break-inside: avoid;
     break-after: avoid;
 }
 
-table.delivery-stats.expanded th,
-table.delivery-stats.expanded td {
-    padding: 0.25mm 0;
-}
-
-table.delivery-stats:not(.expanded) th,
-table.delivery-stats:not(.expanded) td {
+table.delivery-note-stats th,
+table.delivery-note-stats td {
     padding: 0.125mm 0;
 }
 
-table.delivery-stats:not(.expanded) tr.optional {
+table.delivery-note-stats:not(.expanded) tr.optional {
     display: none;
 }
 
-table.delivery-stats thead th {
+table.delivery-note-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
+table.delivery-note-stats thead th {
     font-weight: normal;
     font-style: italic;
     text-align: right;
 }
 
-table.delivery-stats thead th:first-child {
+table.delivery-note-stats thead th:first-child {
     text-align: left;
 }
 
-table.delivery-stats.expanded tbody {
-    font-size: 10pt;
-}
-
-table.delivery-stats td {
+table.delivery-note-stats td {
     text-align: right;
 }
 
-table.delivery-stats tbody th {
+table.delivery-note-stats tbody th {
     font-weight: normal;
     font-style: italic;
     text-align: left;

Elwig/Documents/Document.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Threading.Tasks;
+using System.IO;
+using Elwig.Helpers;
+using System.Collections.Generic;
+using System.Linq;
+using Elwig.Helpers.Printing;
+
+namespace Elwig.Documents {
+    public abstract partial class Document : IDisposable {
+
+        private TempFile? _pdfFile = null;
+
+        public bool ShowFoldMarks = App.Config.Debug;
+        public bool DoubleSided = false;
+
+        public string DataPath;
+        public int CurrentNextSeason;
+        public string? DocumentId;
+        public string Title;
+        public string Author;
+        public string Header;
+        public string Footer;
+        public DateTime Date;
+
+        public Document(string title) {
+            var c = App.Client;
+            DataPath = App.DataPath;
+            CurrentNextSeason = Utils.CurrentNextSeason;
+            Title = title;
+            Author = c.NameFull;
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
+            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
+                .Item(c.NameFull).NextLine()
+                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
+                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
+                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                .ToString();
+            Date = DateTime.Today;
+        }
+
+        ~Document() {
+            Dispose();
+        }
+
+        public void Dispose() {
+            _pdfFile?.Dispose();
+            _pdfFile = null;
+            GC.SuppressFinalize(this);
+        }
+
+        public static Document Merge(IEnumerable<Document> docs) {
+            return new MergedDocument(docs);
+        }
+
+        private async Task<string> Render() {
+            string name;
+            if (this is BusinessLetter) {
+                name = "BusinessLetter";
+            } else if (this is DeliveryNote) {
+                name = "DeliveryNote";
+            } else if (this is CreditNote) {
+                name = "CreditNote";
+            } else if (this is DeliveryJournal) {
+                name = "DeliveryJournal";
+            } else if (this is Letterhead) {
+                name = "Letterhead";
+            } else if (this is DeliveryConfirmation) {
+                name = "DeliveryConfirmation";
+            } else {
+                throw new InvalidOperationException("Invalid document object");
+            }
+            return await Render(name);
+        }
+
+        private async Task<string> Render(string name) {
+            return await Html.CompileRenderAsync(name, this); ;
+        }
+
+        public async Task Generate(IProgress<double>? progress = null) {
+            progress?.Report(0.0);
+            if (this is MergedDocument m) {
+                var pdf = new TempFile("pdf");
+                var tmpHtmls = new List<TempFile>();
+                var n = m.Documents.Count();
+                int i = 0;
+                foreach (var doc in m.Documents) {
+                    var tmpHtml = new TempFile("html");
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
+                    tmpHtmls.Add(tmpHtml);
+                    i++;
+                    progress?.Report(25.0 * i / n);
+                }
+                progress?.Report(25.0);
+                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(25.0 + v * 0.75)));
+                foreach (var tmp in tmpHtmls) {
+                    tmp.Dispose();
+                }
+                _pdfFile = pdf;
+            } else {
+                var pdf = new TempFile("pdf");
+                using (var tmpHtml = new TempFile("html")) {
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
+                    progress?.Report(50.0);
+                    await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, DoubleSided);
+                }
+                _pdfFile = pdf;
+            }
+            progress?.Report(100.0);
+        }
+
+        public void SaveTo(string pdfPath) {
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            File.Copy(_pdfFile.FilePath, pdfPath);
+        }
+
+        public async Task Print(int copies = 1) {
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            await Pdf.Print(_pdfFile.FilePath, copies);
+        }
+
+        public void Show() {
+            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
+        }
+
+        private class MergedDocument : Document {
+            public IEnumerable<Document> Documents;
+            public MergedDocument(IEnumerable<Document> docs) : base("Mehrere Dokumente") {
+                Documents = docs;
+            }
+        }
+    }
+}

Elwig/Documents/Document.cshtml

@@ -7,23 +7,28 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <script>
-        const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25;
-        const heightMain = heightA4 - heightFooter - heightHeader;
-        function px2mm(px1, px2) {
-            return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10;
-        }
-    </script>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    @if (Model.DoubleSided) {
+        <style>
+            @@page :left {
+                margin: 25mm 25mm 35mm 20mm;
+                @@bottom-center {
+                    content: element(page-footer-left);
+                }
+            }
+        </style>
+    }
 </head>
 <body>
-    <div class="m1"></div>
-    <div class="m2"></div>
-    <div class="m3"></div>
-    <div class="m1 r"></div>
-    <div class="m2 r"></div>
-    <div class="m3 r"></div>
+    @if (Model.ShowFoldMarks) {
+        <div class="m1"></div>
+        <div class="m2"></div>
+        <div class="m3"></div>
+        <div class="m1 r"></div>
+        <div class="m2 r"></div>
+        <div class="m3 r"></div>
+    }
     <div class="footer-wrapper">
         <div class="pre-footer">
             <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
@@ -32,6 +37,16 @@
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
+    @if (Model.DoubleSided) {
+        <div class="footer-wrapper left">
+            <div class="pre-footer">
+                <span class="page"></span>
+                <span class="doc-id">@Model.DocumentId</span>
+                <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
+            </div>
+            <footer>@Raw(Model.Footer)</footer>
+        </div>
+    }
     <header>@Raw(Model.Header)</header>
     <div class="spacing"></div>
     <div class="main-wrapper">

Elwig/Documents/Document.cshtml.cs

@@ -1,88 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
-using Elwig.Helpers;
-
-namespace Elwig.Documents {
-    public abstract class Document : IDisposable {
-
-        private TempFile? PdfFile = null;
-
-        public string DataPath;
-        public int CurrentNextSeason;
-        public string? DocumentId;
-        public string Title;
-        public string Author;
-        public string Header;
-        public string Footer;
-        public DateTime Date;
-
-        public Document(string title) {
-            var c = App.Client;
-            DataPath = App.DataPath;
-            CurrentNextSeason = Utils.CurrentNextSeason;
-            Title = title;
-            Author = App.Client.NameFull;
-            Header = $"<h1>{c.Name}</h1>";
-            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
-                .Item(c.NameFull).NextLine()
-                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
-                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
-                .ToString();
-            Date = DateTime.Today;
-        }
-
-        ~Document() {
-            Dispose();
-        }
-
-        public void Dispose() {
-            PdfFile?.Dispose();
-            PdfFile = null;
-            GC.SuppressFinalize(this);
-        }
-
-        private Task<string> Render() {
-            string name;
-            if (this is BusinessLetter) {
-                name = "BusinessLetter";
-            } else if (this is DeliveryNote) {
-                name = "DeliveryNote";
-            } else if (this is CreditNote) {
-                name = "CreditNote";
-            } else {
-                throw new InvalidOperationException("Invalid document object");
-            }
-            return Render(name);
-        }
-
-        private Task<string> Render(string name) {
-            return Html.CompileRenderAsync(name, this);
-        }
-
-        public async Task Generate() {
-            var pdf = new TempFile("pdf");
-            using (var tmpHtml = new TempFile("html")) {
-                await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
-                await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
-            }
-            PdfFile = pdf;
-        }
-
-        public void SaveTo(string pdfPath) {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(PdfFile.FilePath, pdfPath);
-        }
-
-        public async Task Print(int copies = 1) {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(PdfFile.FilePath, copies);
-        }
-
-        public void Show() {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(PdfFile.NewReference(), Title);
-        }
-    }
-}

Elwig/Documents/Document.css

@@ -29,7 +29,7 @@ table th {
 
 header {
     height: 45mm;
-    padding: 5mm;
+    padding: 10mm 0 0 0;
     position: absolute;
     top: -25mm;
     left: 0;
@@ -38,14 +38,31 @@ header {
     overflow: hidden;
 }
 
-header h1 {
+header .name {
     font-size: 18pt;
-    margin-top: 10mm;
+    margin-top: 8mm;
+    font-weight: bold;
+}
+
+header .suffix {
+    font-size: 14pt;
+    font-weight: bold;
+}
+
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
 }
 
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;
+    /* for some reason the position without the following statement changes on the second page */
+    border: 0.5pt solid #00000000;
+}
+
+.footer-wrapper.left {
+    position: running(page-footer-left);
 }
 
 .pre-footer {
@@ -58,16 +75,16 @@ header h1 {
     width: 33%;
 }
 
-.pre-footer .date {
+.pre-footer > *:first-child {
     text-align: left;
 }
 
-.pre-footer .doc-id {
+.pre-footer > *:nth-child(2) {
     text-align: center;
     font-style: italic;
 }
 
-.pre-footer .page {
+.pre-footer > *:last-child {
     text-align: right;
     float: right;
 }

Elwig/Documents/Letterhead.cs

@@ -0,0 +1,9 @@
+using Elwig.Models;
+
+namespace Elwig.Documents {
+    public class Letterhead : BusinessDocument {
+        public Letterhead(Member m) : base($"Briefkopf {m.Name}", m, true) {
+            Aside = "";
+        }
+    }
+}

Elwig/Documents/Letterhead.cshtml

@@ -0,0 +1,9 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.Letterhead>
+@model Elwig.Documents.Letterhead
+@{ Layout = "BusinessDocument"; }
+<style>
+    header, .footer-wrapper {
+        visibility: hidden;
+    }
+</style>

Elwig/Documents/Pdf.cs

@@ -1,67 +0,0 @@
-using System.Threading.Tasks;
-using Elwig.Helpers;
-using Elwig.Windows;
-using System.Diagnostics;
-using Balbarak.WeasyPrint;
-using System;
-using System.IO;
-
-namespace Elwig.Documents {
-    public static class Pdf {
-
-        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static readonly FilesManager WeasyPrintManager = new();
-        private static string? WeasyPrintPython = null;
-        private static string? WeasyPrintDir => WeasyPrintManager.FolderPath;
-        public static bool IsReady => WeasyPrintPython != null && WeasyPrintDir != null;
-
-        public static async Task Init(Action evtHandler) {
-            if (!WeasyPrintManager.IsFilesExsited()) {
-                await WeasyPrintManager.InitFilesAsync();
-            }
-            WeasyPrintPython = Path.Combine(WeasyPrintManager.FolderPath, "python.exe");
-            evtHandler();
-        }
-
-        public static async Task Convert(string htmlPath, string pdfPath) {
-            var p = new Process() { StartInfo = new() {
-                FileName = WeasyPrintPython,
-                CreateNoWindow = true,
-                WorkingDirectory = WeasyPrintDir,
-                RedirectStandardError = true,
-            } };
-            p.StartInfo.EnvironmentVariables["PATH"] = "Scripts;gtk3;" + Environment.GetEnvironmentVariable("PATH");
-            p.StartInfo.ArgumentList.Add("scripts/weasyprint.exe");
-            p.StartInfo.ArgumentList.Add("-e");
-            p.StartInfo.ArgumentList.Add("utf8");
-            p.StartInfo.ArgumentList.Add(htmlPath);
-            p.StartInfo.ArgumentList.Add(pdfPath);
-            p.Start();
-            await p.WaitForExitAsync();
-            var stderr = await p.StandardError.ReadToEndAsync();
-            if (p.ExitCode != 0) throw new Exception(stderr);
-        }
-
-        public static void Show(TempFile file, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, file);
-                w.Show();
-            });
-        }
-
-        public static void Show(string path, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, path);
-                w.Show();
-            });
-        }
-
-        public static async Task Print(string path, int copies = 1) {
-            var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
-            p.StartInfo.ArgumentList.Add(path);
-            p.StartInfo.ArgumentList.Add($"copies={copies}");
-            p.Start();
-            await p.WaitForExitAsync();
-        }
-    }
-}

Elwig/Elwig.csproj

@@ -6,35 +6,32 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.2.0</Version>
+    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
+    <Version>0.5.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="4.1.67" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="elwig.png" />
+    <Resource Include="Resources\Images\Elwig.png" />
+    <Content Include="Resources\Images\Elwig.ico" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="call fetch-resources.bat" />
   </Target>
 
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.2.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.24" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="RazorLight" Version="2.3.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="4.1.68" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -40,7 +40,6 @@ namespace Elwig.Helpers {
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
-        public DbSet<DeliveryPartAttr> DeliveryPartAttributes { get; private set; }
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
@@ -53,6 +52,10 @@ namespace Elwig.Helpers {
 
         public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
 
+        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();
+
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
                 try {
@@ -162,28 +165,6 @@ namespace Elwig.Helpers {
                 .LastOrDefaultAsync();
         }
 
-        public async Task UpdateDeliveryPartAttributes(DeliveryPart part, IEnumerable<WineAttr> attributes) {
-            foreach (var a in WineAttributes) {
-                var attr = part.PartAttributes.Where(pa => pa.AttrId == a.AttrId).FirstOrDefault();
-                if (attributes.Contains(a)) {
-                    DeliveryPartAttr dpa = attr ?? this.CreateProxy<DeliveryPartAttr>();
-                    dpa.Year = part.Year;
-                    dpa.DId = part.DId;
-                    dpa.DPNr = part.DPNr;
-                    dpa.AttrId = a.AttrId;
-                    if (attr == null) {
-                        await AddAsync(dpa);
-                    } else {
-                        Update(dpa);
-                    }
-                } else {
-                    if (attr != null) {
-                        Remove(attr);
-                    }
-                }
-            }
-        }
-
         public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
@@ -206,26 +187,101 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
-            using var cnx = await ConnectAsync();
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
-
-            var list = new List<(string, string, int, int, int)>();
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
-                var s = await WineVarieties.FindAsync(id[..2]);
-                var attrIds = id[2..];
-                var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
-                var name = (s?.Name ?? "") + (a.Count > 0 ? $" ({string.Join(" / ", a.Select(a => a.Name))})" : "");
-                list.Add((
-                    id, name,
-                    rights.TryGetValue(id, out var v1) ? v1 : 0,
-                    obligations.TryGetValue(id, out var v2) ? v2 : 0,
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
-                ));
+        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, (int, int)>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var vtrgid = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                }
             }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberRightsAndObligations[year] = buckets;
+        }
 
-            return list;
+        private async Task FetchMemberDeliveryBuckets(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, weight FROM v_delivery_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBuckets[year] = buckets;
+        }
+
+        private async Task FetchMemberPaymentBuckets(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, weight FROM v_payment_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberPaymentBuckets[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);
+            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBuckets.ContainsKey(year))
+                await FetchMemberDeliveryBuckets(year, cnx);
+            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberPaymentBuckets.ContainsKey(year))
+                await FetchMemberPaymentBuckets(year, cnx);
+            return _memberPaymentBuckets[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();
+            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx);
+            var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
+            if (ownCnx) await cnx.DisposeAsync();
+
+            var buckets = new Dictionary<string, (string, int, int, int, int)>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
+                var variety = await WineVarieties.FindAsync(id[..2]);
+                var attrIds = id[2..];
+                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
+                buckets[id] = (
+                    name,
+                    rightsAndObligations.GetValueOrDefault(id).Item1,
+                    rightsAndObligations.GetValueOrDefault(id).Item2,
+                    deliveryBuckets.GetValueOrDefault(id),
+                    paymentBuckets.GetValueOrDefault(id)
+                );
+            }
+            return buckets;
         }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -0,0 +1,544 @@
+using Microsoft.Data.Sqlite;
+using System;
+
+namespace Elwig.Helpers {
+    public static class AppDbUpdater {
+
+        public static readonly int RequiredSchemaVersion = 7;
+
+        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_6_To_7
+        };
+
+        private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            cmd.ExecuteNonQuery();
+        }
+
+        private static object? ExecuteScalar(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            return cmd.ExecuteScalar();
+        }
+
+        public static string CheckDb() {
+            using var cnx = AppDbContext.Connect();
+
+            var applId = (long?)ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
+
+            var schemaVers = (long?)ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+            _versionOffset = (int)(schemaVers % 100);
+            if (_versionOffset != 0) {
+                // schema was modified manually/externally
+                // TODO issue warning
+            }
+            UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
+
+            var userVers = (long?)ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var major = userVers >> 24;
+            var minor = (userVers >> 16) & 0xFF;
+            var patch = userVers & 0xFFFF;
+
+            if (App.VersionMajor > major ||
+                (App.VersionMajor == major && App.VersionMinor > minor) ||
+                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch))
+            {
+                long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
+                ExecuteNonQuery(cnx, $"PRAGMA user_version = {vers}");
+            }
+
+            return $"{major}.{minor}.{patch}";
+        }
+
+        private static void UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
+            if (fromVersion == toVersion) {
+                return;
+            } else if (fromVersion > toVersion) {
+                throw new Exception("schema_version of database is too new");
+            } else if (toVersion - 1 > _updaters.Length) {
+                throw new Exception("Unable to update database schema: Updater not implemented");
+            } else if (fromVersion <= 0) {
+                throw new Exception("schema_version of database is invalid");
+            }
+
+            ExecuteNonQuery(cnx, "PRAGMA locking_mode = EXCLUSIVE");
+            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = OFF");
+            ExecuteNonQuery(cnx, "BEGIN EXCLUSIVE");
+            for (int i = fromVersion; i < toVersion; i++) {
+                _updaters[i - 1](cnx);
+            }
+            ExecuteNonQuery(cnx, "PRAGMA foreign_key_check");
+            ExecuteNonQuery(cnx, "COMMIT");
+            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = ON");
+            ExecuteNonQuery(cnx, "VACUUM");
+            ExecuteNonQuery(cnx, $"PRAGMA schema_version = {toVersion * 100 + _versionOffset}");
+        }
+
+        private static void UpdateDbSchema_1_To_2(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment");
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part DROP COLUMN weighing_reason");
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL))");
+        }
+
+        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bin (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+                    binnr    INTEGER NOT NULL,
+
+                    discr    TEXT    NOT NULL,
+                    value    INTEGER NOT NULL,
+
+                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
+                    CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
+                FROM payment_delivery_part
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
+                FROM payment_delivery_part p
+                    JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_1");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_2");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_3");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_4");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_5");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_6");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_7");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_8");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_9");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_1_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_2_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_3_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_4_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_5_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_6_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_7_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_8_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_9_name");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN gebunden INTEGER CHECK (gebunden IN (TRUE, FALSE)) DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT s.*, GROUP_CONCAT(o.modid) AS modifiers
+                FROM (SELECT p.year, p.did, p.dpnr,
+                             d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                             m.mgnr, m.family_name, m.given_name,
+                             p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr,
+                             p.gerebelt, p.gebunden,
+                             p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+                             p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+                             GROUP_CONCAT(a.attrid) AS attributes,
+                             COALESCE(SUM(a.fill_lower_bins), 0) AS attribute_prio,
+                             d.comment, p.comment AS part_comment
+                    FROM delivery_part p
+                        JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                        JOIN member m ON m.mgnr = d.mgnr
+                        LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
+                        LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
+                    GROUP BY p.year, p.did, p.dpnr
+                    ORDER BY p.year, p.did, p.dpnr, a.attrid) s
+                LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
+                GROUP BY s.year, s.lsnr, s.dpnr
+                ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, bin;
+                """);
+
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
+        }
+
+        private static void UpdateDbSchema_3_To_4(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bin AS
+                SELECT s.year, c.mgnr,
+                       c.vtrgid AS bin,
+                       CAST(ROUND(SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS max_kg
+                FROM area_commitment c, season s
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                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, c.vtrgid
+                ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;
+                """);
+        }
+
+        private static void UpdateDbSchema_4_To_5(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE _area_commitment_type (
+                    vtrgid         TEXT NOT NULL CHECK (vtrgid = sortid || COALESCE(attrid, '') || disc),
+                    sortid         TEXT NOT NULL,
+                    attrid         TEXT,
+                    disc           TEXT DEFAULT NULL CHECK (disc REGEXP '^[A-Z0-9]+$'),
+
+                    min_kg_per_ha  INTEGER,
+                    max_kg_per_ha  INTEGER,
+                    penalty_amount INTEGER,
+
+                    CONSTRAINT pk_area_commitment_type PRIMARY KEY (vtrgid),
+                    CONSTRAINT sk_area_commitment_type_sort_attr UNIQUE (sortid, attrid, disc),
+                    CONSTRAINT fk_area_commitment_type_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
+                        ON UPDATE CASCADE
+                        ON DELETE RESTRICT,
+                    CONSTRAINT fk_area_commitment_type_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
+                        ON UPDATE CASCADE
+                        ON DELETE RESTRICT
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO _area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
+                SELECT vtrgid, sortid, attrid_1, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount FROM area_commitment_type
+                """);
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
+            ExecuteNonQuery(cnx, "DROP TABLE area_commitment_type");
+            ExecuteNonQuery(cnx, "ALTER TABLE _area_commitment_type RENAME TO area_commitment_type");
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
+
+            ExecuteNonQuery(cnx, """
+            ALTER TABLE delivery_part ADD COLUMN attrid TEXT DEFAULT NULL
+                REFERENCES wine_attribute (attrid)
+                    ON UPDATE CASCADE
+                    ON DELETE RESTRICT
+            """);
+            ExecuteNonQuery(cnx, """
+                UPDATE delivery_part
+                SET attrid = (SELECT attrid
+                              FROM delivery_part_attribute a
+                              WHERE (delivery_part.year, delivery_part.did, delivery_part.dpnr) = (a.year, a.did, a.dpnr)
+                              ORDER BY attrid DESC
+                              LIMIT 1)
+                """);
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_i_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_u_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_d_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_attribute");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT p.year, p.did, p.dpnr,
+                       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                       m.mgnr, m.family_name, m.given_name,
+                       p.sortid, a.attrid,
+                       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
+                       p.hkid, p.kgnr, p.rdnr,
+                       p.gerebelt, p.gebunden,
+                       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+                       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+                       COALESCE(a.fill_lower_bins, 0) AS attribute_prio,
+                       GROUP_CONCAT(o.modid) AS modifiers,
+                       d.comment, p.comment AS part_comment
+                FROM delivery_part p
+                    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                    JOIN member m ON m.mgnr = d.mgnr
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+                GROUP BY p.year, p.did, p.dpnr
+                ORDER BY p.year, p.did, p.dpnr, o.modid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_stat_attr");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_stat_attr AS
+                SELECT year, attrid,
+                       SUM(weight) as sum,
+                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+                       COUNT(DISTINCT did) AS lieferungen,
+                       COUNT(DISTINCT mgnr) AS mitglieder
+                FROM v_delivery
+                GROUP BY year, attrid
+                ORDER BY year, attrid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_stat_sort_attr");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_stat_sort_attr AS
+                SELECT year, sortid, attrid,
+                       SUM(weight) as sum,
+                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+                       COUNT(DISTINCT did) AS lieferungen,
+                       COUNT(DISTINCT mgnr) AS mitglieder
+                FROM v_delivery
+                GROUP BY year, sortid, attrid
+                ORDER BY year, sortid, attrid;
+                """);
+        }
+
+        private static void UpdateDbSchema_5_To_6(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW IF EXISTS v_area_commitment");
+
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute DROP COLUMN fill_lower_bins");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN strict INTEGER NOT NULL CHECK (strict IN (TRUE, FALSE)) DEFAULT FALSE");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower INTEGER NOT NULL CHECK (fill_lower IN (0, 1, 2)) DEFAULT 0");
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT p.year, p.did, p.dpnr,
+                       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                       m.mgnr, m.family_name, m.given_name,
+                       p.sortid, a.attrid,
+                       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
+                       p.hkid, p.kgnr, p.rdnr,
+                       p.gerebelt, p.gebunden,
+                       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+                       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+                       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
+                       GROUP_CONCAT(o.modid) AS modifiers,
+                       d.comment, p.comment AS part_comment
+                FROM delivery_part p
+                    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                    JOIN member m ON m.mgnr = d.mgnr
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+                GROUP BY p.year, p.did, p.dpnr
+                ORDER BY p.year, p.did, p.dpnr, o.modid;
+                """);
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bin");
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
+            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type DROP COLUMN max_kg_per_ha");
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_none INTEGER DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_cultivation ADD COLUMN description TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE member ADD COLUMN organic INTEGER NOT NULL CHECK (organic IN (TRUE, FALSE)) DEFAULT FALSE");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_ha INTEGER NOT NULL DEFAULT 10000");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_normal REAL NOT NULL DEFAULT 0.10");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_flatrate REAL NOT NULL DEFAULT 0.13");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN min_kg_per_bs INTEGER NOT NULL DEFAULT 750");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_bs INTEGER NOT NULL DEFAULT 3000");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_amount INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_none INTEGER DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "DELETE FROM client_parameter WHERE param IN ('DELIVERY_RIGHT', 'DELIVERY_OBLIGATION', 'VAT_NORMAL', 'VAT_REDUCED', 'VAT_FLATRATE')");
+
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bucket (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+                    bktnr    INTEGER NOT NULL,
+
+                    discr    TEXT    NOT NULL,
+                    value    INTEGER NOT NULL,
+
+                    CONSTRAINT pk_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr),
+                    CONSTRAINT fk_delivery_part_bucket_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                SELECT year, did, dpnr, binnr, discr, value
+                FROM delivery_part_bin
+                """);
+            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_bin");
+
+            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,
+                       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_area_commitment_bucket AS
+                SELECT year, mgnr, bucket, min_kg, max_kg
+                FROM v_area_commitment_bucket_strict
+                WHERE attrid IS NOT NULL
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.min_kg) AS min_kg,
+                       SUM(b.upper_max_kg) AS max_kg
+                FROM v_area_commitment_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE a.strict IS NULL OR a.strict = FALSE
+                GROUP BY b.year, b.mgnr, b.sortid
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bucket_strict AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bucket,
+                       sortid, IIF(min_quw, attrid, NULL) AS attrid,
+                       SUM(weight) AS weight,
+                       min_quw
+                FROM v_delivery
+                GROUP BY year, mgnr, bucket
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bucket AS
+                SELECT year, mgnr, bucket, weight
+                FROM v_delivery_bucket_strict
+                WHERE attrid IS NOT NULL OR NOT min_quw
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.weight) AS weight
+                FROM v_delivery_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE min_quw AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY b.year, b.mgnr, b.sortid
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bucket_strict AS
+                SELECT d.year, d.mgnr,
+                       d.sortid || b.discr AS bucket,
+                       d.sortid, IIF(b.discr IN ('', '_'), NULL, b.discr) AS attrid,
+                       SUM(b.value) AS weight,
+                       b.discr != '_' AS gebunden
+                FROM v_delivery d
+                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bucket
+                HAVING SUM(b.value) > 0
+                ORDER BY d.year, d.mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bucket AS
+                SELECT year, mgnr, bucket, weight
+                FROM v_payment_bucket_strict
+                WHERE attrid IS NOT NULL OR NOT gebunden
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.weight) AS weight
+                FROM v_payment_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE gebunden AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY b.year, b.mgnr, b.sortid
+                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;
+                """);
+        }
+    }
+}

Elwig/Helpers/Billing/Billing.cs

@@ -1,4 +1,5 @@
 using Microsoft.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,125 +7,206 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class Billing {
 
-        private readonly int Year;
-        private readonly int AvNr;
-        private readonly AppDbContext Context;
-        private readonly Dictionary<string, string> Attributes;
-        private readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        private readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
+        protected readonly int Year;
+        protected readonly AppDbContext Context;
+        protected readonly Dictionary<string, string> Attributes;
+        protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
+        protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes;
 
-        public Billing(int year, int avnr) {
+        public Billing(int year) {
             Year = year;
-            AvNr = avnr;
             Context = new AppDbContext();
             Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
             Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
-            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId1, v.AttrId2, v.Discriminator, v.MinKgPerHa, v.MaxKgPerHa, v.PenaltyAmount));
+            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
         }
 
-        protected async Task DeleteInDb() {
+        public async Task FinishSeason() {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
-                await cmd.ExecuteNonQueryAsync();
-            }
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
-                await cmd.ExecuteNonQueryAsync();
-            }
-        }
-
-        public async Task Calculate() {
-            await DeleteInDb();
-            var tasks = new List<Task>();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMember(mgnr)));
-            }
-            await Task.WhenAll(tasks);
-        }
-
-        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(int mgnr, int year, SqliteConnection cnx) {
-            var rights = new Dictionary<string, int>();
-            var obligations = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT t.vtrgid,
-                       SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000 AS min_kg,
-                       SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000 AS max_kg
-                FROM area_commitment c
-                JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                WHERE mgnr = {mgnr} AND (year_from IS NULL OR year_from <= {year}) AND (year_to IS NULL OR year_to >= {year})
-                GROUP BY t.vtrgid
-                ORDER BY LENGTH(t.vtrgid) DESC, t.vtrgid
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var vtrgid = reader.GetString(0);
-                obligations[vtrgid] = reader.GetInt32(1);
-                rights[vtrgid] = reader.GetInt32(2);
-            }
-
-            return (rights, obligations);
-        }
-
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
-            var buckets = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT bucket, weight
-                FROM v_bucket
-                WHERE (year, mgnr) = ({year}, {mgnr})
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var bucket = reader.GetString(0);
-                buckets[bucket] = reader.GetInt32(1);
-            }
-
-            return buckets;
-        }
-
-        protected async Task CalculateMember(int mgnr) {
-            using var cnx = await AppDbContext.ConnectAsync();
-            var (rights, obligations) = await GetMemberRightsObligations(mgnr, Year, cnx);
-
-            var deliveries = new List<(int, int, string, int, double, string, string[], string[])>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers
-                    FROM v_delivery
-                    WHERE (year, mgnr) = ({Year}, {mgnr})
-                    ORDER BY kmw DESC, weight DESC, did, dpnr
+                    UPDATE season
+                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
+                    WHERE year = {Year}
                     """;
-                var reader = await cmd.ExecuteReaderAsync();
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM delivery_part_bucket WHERE year = {Year}";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
+            var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
+            using var cnx = await AppDbContext.ConnectAsync();
+            await Context.GetMemberRightsAndObligations(Year, 0, cnx);
+            var inserts = new List<(int, int, int, string, int)>();
+
+            var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden
+                    FROM v_delivery
+                    WHERE year = {Year}
+                    ORDER BY mgnr, sortid, abgewertet ASC, {(honorGebunden ? "gebunden IS NOT NULL DESC, gebunden DESC," : "")}
+                             attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, lsnr, dpnr
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     deliveries.Add((
-                        reader.GetInt32(0), reader.GetInt32(1), reader.GetString(2), reader.GetInt32(3),
-                        reader.GetDouble(4), reader.GetString(5), reader.GetString(6).Split(","), reader.GetString(7).Split(",")
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4),
+                        reader.GetDouble(5), reader.GetString(6),
+                        reader.IsDBNull(7) ? null : reader.GetString(7),
+                        reader.IsDBNull(8) ? Array.Empty<string>() : reader.GetString(8).Split(",").Order().ToArray(),
+                        reader.IsDBNull(9) ? null : reader.GetBoolean(9)
                     ));
                 }
             }
 
-            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
-                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
+            int lastMgNr = 0;
+            Dictionary<string, (int, int)>? rightsAndObligations = null;
+            Dictionary<string, int> used = new();
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
+                    used = new();
+                }
+                if ((honorGebunden && gebunden == false) ||
+                    rightsAndObligations == null || rightsAndObligations.Count == 0 ||
+                    qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
+                {
+                    // Explizit als ungebunden markiert,
+                    // Mitglied hat keine Flächenbindungen, oder
                     // Nicht mindestens Qualitätswein (QUW)
-                    using var cmd = cnx.CreateCommand();
-                    // TODO
-                    cmd.CommandText = $"""
-                        INSERT INTO payment_delivery_part (year, did, dpnr, avnr, mod_abs, mod_rel, )
-                        VALUES ({Year}, {did}, {dpnr}, {AvNr}, )
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
+                    // -> ungebunden
+                    inserts.Add((did, dpnr, 0, "_", weight));
                     continue;
                 }
 
-                // TODO
+                int w = weight;
+                var attributes = attrid == null ? Array.Empty<string>() : new string[] { attrid };
+                var isStrict = attrid != null && attrVals[attrid].IsStrict;
+                foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rightsAndObligations.ContainsKey(key)) {
+                        int i = (c == 0) ? 1 : 2;
+                        var u = used.GetValueOrDefault(key, 0);
+                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Item1 - u, w));
+                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Item2 - u, w));
+                        var v = (attributes.Length == c || attributes.Select(a => !attrVals[a].IsStrict ? 2 : attrVals[a].FillLower).Min() == 2) ? vr : vo;
+                        used[key] = u + v;
+                        if (key.Length > 2 && !isStrict) used[key[..2]] = used.GetValueOrDefault(key[..2], 0) + v;
+                        inserts.Add((did, dpnr, i, key[2..], v));
+                        w -= v;
+                    }
+                    if (w == 0 || (!allowAttrsIntoLower && isStrict)) break;
+                }
+                inserts.Add((did, dpnr, 0, "_", w));
+                lastMgNr = mgnr;
             }
 
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                    ON CONFLICT DO UPDATE
+                    SET discr = excluded.discr, value = value + excluded.value
+                    """;
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            if (!avoidUnderDeliveries)
+                return;
+
+            // FIXME avoidUnderDelivery-calculations not always right!
+
+            var underDeliveries = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 2 AND diff < 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    underDeliveries[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            var fittingBuckets = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 3 AND diff > 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    fittingBuckets[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            foreach (var item in fittingBuckets) {
+                var mgnr = item.Key.Item1;
+                var id = item.Key.Item2[..2];
+                var attr = item.Key.Item2[2..];
+                var available = item.Value;
+                var needed = -underDeliveries.GetValueOrDefault((mgnr, id), 0);
+                if (needed <= 0) continue;
+
+                var fittingDeliveries = new List<(int, int, int, int)>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        SELECT d.did, d.dpnr, d.weight, b.value
+                        FROM v_delivery d
+                            JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}'
+                        WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attrid = '{attr}'
+                        ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC
+                        """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        fittingDeliveries.Add((
+                            reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3)
+                        ));
+                    }
+                }
+
+                var negChanges = new List<(int, int, int, int)>();
+                var posChanges = new List<(int, int, int, int)>();
+                foreach (var (did, dpnr, _, w) in fittingDeliveries) {
+                    int v = Math.Min(needed, w);
+                    needed -= v;
+                    posChanges.Add((did, dpnr, 1, v));
+                    negChanges.Add((did, dpnr, 2, w - v));
+                    if (needed == 0) break;
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                        VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = value + excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                        VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+            }
         }
     }
 }

Elwig/Helpers/Billing/BillingVariant.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingVariant : Billing {
+
+        private readonly int AvNr;
+
+        public BillingVariant(int year, int avnr) : base(year) {
+            AvNr = avnr;
+        }
+
+        protected async Task DeleteInDb() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        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)));
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        protected async Task CalculateMemberPrices(int mgnr) {
+
+        }
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -15,11 +15,22 @@ namespace Elwig.Helpers {
         public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
         public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
 
+        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
+        public bool HasRebler() => HasRebler(App.ZwstId);
+        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
+        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
+        public bool HasKisten() => HasKisten(App.ZwstId);
+
         public string NameToken;
         public string NameShort;
         public string Name;
         public string? NameSuffix;
         public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;
 
@@ -45,13 +56,10 @@ namespace Elwig.Helpers {
         public string? EmailAddress;
         public string? Website;
 
-        public int DeliveryObligation;
-        public int DeliveryRight;
-        public decimal VatNormal;
-        public decimal VatReduced;
-        public decimal VatFlatRate;
+        public int ModeDeliveryNoteStats;
 
         public string? TextDeliveryNote;
+        public string? TextDeliveryConfirmation;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -79,20 +87,31 @@ namespace Elwig.Helpers {
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
 
-                DeliveryObligation = int.Parse(parameters["DELIVERY_OBLIGATION"] ?? "");
-                DeliveryRight = int.Parse(parameters["DELIVERY_RIGHT"] ?? "");
-                VatNormal = decimal.Parse((parameters["VAT_NORMAL"] ?? "").Replace(".", ","));
-                VatReduced = decimal.Parse((parameters["VAT_REDUCED"] ?? "").Replace(".", ","));
-                VatFlatRate = decimal.Parse((parameters["VAT_FLATRATE"] ?? "").Replace(".", ","));
+                switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
+                    case "NONE": ModeDeliveryNoteStats = 0; break;
+                    case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
+                    case "SHORT": ModeDeliveryNoteStats = 2; break;
+                    case "FULL": ModeDeliveryNoteStats = 3; break;
+                }
 
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+                if (TextDeliveryNote == "") TextDeliveryNote = null;
+                TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
+                if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
             } catch {
                 throw new KeyNotFoundException();
             }
         }
 
         private IEnumerable<(string, string?)> GetParamValues() {
+            string deliveryNoteStats = "SHORT";
+            switch (ModeDeliveryNoteStats) {
+                case 0: deliveryNoteStats = "NONE"; break;
+                case 1: deliveryNoteStats = "GA_ONLY"; break;
+                case 2: deliveryNoteStats = "SHORT"; break;
+                case 3: deliveryNoteStats = "FULL"; break;
+            }
             return new (string, string?)[] {
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -110,13 +129,10 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
-                ("DELIVERY_OBLIGATION", DeliveryObligation.ToString()),
-                ("DELIVERY_RIGHT", DeliveryRight.ToString()),
-                ("VAT_NORMAL", VatNormal.ToString().Replace(",", ".")),
-                ("VAT_REDUCED", VatReduced.ToString().Replace(",", ".")),
-                ("VAT_FLATRATE", VatFlatRate.ToString().Replace(",", ".")),
+                ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+                ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
             };
         }
 

Elwig/Helpers/Config.cs

@@ -8,6 +8,7 @@ namespace Elwig.Helpers {
     public class Config {
 
         private readonly string FileName;
+        public bool Debug;
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
@@ -49,6 +50,13 @@ namespace Elwig.Helpers {
                 Branch = branch;
             }
 
+            if (ini == null || !ini.TryGetKey("general.debug", out string debug)) {
+                Debug = false;
+            } else {
+                debug = debug.ToLower();
+                Debug = debug == "1" || debug == "true" || debug == "yes" || debug == "on";
+            }
+
             ScaleList.Clear();
             Scales = ScaleList;
             if (ini != null) {
@@ -72,6 +80,7 @@ namespace Elwig.Helpers {
             using var file = new StreamWriter(FileName, false, Utils.UTF8);
             file.Write($"\r\n[general]\r\n");
             if (Branch != null) file.Write($"branch = {Branch}\r\n");
+            if (Debug) file.Write("debug = true\r\n");
             file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n");
             if (DatabaseLog != null) file.Write($"log = {DatabaseLog}\r\n");
             foreach (var s in ScaleList) {

Elwig/Helpers/ControlUtils.cs

@@ -58,7 +58,8 @@ namespace Elwig.Helpers {
                     continue;
                 } else if (child is T t) {
                     yield return t;
-                } else if (child is DependencyObject childDepOpj) {
+                }
+                if (child is DependencyObject childDepOpj) {
                     foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) {
                         yield return childOfChild;
                     }

Elwig/Helpers/NullItem.cs

@@ -1,5 +1,14 @@
 namespace Elwig.Helpers {
     public class NullItem {
-        public static string Name => "- Keine Angabe -";
+
+        public string Name { get; private set; }
+
+        public NullItem(string name = "- Keine Angabe -") {
+            Name = name;
+        }
+
+        public override string ToString() {
+            return Name;
+        }
     }
 }

Elwig/Helpers/Printing/Html.cs

@@ -2,7 +2,7 @@ using RazorLight;
 using System;
 using System.Threading.Tasks;
 
-namespace Elwig.Documents {
+namespace Elwig.Helpers.Printing {
     public static class Html {
 
         private static RazorLightEngine? Engine = null;
@@ -19,6 +19,9 @@ namespace Elwig.Documents {
             await e.CompileTemplateAsync("BusinessLetter");
             await e.CompileTemplateAsync("DeliveryNote");
             await e.CompileTemplateAsync("CreditNote");
+            await e.CompileTemplateAsync("DeliveryJournal");
+            await e.CompileTemplateAsync("Letterhead");
+            await e.CompileTemplateAsync("DeliveryConfirmation");
 
             Engine = e;
             evtHandler();

Elwig/Helpers/Printing/Pdf.cs

@@ -0,0 +1,85 @@
+using System.Threading.Tasks;
+using Elwig.Windows;
+using System.Diagnostics;
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Windows;
+using System.Text.RegularExpressions;
+using System.Linq;
+
+namespace Elwig.Helpers.Printing {
+    public static class Pdf {
+
+        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
+        private static readonly string WinziPrint = App.ExePath + "WinziPrint.exe";
+        private static Process? WinziPrintProc;
+        public static bool IsReady => WinziPrintProc != null;
+
+
+        public static async Task Init(Action evtHandler) {
+            var p = new Process() { StartInfo = new() {
+                FileName = WinziPrint,
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                RedirectStandardInput = true,
+                RedirectStandardOutput = true
+            } };
+            p.StartInfo.ArgumentList.Add("-p");
+            p.StartInfo.ArgumentList.Add("-e");
+            p.StartInfo.ArgumentList.Add("utf-8");
+            p.StartInfo.ArgumentList.Add("-d");
+            p.StartInfo.ArgumentList.Add(App.TempPath);
+            p.StartInfo.ArgumentList.Add("-");
+            p.Start();
+            WinziPrintProc = p;
+            evtHandler();
+        }
+
+        public static async Task<IEnumerable<int>> Convert(string htmlPath, string pdfPath, bool doubleSided = false, IProgress<double>? progress = null) {
+            return await Convert(new string[] { htmlPath }, pdfPath, doubleSided, progress);
+        }
+
+        public static async Task<IEnumerable<int>> Convert(IEnumerable<string> htmlPath, string pdfPath, bool doubleSided = false, IProgress<double>? progress = null) {
+            if (WinziPrintProc == null) throw new InvalidOperationException("The WinziPrint process has not been initialized yet");
+            progress?.Report(0.0);
+            await WinziPrintProc.StandardInput.WriteLineAsync((doubleSided ? "-2;" : "") + $"{string.Join(';', htmlPath)};{pdfPath}");
+            while (true) {
+                var line = await WinziPrintProc.StandardOutput.ReadLineAsync() ?? throw new IOException("Invalid response from WinziPrint");
+                if (line.StartsWith("error:")) {
+                    MessageBox.Show(line[6..].Trim(), "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    return Array.Empty<int>();
+                } else if (line.StartsWith("progress:")) {
+                    var parts = line[9..].Trim().Split('/').Select(int.Parse).ToArray();
+                    progress?.Report(100.0 * parts[0] / parts[1]);
+                } else if (line.StartsWith("success:")) {
+                    var m = Regex.Match(line, @"\(([0-9, ]+)\)");
+                    return m.Groups[1].Value.Split(", ").Select(int.Parse);
+                }
+            }
+        }
+
+        public static void Show(TempFile file, string title) {
+            App.MainDispatcher.BeginInvoke(() => {
+                var w = new DocumentViewerWindow(title, file);
+                w.Show();
+            });
+        }
+
+        public static void Show(string path, string title) {
+            App.MainDispatcher.BeginInvoke(() => {
+                var w = new DocumentViewerWindow(title, path);
+                w.Show();
+            });
+        }
+
+        public static async Task Print(string path, int copies = 1) {
+            var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
+            p.StartInfo.ArgumentList.Add(path);
+            p.StartInfo.ArgumentList.Add("/s");
+            p.StartInfo.ArgumentList.Add($"copies={copies}");
+            p.Start();
+            await p.WaitForExitAsync();
+        }
+    }
+}

Elwig/Helpers/TempFile.cs

@@ -5,6 +5,7 @@ namespace Elwig.Helpers {
     public sealed class TempFile : IDisposable {
         private int Usages = 0;
         public string FilePath { get; private set; }
+        public string FileName => Path.GetFileName(FilePath);
 
         public TempFile() : this(null) { }
 

Elwig/Helpers/Utils.cs

@@ -24,7 +24,7 @@ namespace Elwig.Helpers {
 
         public static readonly Regex SerialRegex = GeneratedSerialRegex();
         public static readonly Regex TcpRegex = GeneratedTcpRegex();
-        public static readonly Regex PartialDateRegex = GeneratedPartialDateRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
         public static readonly Regex FromToRegex = GeneratedFromToRegex();
         public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
         public static readonly Regex AddressRegex = GeneratedAddressRegex();
@@ -35,8 +35,8 @@ namespace Elwig.Helpers {
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
 
-        [GeneratedRegex(@"^(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.$", RegexOptions.Compiled)]
-        private static partial Regex GeneratedPartialDateRegex();
+        [GeneratedRegex(@"^(-?(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();
@@ -157,8 +157,12 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
+            MailTo(new string[] { emailAddress });
+        }
+
+        public static void MailTo(IEnumerable<string> emailAddresses) {
             Process.Start(new ProcessStartInfo() {
-                FileName = $"mailto:{emailAddress}",
+                FileName = $"mailto:{string.Join(",%20", emailAddresses)}",
                 UseShellExecute = true,
             });
         }
@@ -193,34 +197,33 @@ namespace Elwig.Helpers {
             if (!searchKeywords.Any())
                 return 0;
 
-            return words
-                .Select(w => {
-                    w = w?.ToLower();
-                    var p = w?.ToLower()?.Split(" ");
-                    if (w == null || p == null)
-                        return 0;
-
-                    var t1 = searchKeywords.Where(f => w == f).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t2 = searchKeywords.Where(f => p.Any(a => a == f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t3 = searchKeywords.Where(f => p.Any(a => a.StartsWith(f))).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t4 = searchKeywords.Where(f => w.Contains(f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    if (t1 > 0) {
-                        return 4 + t1;
-                    } else if (t2 > 0) {
-                        return 3 + t2;
-                    } else if (t3 > 0) {
-                        return 2 + t3;
-                    } else if (t4 > 0) {
-                        return 1 + t4;
-                    } else {
-                        return 0;
-                    }
+            return searchKeywords
+                .Select(k => {
+                    k = k.ToLower();
+                    var scores = words.Select(w => {
+                        w = w?.ToLower();
+                        var p = w?.ToLower()?.Split(" ");
+                        if (w == null || p == null) {
+                            return 0;
+                        } else if (k == w) {
+                            return 4 + k.Length;
+                        } else if (p.Any(a => a == k)) {
+                            return 3 + k.Length;
+                        } else if (p.Any(a => a.StartsWith(k))) {
+                            return 2 + k.Length;
+                        } else if (w.Contains(k)) {
+                            return 1 + k.Length;
+                        } else {
+                            return 0;
+                        }
+                    });
+                    return scores.Max() + scores.Count(s => s > 0);
                 })
                 .Sum();
         }
 
-        public static (int, string?)? ShowManualWeighingDialog() {
-            var d = new ManualWeighingDialog();
+        public static (int, string?)? ShowManualWeighingDialog(string? reason = null) {
+            var d = new ManualWeighingDialog(reason);
             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
         }
 
@@ -323,5 +326,20 @@ namespace Elwig.Helpers {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
             }
         }
+
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
+            HashSet<IEnumerable<T>> output = new();
+            for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
+                List<T> t = new();
+                for (int j = 0; j < 30; j++) {
+                    var e = input.ElementAtOrDefault(j);
+                    if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
+                        t.Add(e);
+                    }
+                }
+                output.Add(t);
+            }
+            return output.OrderByDescending(l => l.Count());
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -63,16 +63,18 @@ 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 (v2 == -1 && v1 < maxLen) {
+                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 && v2 < maxDecimal) {
+                    } else if (v2 != -1 && (maxDecimal == -1 || v2 < maxDecimal)) {
                         text += ch; v2++;
                     }
                 } else if (v2 == 0-1 && ch == ',' || ch == '.') {
@@ -521,6 +523,36 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckTime(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            int v = 0;
+            for (int i = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (v >= 0 && v < 5 && v != 2 && char.IsAsciiDigit(ch)) {
+                    if ((v == 0 && ch <= '2') || (v == 1 && (text[0] < '2' || ch <= '3')) || (v == 3 && ch <= '5') || v == 4) {
+                        text += ch;
+                        v++;
+                    }
+                } else if (v == 2 && ch == ':') {
+                    text += ch;
+                    v++;
+                }
+                if (i == input.CaretIndex - 1)
+                    pos = text.Length;
+            }
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "Wert ist nicht optional") : new(true, null);
+            } else if (v != 5) {
+                return new(false, "Zeit ist ungültig");
+            } else {
+                return new(true, null);
+            }
+        }
+
         public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {

Elwig/Models/AT_PlzDest.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]

Elwig/Models/AreaCom.cs

@@ -1,5 +1,9 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 namespace Elwig.Models {
     [Table("area_commitment"), PrimaryKey("FbNr")]
@@ -51,5 +55,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/AreaComType.cs

@@ -1,9 +1,10 @@
 using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]
+    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
     public class AreaComType {
         [Column("vtrgid")]
         public string VtrgId { get; set; }
@@ -11,11 +12,8 @@ namespace Elwig.Models {
         [Column("sortid")]
         public string SortId { get; set; }
 
-        [Column("attrid_1")]
-        public string? AttrId1 { get; set; }
-
-        [Column("attrid_2")]
-        public string? AttrId2 { get; set; }
+        [Column("attrid")]
+        public string? AttrId { get; set; }
 
         [Column("disc")]
         public string? Discriminator { get; set; }
@@ -23,29 +21,37 @@ namespace Elwig.Models {
         [Column("min_kg_per_ha")]
         public int? MinKgPerHa { get; set; }
 
-        [Column("max_kg_per_ha")]
-        public int? MaxKgPerHa { get; set; }
+        [Column("penalty_per_kg")]
+        public long? PenaltyPerKgValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerKg {
+            get => PenaltyPerKgValue != null ? Utils.DecFromDb(PenaltyPerKgValue.Value, 4) : null;
+            set => PenaltyPerKgValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
 
         [Column("penalty_amount")]
         public long? PenaltyAmoutValue { get; set; }
-
         [NotMapped]
         public decimal? PenaltyAmount {
             get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
             set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
         }
 
+        [Column("penalty_none")]
+        public long? PenaltyNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyNone {
+            get => PenaltyNoneValue != null ? Utils.DecFromDb(PenaltyNoneValue.Value, 4) : null;
+            set => PenaltyNoneValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
+
         [ForeignKey("SortId")]
         public virtual WineVar WineVar { get; private set; }
 
-        [ForeignKey("AttrId1")]
-        public virtual WineAttr? WineAttr1 { get; private set; }
-
-        [ForeignKey("AttrId2")]
-        public virtual WineAttr? WineAttr2 { get; private set; }
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? WineAttr { get; private set; }
 
         [NotMapped]
-        public string DisplayName => WineVar.Name + (WineAttr1 != null ? $" {WineAttr1.Name}" : "") +
-            (WineAttr2 != null ? $" {WineAttr2.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
+        public string DisplayName => WineVar.Name + (WineAttr != null ? $" {WineAttr.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
     }
 }

Elwig/Models/Branch.cs

@@ -1,9 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("branch"), PrimaryKey("ZwstId")]
+    [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]
         public string ZwstId { get; set; }

Elwig/Models/Country.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]

Elwig/Models/Credit.cs

@@ -2,6 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]

Elwig/Models/Delivery.cs

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

Elwig/Models/DeliveryPart.cs

@@ -25,6 +25,12 @@ namespace Elwig.Models {
         [ForeignKey("SortId")]
         public virtual WineVar Variant { get; private set; }
 
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
         [Column("weight")]
         public int Weight { get; set; }
 
@@ -75,6 +81,9 @@ namespace Elwig.Models {
         [Column("lesewagen")]
         public bool? IsLesewagen { get; set; }
 
+        [Column("gebunden")]
+        public bool? IsGebunden { get; set; }
+
         [Column("temperature")]
         public double? Temperature { get; set; }
 
@@ -87,15 +96,12 @@ namespace Elwig.Models {
         [Column("weighing_id")]
         public string? WeighingId { get; set; }
 
+        [Column("weighing_reason")]
+        public string? WeighingReason { get; set; }
+
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartAttr> PartAttributes { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
-
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
@@ -107,5 +113,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
+
+        [InverseProperty("Part")]
+        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
     }
 }

Elwig/Models/DeliveryPartBucket.cs

@@ -2,8 +2,8 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models {
-    [Table("delivery_part_attribute"), PrimaryKey("Year", "DId", "DPNr", "AttrId")]
-    public class DeliveryPartAttr {
+    [Table("delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr")]
+    public class DeliveryPartBucket {
         [Column("year")]
         public int Year { get; set; }
 
@@ -13,13 +13,16 @@ namespace Elwig.Models {
         [Column("dpnr")]
         public int DPNr { get; set; }
 
+        [Column("bktnr")]
+        public int BktNr { get; set; }
+
+        [Column("discr")]
+        public string Discr { get; set; }
+
+        [Column("value")]
+        public int Value { get; set; }
+
         [ForeignKey("Year, DId, DPNr")]
         public virtual DeliveryPart Part { get; private set; }
-
-        [Column("attrid")]
-        public string AttrId { get; set; }
-
-        [ForeignKey("AttrId")]
-        public virtual WineAttr Attr { get; private set; }
     }
 }

Elwig/Models/Member.cs

@@ -104,6 +104,9 @@ namespace Elwig.Models {
         [Column("buchführend")]
         public bool IsBuchführend { get; set; }
 
+        [Column("organic")]
+        public bool IsOrganic { get; set; }
+
         [Column("funktionär")]
         public bool IsFunktionär { get; set; }
 
@@ -128,9 +131,6 @@ namespace Elwig.Models {
         [Column("address")]
         public string Address { get; set; }
 
-        [Column("email")]
-        public string? Email { get; set; }
-
         [Column("default_kgnr")]
         public int? DefaultKgNr { get; set; }
 
@@ -174,10 +174,10 @@ namespace Elwig.Models {
         [InverseProperty("Member")]
         public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; }
 
-        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
+        [InverseProperty("member")]
+        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; }
 
-        public int DeliveryRight => BusinessShares * App.Client.DeliveryRight;
-        public int DeliveryObligation => BusinessShares * App.Client.DeliveryObligation;
+        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
 
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {

Elwig/Models/MemberEmailAddr.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("member_email_address"), PrimaryKey("MgNr", "Nr")]
+    public class MemberEmailAddr {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("nr")]
+        public int Nr { get; set; }
+
+        [Column("address")]
+        public string Address { get; set; }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; }
+    }
+}

Elwig/Models/PaymentDeliveryPart.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models {
     [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
@@ -34,109 +32,6 @@ namespace Elwig.Models {
             set => ModRelValue = (double)value;
         }
 
-        [Column("bucket_1")]
-        public int? Bucket1 { get; set; }
-
-        [Column("bucket_2")]
-        public int? Bucket2 { get; set; }
-
-        [Column("bucket_3")]
-        public int? Bucket3 { get; set; }
-
-        [Column("bucket_4")]
-        public int? Bucket4 { get; set; }
-
-        [Column("bucket_5")]
-        public int? Bucket5 { get; set; }
-
-        [Column("bucket_6")]
-        public int? Bucket6 { get; set; }
-
-        [Column("bucket_7")]
-        public int? Bucket7 { get; set; }
-
-        [Column("bucket_8")]
-        public int? Bucket8 { get; set; }
-
-        [Column("bucket_9")]
-        public int? Bucket9 { get; set; }
-
-        [NotMapped]
-        public int[] Buckets => (new int?[] { Bucket1, Bucket2, Bucket3, Bucket4, Bucket5, Bucket6, Bucket7, Bucket8, Bucket9 })
-            .Where(b => b != null).Select(b => b.Value).ToArray();
-
-        [Column("price_1")]
-        public long? Price1Value { get; set; }
-        [NotMapped]
-        public decimal? Price1 {
-            get => Price1Value != null ? Variant.Season.DecFromDb(Price1Value.Value) : null;
-            set => Price1Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-        }
-
-        [Column("price_2")]
-        public long? Price2Value { get; set; }
-        [NotMapped]
-        public decimal? Price2 {
-			get => Price2Value != null ? Variant.Season.DecFromDb(Price2Value.Value) : null;
-			set => Price2Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_3")]
-        public long? Price3Value { get; set; }
-        [NotMapped]
-        public decimal? Price3 {
-			get => Price3Value != null ? Variant.Season.DecFromDb(Price3Value.Value) : null;
-			set => Price3Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_4")]
-        public long? Price4Value { get; set; }
-        [NotMapped]
-        public decimal? Price4 {
-			get => Price4Value != null ? Variant.Season.DecFromDb(Price4Value.Value) : null;
-			set => Price4Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_5")]
-        public long? Price5Value { get; set; }
-        [NotMapped]
-        public decimal? Price5 {
-			get => Price5Value != null ? Variant.Season.DecFromDb(Price5Value.Value) : null;
-			set => Price5Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_6")]
-        public long? Price6Value { get; set; }
-        [NotMapped]
-        public decimal? Price6 {
-			get => Price6Value != null ? Variant.Season.DecFromDb(Price6Value.Value) : null;
-			set => Price6Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_7")]
-        public long? Price7Value { get; set; }
-        [NotMapped]
-        public decimal? Price7 {
-			get => Price7Value != null ? Variant.Season.DecFromDb(Price7Value.Value) : null;
-			set => Price7Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_8")]
-        public long? Price8Value { get; set; }
-        [NotMapped]
-        public decimal? Price8 {
-			get => Price8Value != null ? Variant.Season.DecFromDb(Price8Value.Value) : null;
-			set => Price8Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_9")]
-        public long? Price9Value { get; set; }
-        [NotMapped]
-        public decimal? Price9 {
-			get => Price9Value != null ? Variant.Season.DecFromDb(Price9Value.Value) : null;
-			set => Price9Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
         [Column("amount")]
         public long? AmountValue { get; set; }
         [NotMapped]
@@ -145,10 +40,6 @@ namespace Elwig.Models {
             set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
         }
 
-        [NotMapped]
-        public decimal[] Prices => (new decimal?[] { Price1, Price2, Price3, Price4, Price5, Price6, Price7, Price8, Price9 })
-            .Where(p => p != null).Select(p => p.Value).ToArray();
-
         [ForeignKey("Year, AvNr")]
         public virtual PaymentVar Variant { get; private set; }
 

Elwig/Models/PaymentDeliveryPartBucket.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("payment_delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr", "AvNr")]
+    public class PaymentDeliveryPartBucket {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("bktnr")]
+        public int BktNr { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("price")]
+        public long PriceValue { get; set; }
+        [NotMapped]
+        public decimal Price {
+            get => Variant.Season.DecFromDb(PriceValue);
+            set => PriceValue = Variant.Season.DecToDb(value);
+        }
+
+        [Column("amount")]
+        public long AmountValue { get; set; }
+        [NotMapped]
+        public decimal Amount {
+            get => Variant.Season.DecFromDb(AmountValue);
+            set => AmountValue = Variant.Season.DecToDb(value);
+        }
+
+        [ForeignKey("Year, AvNr")]
+        public virtual PaymentVar Variant { get; private set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart DeliveryPart { get; private set; }
+    }
+}

Elwig/Models/PaymentVar.cs

@@ -40,37 +40,6 @@ namespace Elwig.Models {
         [Column("calc_time")]
         public int? CalcTime { get; set; }
 
-        [Column("bucket_1_name")]
-        public string? Bucket1Name { get; set; }
-
-        [Column("bucket_2_name")]
-        public string? Bucket2Name { get; set; }
-
-        [Column("bucket_3_name")]
-        public string? Bucket3Name { get; set; }
-
-        [Column("bucket_4_name")]
-        public string? Bucket4Name { get; set; }
-
-        [Column("bucket_5_name")]
-        public string? Bucket5Name { get; set; }
-
-        [Column("bucket_6_name")]
-        public string? Bucket6Name { get; set; }
-
-        [Column("bucket_7_name")]
-        public string? Bucket7Name { get; set; }
-
-        [Column("bucket_8_name")]
-        public string? Bucket8Name { get; set; }
-
-        [Column("bucket_9_name")]
-        public string? Bucket9Name { get; set; }
-
-        [NotMapped]
-        public string[] BucketNames => (new string?[] { Bucket1Name, Bucket2Name, Bucket3Name, Bucket4Name, Bucket5Name, Bucket6Name, Bucket7Name, Bucket8Name, Bucket9Name })
-			.Where(n => n != null).Select(n => n ?? "").ToArray();
-
         [Column("comment")]
         public string? Comment { get; set; }
 

Elwig/Models/Season.cs

@@ -16,17 +16,52 @@ namespace Elwig.Models {
         [Column("precision")]
         public byte Precision { get; set; }
 
+        [Column("max_kg_per_ha")]
+        public int MaxKgPerHa { get; set; }
+
+        [Column("vat_normal")]
+        public double VatNormal { get; set; }
+
+        [Column("vat_flatrate")]
+        public double VatFlatrate { get; set; }
+
+        [Column("min_kg_per_bs")]
+        public int MinKgPerBusinessShare { get; set; }
+
+        [Column("max_kg_per_bs")]
+        public int MaxKgPerBusinessShare { get; set; }
+
+        [Column("penalty_per_kg")]
+        public long? PenaltyPerKgValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerKg {
+            get => PenaltyPerKgValue != null ? DecFromDb(PenaltyPerKgValue.Value) : null;
+            set => PenaltyPerKgValue = value != null ? DecToDb(value.Value) : null;
+        }
+
+        [Column("penalty_amount")]
+        public long? PenaltyAmoutValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyAmount {
+            get => PenaltyAmoutValue != null ? DecFromDb(PenaltyAmoutValue.Value) : null;
+            set => PenaltyAmoutValue = value != null ? DecToDb(value.Value) : null;
+        }
+
+        [Column("penalty_none")]
+        public long? PenaltyNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyNone {
+            get => PenaltyNoneValue != null ? DecFromDb(PenaltyNoneValue.Value) : null;
+            set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
+        }
+
         [Column("start_date")]
         public string? StartDateString { get; set; }
 
         [NotMapped]
         public DateOnly? StartDate {
-            get {
-                return StartDateString != null ? DateOnly.ParseExact(StartDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                StartDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => StartDateString != null ? DateOnly.ParseExact(StartDateString, "yyyy-MM-dd") : null;
+            set => StartDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("end_date")]
@@ -34,12 +69,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly? EndDate {
-            get {
-                return EndDateString != null ? DateOnly.ParseExact(EndDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                EndDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => EndDateString != null ? DateOnly.ParseExact(EndDateString, "yyyy-MM-dd") : null;
+            set => EndDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [ForeignKey("CurrencyCode")]

Elwig/Models/WineAttr.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("wine_attribute"), PrimaryKey("AttrId")]
+    [Table("wine_attribute"), PrimaryKey("AttrId"), Index("Name", IsUnique = true)]
     public class WineAttr {
         [Column("attrid")]
         public string AttrId { get; set; }
@@ -10,11 +11,18 @@ namespace Elwig.Models {
         [Column("name")]
         public string Name { get; set; }
 
+        [Column("active")]
+        public bool IsActive { get; set; }
+
         [Column("max_kg_per_ha")]
         public int? MaxKgPerHa { get; set; }
 
-        [Column("active")]
-        public bool IsActive { get; set; }
+        [Column("strict")]
+        public bool IsStrict { get; set; }
+
+        [Column("fill_lower")]
+        public int FillLower { get; set; }
+
         public override string ToString() {
             return Name;
         }

Elwig/Models/WineCult.cs

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

Elwig/Models/WineOrigin.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]

Elwig/Windows/AdministrationWindow.cs

@@ -1,3 +1,4 @@
+using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Models;
 using System;
@@ -16,20 +17,20 @@ namespace Elwig.Windows {
         protected Control[] ExemptInputs { private get; set; }
         protected Control[] RequiredInputs { private get; set; }
 
-        private bool _IsEditing;
-        private bool _IsCreating;
+        private bool _isEditing;
+        private bool _isCreating;
         protected bool IsEditing {
-            get { return _IsEditing; }
+            get { return _isEditing; }
             set {
-                _IsEditing = value;
-                LockContext = IsEditing;
+                _isEditing = value;
+                LockContext = IsEditing || IsCreating;
             }
         }
         protected bool IsCreating {
-            get { return _IsCreating; }
+            get { return _isCreating; }
             set {
-                _IsCreating = value;
-                LockContext = IsEditing;
+                _isCreating = value;
+                LockContext = IsEditing || IsCreating;
             }
         }
         protected bool DoShowWarningWindows = true;
@@ -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;
@@ -83,7 +86,7 @@ namespace Elwig.Windows {
 
         private void OnClosing(object? sender, CancelEventArgs evt) {
             if ((IsCreating || IsEditing) && HasChanged) {
-                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schlie<EFBFBD>en best<EFBFBD>tigen",
+                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schließen bestätigen",
                     MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
                 if (r != MessageBoxResult.Yes) {
                     evt.Cancel = true;
@@ -99,12 +102,13 @@ namespace Elwig.Windows {
 
         abstract protected void UpdateButtons();
 
-        protected override async Task RenewContext() {
+        protected override async Task OnRenewContext() {
             for (int i = 0; i < PlzInputs.Length; i++)
                 UpdatePlz(PlzInputs[i], PlzOrtInputs[i]);
         }
 
         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);
@@ -252,19 +262,21 @@ namespace Elwig.Windows {
             foreach (var ccb in CheckComboBoxInputs)
                 ccb.SelectedItems.Clear();
             foreach (var cb in CheckBoxInputs)
-                cb.IsChecked = false;
+                cb.IsChecked = cb.IsThreeState ? null : false;
             foreach (var rb in RadioButtonInputs)
-                rb.IsChecked = false;
+                rb.IsChecked = rb.IsThreeState ? null : false;
             if (validate) ValidateRequiredInputs();
         }
 
         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);
@@ -413,7 +426,7 @@ namespace Elwig.Windows {
             UpdateButtons();
         }
 
-        protected void TextBox_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TextBox_TextChanged(object sender, RoutedEventArgs? evt) {
             var input = (TextBox)sender;
             if (SenderIsRequired(input) && input.Text.Length == 0) {
                 ValidateInput(input, false);
@@ -458,11 +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 PartialDateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DecimalInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal);
+        }
+
+        protected void PartialDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPartialDate);
         }
 
@@ -470,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);
         }
 
@@ -478,7 +495,15 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
-        protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TimeInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void TimeInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
             if ("PLZ".Equals(plz.Tag))
@@ -492,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);
         }
 
@@ -500,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);
         }
 
@@ -508,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);
         }
 
@@ -516,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);
         }
 
@@ -524,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);
         }
 
@@ -532,12 +557,20 @@ 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);
+        }
     }
 }

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="850"
+        Title="Flächenbindungen - Elwig" Height="500" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -46,118 +47,168 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
-            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="2*" MinWidth="555"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="*" MinWidth="280"/>
         </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 Grid.Row="0" Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="37"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
             </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">
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
+                      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="4*">
+                    <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.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">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <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"
-                         TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
+        <Grid Grid.Column="2" Grid.Row="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
 
-                <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"/>
+            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                <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"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="FbNrInput" Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
+                             TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                <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"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" IsEnabled="False"
+                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
 
-                <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"/>
+                    <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="YearFromInput" Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="YearToInput" Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-        <GroupBox Header="Lage" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
+                    <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"/>
 
-                <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"
-                          SelectionChanged="KgInput_SelectionChanged"/>
+                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
 
-                <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"/>
+                    <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                    <TextBox x:Name="CommentInput" TextChanged="TextBox_TextChanged"
+                             HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
 
-                <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"/>
+            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                <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"/>
-            </Grid>
-        </GroupBox>
+                    <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"
+                              SelectionChanged="KgInput_SelectionChanged"/>
+
+                    <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"/>
+
+
+                    <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"/>
+                    <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

@@ -9,10 +9,12 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Xceed.Wpf.Toolkit.Primitives;
+using System.Runtime.Intrinsics.Arm;
 
 namespace Elwig.Windows {
     public partial class AreaComAdminWindow : AdministrationWindow {
         private readonly Member Member;
+        private List<string> TextFilter = new();
 
         public AreaComAdminWindow(int mgnr) {
             InitializeComponent();
@@ -21,15 +23,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,
-                GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
+                FbNrInput, YearFromInput, KgInput, RdInput,
+                GstNrInput, AreaInput.TextBox, AreaComTypeInput, WineCultivationInput
             };
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e) {
+            ActiveAreaCommitmentInput.IsChecked = true;
             LockInputs();
         }
 
@@ -38,14 +41,84 @@ 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();
 
-            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr);
-            if (areaComs.Count == 1)
-                AreaCommitmentList.SelectedIndex = 0;
+            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, 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.DisplayName).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²")) + ")";
+            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.YearTo == null);
+                filterNames.Add("ohne Enddatum");
+            }
+
+            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) {
@@ -82,6 +155,8 @@ namespace Elwig.Windows {
             AreaComTypeInput.SelectedItem = a.AreaComType;
             WineCultivationInput.SelectedItem = a.WineCult;
 
+            CommentInput.Text = a.Comment;
+
             FinishInputFilling();
         }
 
@@ -96,8 +171,8 @@ namespace Elwig.Windows {
             ValidateRequiredInputs();
         }
 
-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
             ControlUtils.RenewItemsSource(KgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
             ControlUtils.RenewItemsSource(AreaComTypeInput, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), i => (i as AreaComType)?.VtrgId);
             ControlUtils.RenewItemsSource(WineCultivationInput, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), i => (i as WineCult)?.CultId);
@@ -112,6 +187,7 @@ namespace Elwig.Windows {
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
             InitInputs();
+            LockSearchInputs();
         }
 
         private void EditAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -124,6 +200,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentNewEditDeleteButtons();
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
+            LockSearchInputs();
         }
 
         private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -151,6 +228,7 @@ namespace Elwig.Windows {
             a.Area = int.Parse(AreaInput.Text);
             a.VtrgId = (AreaComTypeInput.SelectedItem as AreaComType)?.VtrgId;
             a.CultId = (WineCultivationInput.SelectedItem as WineCult)?.CultId;
+            a.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
 
             EntityEntry<AreaCom>? tr = null;
             try {
@@ -194,6 +272,7 @@ namespace Elwig.Windows {
             HideAreaCommitmentSaveResetCancelButtons();
             ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
+            UnlockSearchInputs();
             await RefreshAreaCommitmentList();
             AreaCommitmentList.SelectedItem = a;
         }
@@ -216,6 +295,7 @@ namespace Elwig.Windows {
             RefreshInputs();
             ClearInputStates();
             LockInputs();
+            UnlockSearchInputs();
         }
 
         override protected void UpdateButtons() {
@@ -269,6 +349,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,14 +367,23 @@ 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();
                 rdList.Insert(0, new NullItem());
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr);
+                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
             } else {
                 var rdList = new object[] { new NullItem() };
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr);
+                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
             }
             ComboBox_SelectionChanged(sender, evt);
         }

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">
+                <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>
@@ -215,7 +503,45 @@
 
             </TabItem>
             <TabItem Header="Textelemente">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <StackPanel>
+                        <GroupBox Header="Lieferschein" Margin="10,10,10,10" Height="180">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="370"/>
+                                </Grid.ColumnDefinitions>
 
+                                <TextBox x:Name="TextElementDeliveryNote" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                                <GroupBox Grid.Column="1" Header="Tabelle zur Gesamtlieferung" Margin="10,10,10,10" VerticalAlignment="Center">
+                                    <StackPanel Margin="5,5,0,5">
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteNone" Content="Verbergen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteGaOnly" Content="Nur Gesamtlieferung lt. Geschäftsanteilen anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteShort" Content="Nur Gesamtlieferung und Flächenbindungen von auf dem&#xA;Lieferschein angeführten Sorten anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteFull" Content="Vollständig anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                    </StackPanel>
+                                </GroupBox>
+                            </Grid>
+                        </GroupBox>
+                        <GroupBox Header="Anlieferungsbestätigung" Margin="10,10,10,10" Height="250">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBox x:Name="TextElementDeliveryConfirmation" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                            </Grid>
+                        </GroupBox>
+                    </StackPanel>
+                </ScrollViewer>
             </TabItem>
         </TabControl>
 

Elwig/Windows/BaseDataWindow.xaml.AreaCom.cs

@@ -0,0 +1,154 @@
+using Elwig.Helpers;
+using Elwig.Models;
+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;
+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;
+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;
+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;
+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;
+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

@@ -2,23 +2,14 @@ using Elwig.Helpers;
 using Elwig.Models;
 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,107 +18,167 @@ 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 RenewContext() {
-            await base.RenewContext();
+        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))) {
-                await Context.AddAsync(mod);
-            }
-            await Context.SaveChangesAsync();
-        }
-
         private void EditButton_Click(object sender, RoutedEventArgs evt) {
             IsEditing = true;
             EditButton.Visibility = Visibility.Hidden;
             ResetButton.Visibility = Visibility.Visible;
 
+            BranchesInitEditing();
+            WineAttributesInitEditing();
+            WineCultivationsInitEditing();
+            AreaCommitmentTypesInitEditing();
+            SeasonsInitEditing();
             ModifiersInitEditing();
+
             UnlockInputs();
             UpdateButtons();
         }
@@ -140,6 +191,13 @@ namespace Elwig.Windows {
             CancelButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
+
+            Context.ChangeTracker.Clear();
+            BranchesFinishEditing();
+            WineCultivationsFinishEditing();
+            WineAttributesFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -148,8 +206,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();
@@ -158,6 +227,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;
@@ -172,6 +246,12 @@ namespace Elwig.Windows {
             CancelButton.IsEnabled = false;
             SaveButton.IsEnabled = false;
             ResetButton.IsEnabled = false;
+
+            BranchesFinishEditing();
+            WineAttributesFinishEditing();
+            WineCultivationsFinishEditing();
+            AreaCommitmentTypesFinishEditing();
+            SeasonsFinishEditing();
             ModifiersFinishEditing();
 
             ClearInputStates();
@@ -200,6 +280,15 @@ namespace Elwig.Windows {
             ClientEmailAddressInput.Text = p.EmailAddress;
             ClientWebsiteInput.Text = p.Website;
 
+            TextElementDeliveryNote.Text = p.TextDeliveryNote;
+            switch (p.ModeDeliveryNoteStats) {
+                case 0: ModeDeliveryNoteNone.IsChecked = true; break;
+                case 1: ModeDeliveryNoteGaOnly.IsChecked = true; break;
+                case 2: ModeDeliveryNoteShort.IsChecked = true; break;
+                case 3: ModeDeliveryNoteFull.IsChecked = true; break;
+            }
+            TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
+
             FinishInputFilling();
         }
 
@@ -221,123 +310,17 @@ namespace Elwig.Windows {
             p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
             p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.Text : null;
 
+            p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
+            p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
+            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+
             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) {
-            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) {
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod) return;
-            ModifiersChanged = ModifiersChanged || (SeasonModifierAbsInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Abs?.ToString() ?? "");
-            if (ModifierUpdate) return;
-            mod.Abs = decimal.TryParse(SeasonModifierAbsInput.Text, out var v) ? v : null;
-            if (mod.Abs != null) SeasonModifierRelInput.Text = "";
-            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
-            UpdateButtons();
-        }
     }
 }

Elwig/Windows/ChartWindow.xaml.cs

@@ -214,8 +214,8 @@ namespace Elwig.Windows {
             FinishInputFilling();
         }
 
-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
             await RefreshGraphList();
         }
 
@@ -375,7 +375,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

@@ -7,30 +7,32 @@ using System.Windows.Threading;
 namespace Elwig.Windows {
     public abstract class ContextWindow : Window {
 
+        public static readonly int RenewSec = 10;
+
         protected AppDbContext Context { get; private set; }
         protected bool LockContext { get; set; } = false;
 
-        private readonly DispatcherTimer ContextRenewTimer;
-        private static readonly int ContextRenewSec = 10;
+        private readonly DispatcherTimer _timer;
+        private bool _renewPending = false;
 
         public ContextWindow() : base() {
-            ContextRenewTimer = new DispatcherTimer();
-            ContextRenewTimer.Tick += new EventHandler(OnRenewContext);
-            ContextRenewTimer.Interval = new TimeSpan(0, 0, ContextRenewSec);
-            ContextRenewTimer.Start();
+            _timer = new DispatcherTimer();
+            _timer.Tick += new EventHandler(OnShouldRenewContext);
+            _timer.Interval = new TimeSpan(0, 0, RenewSec);
+            _timer.Start();
             Context = new();
             Loaded += OnLoaded;
         }
 
-        private void OnRenewContext(object? sender, EventArgs evt) {
-            if (LockContext || !Context.HasBackendChanged) return;
-            Context.Dispose();
-            Context = new();
-            RenewContext().GetAwaiter().GetResult();
+        private async void OnShouldRenewContext(object? sender, EventArgs evt) {
+            if (!Context.HasBackendChanged) return;
+            _renewPending = true;
+            if (LockContext) return;
+            await RenewContext();
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
-            RenewContext().GetAwaiter().GetResult();
+        protected async void OnLoaded(object sender, RoutedEventArgs evt) {
+            await OnRenewContext();
         }
 
         protected override void OnClosed(EventArgs evt) {
@@ -38,6 +40,14 @@ namespace Elwig.Windows {
             Context.Dispose();
         }
 
-        abstract protected Task RenewContext();
+        protected async Task RenewContext() {
+            if (!_renewPending) return;
+            Context.Dispose();
+            Context = new();
+            await OnRenewContext();
+            _renewPending = false;
+        }
+
+        abstract protected Task OnRenewContext();
     }
 }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -4,8 +4,9 @@
         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="700" MinWidth="1000"
+        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -43,36 +44,42 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.625*"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" MinWidth="400"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2*" MinWidth="560"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Lieferung">
-            </MenuItem>
             <MenuItem Header="Drucken">
                 <MenuItem x:Name="Menu_Print_ShowDeliveryNote" Header="Lieferschein anzeigen" IsEnabled="False"
                           Click="Menu_Print_ShowDeliveryNote_Click"/>
                 <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
                           Click="Menu_Print_PrintDeliveryNote_Click"/>
+                <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_PrintToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Exportieren">
                 <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
             </MenuItem>
-            <MenuItem Header="Werkzeuge">
-                <MenuItem Header="Alle Lieferscheine überprüfen"/>
+            <MenuItem Header="Einstellungen">
+                <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
+                          IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/>
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="42"/>
                 <RowDefinition Height="*"/>
@@ -85,8 +92,9 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"/>
-            <xctk:IntegerUpDown Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+                     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 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"
@@ -100,17 +108,50 @@
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."   Binding="{Binding MgNr}" Width="70"/>
-                    <DataGridTextColumn Header="Datum"   Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70"/>
-                    <DataGridTextColumn Header="Zeit"    Binding="{Binding Time, StringFormat='HH:mm'}" Width="70"/>
-                    <DataGridTextColumn Header="Sorte"   Binding="{Binding SortIdString}" Width="60"/>
-                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg'}"  Width="70">
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Date, StringFormat='dd.MM.yy'}" Width="70">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Zeit" Binding="{Binding Time, StringFormat='HH:mm'}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortIdString}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gewicht" Binding="{Binding Weight, StringFormat='{}{0:N0} kg '}" Width="75">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Gradation" Binding="{Binding Kmw, StringFormat='{}{0:N1}° '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="LsNr." Binding="{Binding LsNr}" Width="120"/>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -151,238 +192,248 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
-                <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
-                          ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
-                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+        <Grid Grid.Row="1" Grid.Column="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.625*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
-                         IsReadOnly="True" IsTabStop="False"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Mitglied" Grid.Column="0" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Lieferung" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Mitglied:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Width="48" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="MemberInput" Grid.Column="1" Margin="53,10,10,10" IsEditable="True"
+                              ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                              SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"
-                         TextChanged="DateInput_TextChanged"/>
-                <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
-                         IsReadOnly="True" IsTabStop="False"/>
-
-                <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
-                          IsEnabled="False"
-                          DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
-
-                <Label Content="Anmerkung:" Margin="10,100,0,10"/>
-                <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
-                         TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sorte" Grid.Column="2" Grid.Row="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
-                         TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus"  KeyUp="Input_KeyUp"/>
-                <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
-                          ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
-                          SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-
-                <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-                <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
-                                    DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Gradation" Grid.Column="2" Grid.Row="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <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"/>
-                    <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+                    <Label Content="Wohnort:" Margin="10,38,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MemberAddressField" Grid.Column="1" Margin="0,40,10,10" FontSize="12" Height="22"
+                             IsReadOnly="True" IsTabStop="False"/>
                 </Grid>
-                <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"/>
-                    <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
+            </GroupBox>
+
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="LsNrInput" Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
+                             IsReadOnly="True" IsTabStop="False"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Datum/Uhrzeit:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="DateInput" Width="77" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <TextBox x:Name="TimeInput" Width="44" Grid.Column="1" HorizontalAlignment="Left" Margin="82,40,0,0"
+                             IsReadOnly="True"
+                             TextChanged="TimeInput_TextChanged" LostFocus="TimeInput_LostFocus"/>
+
+                    <Label Content="Zweigstelle:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="BranchInput" Width="126" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Left"
+                              IsEnabled="False"
+                              SelectionChanged="BranchInput_SelectionChanged"
+                              DisplayMemberPath="Name" TextSearch.TextPath="Name"/>
+
+                    <Label Content="Anmerkung:" Margin="10,100,0,10"/>
+                    <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
+                             TextChanged="TextBox_TextChanged"/>
                 </Grid>
+            </GroupBox>
 
-                <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"
-                          ItemTemplate="{StaticResource WineQualityLevelTemplate}"
-                          SelectionChanged="WineQualityLevelInput_SelectionChanged"/>
+            <GroupBox Header="Sorte" Grid.Column="1" Grid.Row="0" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="SortIdInput" Width="36" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" HorizontalAlignment="Left"
+                             TextChanged="SortIdInput_TextChanged" LostFocus="SortIdInput_LostFocus" KeyUp="Input_KeyUp"/>
+                    <ComboBox x:Name="WineVarietyInput" Grid.Row="1" Grid.Column="1" Margin="41,10,10,10"
+                              ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
+                              SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-        <GroupBox Header="Gewicht" Grid.Column="2" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition/>
-                </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"/>
+                    <Label Content="Attribut:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="AttributeInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
+                              DisplayMemberPath="Name"
+                              SelectionChanged="AttributeInput_SelectionChanged" KeyUp="Input_KeyUp"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+            <GroupBox Header="Gradation" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Label Content="Gradation:" Margin="10,10,10,10"/>
+                    <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"/>
 
-                <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                    <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
+                    <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"/>
 
-                <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
-                        Click="WeighingManualButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
-                <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
-                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
+                    <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"
+                              ItemTemplate="{StaticResource WineQualityLevelTemplate}"
+                              SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-            </Grid>
-        </GroupBox>
-
-        <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
-                <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                                    ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
-
-                <Label Content="Anmerkung:" Margin="10,40,0,10"/>
-                <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
-                         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"/>
+                    <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
                 </Grid>
+            </GroupBox>
 
-                <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"/>
+            <GroupBox Header="Gewicht" Grid.Column="1" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="70"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Gewicht:" Margin="10,10,10,10"/>
+                    <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"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
+                    <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
+                              VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                              Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed"/>
+
+                    <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
+                            Click="WeighingButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
+                    <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
+                            Click="WeighingManualButton_Click"
+                            VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
                 </Grid>
+            </GroupBox>
 
-                <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
-                <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Sonstiges" Grid.Column="1" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
-                <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                         SelectionChanged="DeliveryPartList_SelectionChanged">
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                <TextBlock Text="{Binding SortId}" Width="30"/>
-                                <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                <TextBlock Text="{Binding QualId}" Width="30"/>
-                                <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                </ListBox>
+                    <Label Content="Zu-/Abschläge:" Margin="10,10,0,10"/>
+                    <xctk:CheckComboBox x:Name="ModifiersInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                                        ItemTemplate="{StaticResource ModifierTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
+                                        ItemSelectionChanged="ModifiersInput_SelectionChanged"/>
 
-                <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                        ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                        Click="ExtractDeliveryPartButton_Click"/>
-                <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                        Click="DeleteDeliveryPartButton_Click"/>
-            </Grid>
-        </GroupBox>
+                    <Label Content="Anmerkung:" Margin="10,40,0,10"/>
+                    <TextBox x:Name="PartCommentInput" Grid.Column="1" Margin="0,40,10,10" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-        <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="100"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="Temperatur:" Margin="10,70,0,10"/>
+                    <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="Weinbaugebiet:" Margin="10,10,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineOriginInput" Margin="0,10,10,10" Grid.Column="1"
-                          ItemTemplate="{StaticResource WineOriginTemplate}"/>
+                    <Label Content="Säure:" Margin="10,100,0,10"/>
+                    <ctrl:UnitTextBox x:Name="AcidInput" Unit="g/l"
+                                      TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"
+                                      Grid.Column="1" Margin="0,100,10,10" VerticalAlignment="Top"/>
 
-                <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"
-                          SelectionChanged="WineKgInput_SelectionChanged"/>
+                    <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
+                    <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="HandPickedInput_Changed" Unchecked="HandPickedInput_Changed"/>
+                </Grid>
+            </GroupBox>
 
-                <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
-                <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
-                          DisplayMemberPath="Name"/>
-            </Grid>
-        </GroupBox>
+            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                             SelectionChanged="DeliveryPartList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                    <TextBlock Text="{Binding SortId}" Width="30"/>
+                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding QualId}" Width="30"/>
+                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                    <TextBlock Text="{Binding Attribute.Name}" Width="100"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                            Click="ExtractDeliveryPartButton_Click"/>
+                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                            Click="DeleteDeliveryPartButton_Click"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+
+                    <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}"/>
+
+                    <Label Content="Weinbau-KG:" Margin="10,40,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineKgInput" Margin="0,40,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"
+                              SelectionChanged="WineKgInput_SelectionChanged"/>
+
+                    <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
+                    <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
+                              DisplayMemberPath="Name"/>
+
+                    <CheckBox x:Name="GebundenInput" Content="Gebunden" Margin="10,105,0,0" Grid.Column="0" Grid.ColumnSpan="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
 
         <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
             <StatusBar.ItemsPanel>
@@ -403,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/DeliveryConfirmationsWindow.xaml

@@ -0,0 +1,38 @@
+<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsWindow"
+                     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"
+                     Loaded="Window_Loaded"
+                     Title="Anlieferungsbestätingungen - Elwig" Height="500" Width="800" MinHeight="400" MinWidth="600">
+    <Grid>
+        <GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <StackPanel Margin="5,5,0,5">
+                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
+                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
+                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name"/>
+            </StackPanel>
+        </GroupBox>
+
+        <CheckBox x:Name="AllMembersInput" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,100,10,10">
+            <TextBlock>Auch Mitglieder ohne<LineBreak/>Lieferungen miteinbeziehen</TextBlock>
+        </CheckBox>
+
+        <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"
+                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>
+</local:ContextWindow>

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -0,0 +1,131 @@
+using Elwig.Documents;
+using Elwig.Models;
+using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Dialogs {
+    public partial class DeliveryConfirmationsWindow : ContextWindow {
+
+        public readonly int Year;
+
+        public DeliveryConfirmationsWindow(int year) {
+            InitializeComponent();
+            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;
+        }
+
+        protected override async Task OnRenewContext() { }
+
+        private async Task UpdateTextParameter() {
+            var text = TextElement.Text;
+            if (text.Length == 0) text = null;
+            if (text != App.Client.TextDeliveryConfirmation) {
+                App.Client.TextDeliveryConfirmation = text;
+                await App.Client.UpdateValues();
+            }
+        }
+
+        private async Task Generate(int mode) {
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            await UpdateTextParameter();
+
+            IQueryable<Member> members;
+            if (AllMembersInput.IsChecked == true) {
+                members = Context.Members.Where(m => m.IsActive);
+            } else {
+                members = Context.Members.FromSqlRaw($"""
+                    SELECT m.*
+                    FROM member m
+                        INNER JOIN delivery d ON d.mgnr = m.mgnr
+                    WHERE d.year = {Year}
+                    GROUP BY m.mgnr
+                    """);
+            }
+
+            if (OrderMgNrInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.MgNr);
+            } else if (OrderNameInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            } else if (OrderPlzInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                    .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                    .ThenBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            }
+
+            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();
+
+            using var doc = Document.Merge(list.Select(m =>
+                new DeliveryConfirmation(Context, Year, m, deliveries.Where(d => d.Delivery.MgNr == m.MgNr).ToList()) {
+                    //DoubleSided = true
+                }
+            ));
+            //doc.DoubleSided = true;
+            await doc.Generate(new Progress<double>(v => {
+                ProgressBar.Value = v;
+            }));
+            Mouse.OverrideCursor = null;
+
+            if (mode < 2) {
+                doc.Show();
+                return;
+            }
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+            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);
+        }
+
+        private async void PrintButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(2);
+        }
+    }
+}

Elwig/Windows/MainWindow.xaml

@@ -8,6 +8,8 @@
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="9,3"/>
             <Setter Property="Height" Value="32"/>
@@ -28,30 +30,34 @@
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
+            <Image Source="\Resources\Images\Elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
                    HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="Elwig" FontSize="32"
-                   HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="Elektonische Winzer-"
-                   HorizontalAlignment="Left" Margin="0,55,0,0" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="genossenschaftsverwaltung"
-                   HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
+            <TextBlock Grid.Column="1" FontSize="32" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
+                Elwig
+            </TextBlock>
+            <TextBlock Grid.Column="1" HorizontalAlignment="Left" Margin="0,50,0,0" VerticalAlignment="Top" LineHeight="14" LineStackingStrategy="BlockLineHeight">
+                Elektonische Winzer-<LineBreak/>
+                genossenschaftsverwaltung
+            </TextBlock>
+            <TextBlock x:Name="VersionField" Grid.Column="1" FontSize="10" HorizontalAlignment="Left" Margin="0,80,0,0" VerticalAlignment="Top">
+                Version: ?
+            </TextBlock>
         </Grid>
 
         <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
-                Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,160,0,0"/>
         <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
-                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,200,0,0"/>
         <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
-                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
-                Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,240,0,0"/>
+        <Button x:Name="SeasonFinishButton" Content="Leseabschluss" Click="SeasonFinishButton_Click"
+                Margin="50,280,0,0"/>
         <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
-                Margin="50,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,320,0,0"/>
 
         <Button x:Name="TestWindowButton" Content="Test Fenster" Click="TestWindowButton_Click"
-                Margin="260,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,280,0,0"/>
         <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
-                Margin="260,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,320,0,0"/>
     </Grid>
 </Window>

Elwig/Windows/MainWindow.xaml.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -5,6 +6,12 @@ namespace Elwig.Windows {
 
         public MainWindow() {
             InitializeComponent();
+            var v = Assembly.GetExecutingAssembly().GetName().Version;
+            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}";
+            if (!App.Config.Debug) {
+                TestWindowButton.Visibility = Visibility.Hidden;
+                //QueryWindowButton.Visibility = Visibility.Hidden;
+            }
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) { }
@@ -48,8 +55,8 @@ namespace Elwig.Windows {
             w.Show();
         }
 
-        private void PaymentWindowButton_Click(object sender, RoutedEventArgs e) {
-            var w = new ChartWindow();
+        private void SeasonFinishButton_Click(object sender, RoutedEventArgs e) {
+            var w = new SeasonFinishWindow();
             w.Show();
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -4,7 +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"
-        Title="Mitglieder - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
+        Title="Mitglieder - Elwig" Height="700" Width="1250" MinHeight="650" MinWidth="1150"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -36,16 +36,13 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.8*"/>
-            <RowDefinition Height="0.2*"/>
-            <RowDefinition Height="1.3*"/>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="370"/>
-            <ColumnDefinition Width="1*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*" MinWidth="300"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="2.5*" MinWidth="800"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -54,8 +51,17 @@
                           Click="Menu_Member_SendEmail_Click"/>
             </MenuItem>
             <MenuItem Header="Drucken">
+                <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
+                          Click="Menu_Print_Letterhead_Click"/>
                 <MenuItem Header="Stammdatenblatt drucken"/>
-                <MenuItem Header="Mitgliederliste drucken"/>
+                <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"/>
+                    <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_Name_Click"/>
+                    <MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_Plz_Click"/>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Rundschreiben">
                 <MenuItem Header="Runschreiben ausschicken"/>
@@ -66,7 +72,7 @@
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="5" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.Row="1" Margin="5,0,0,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="39"/>
                 <RowDefinition Height="*"/>
@@ -88,9 +94,23 @@
                       SelectionChanged="MemberList_SelectionChanged"
                       Margin="5,0,5,0" Grid.Row="1" FontSize="14" Grid.ColumnSpan="3">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="MgNr."    Binding="{Binding MgNr}"       Width="70"/>
-                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="4*"/>
-                    <DataGridTextColumn Header="Vorname"  Binding="{Binding GivenName}"  Width="3*"/>
+                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Nachname" Binding="{Binding FamilyName}" Width="140"/>
+                    <DataGridTextColumn Header="Vorname" Binding="{Binding GivenName}" Width="140"/>
+                    <DataGridTextColumn Header="GA" Binding="{Binding BusinessShares, StringFormat='{}{0} '}" Width="40">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Rechnungsadresse" Binding="{Binding BillingAddress.Name}" Width="200"/>
                 </DataGrid.Columns>
             </DataGrid>
 
@@ -115,252 +135,311 @@
                     Click="CancelButton_Click"/>
         </Grid>
 
-        <GroupBox Header="Persönliche Daten" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="3*"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
 
-                <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
+        <Grid Grid.Column="2" Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="1.3*"/>
+                <RowDefinition Height="0.8*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
 
-                <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
+            <GroupBox Header="Persönliche Daten" Grid.Column="0" Grid.Row="0" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="3*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="MgNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="MgNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="MgNrInput_TextChanged" LostFocus="MgNrInput_LostFocus"/>
 
-                <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Vorg.:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="PredecessorMgNrInput" Margin="0,10,10,0" Width="48" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="PredecessorMgNrInput_TextChanged" LostFocus="PredecessorMgNrInput_LostFocus"/>
 
-                <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Präfix:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="PrefixInput" Margin="0,40,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
-                <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Vorname:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GivenNameInput" Margin="0,40,0,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
-                         TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
+                    <Label Content="Nachname:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="FamilyNameInput" Margin="0,70,0,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-                <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
+                    <Label Content="Suffix:" Margin="10,70,0,0" Grid.Column="2"/>
+                    <TextBox x:Name="SuffixInput" Margin="0,70,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Geburtstag:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BirthdayInput" Margin="0,100,0,0" Grid.Column="1" Width="78" TextAlignment="Right" HorizontalAlignment="Left"
+                             TextChanged="PartialDateInput_TextChanged" LostFocus="PartialDateInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,130,0,0"/>
-                <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Alter:" Margin="85,100,0,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                    <TextBlock x:Name="Age" Text="-" Margin="119,104,0,0" Grid.Column="1" Grid.ColumnSpan="3" TextWrapping="NoWrap" VerticalAlignment="Top"/>
 
-                <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
-                <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
-                <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Kontaktdaten" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="135"/>
-                    <ColumnDefinition Width="*" MinWidth="180"/>
-                    <ColumnDefinition Width="2*"/>
-                </Grid.ColumnDefinitions>
+                    <CheckBox x:Name="DeceasedInput" Content="Verstorben" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="3" HorizontalAlignment="Left" Margin="0,105,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="E-Mail-Adresse:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddressInput" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+                    <Label Content="Adresse:" Margin="10,130,0,0"/>
+                    <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,40,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr1Input" Margin="0,40,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,40,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="PLZ/Ort:" Margin="10,160,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="PlzInput" Margin="0,160,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="OrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,160,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Kontaktdaten" Grid.Column="0" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="135"/>
+                        <ColumnDefinition Width="*" MinWidth="180"/>
+                        <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
 
-                <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr2Input" Margin="0,70,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,70,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr3Input" Margin="0,100,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,100,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
-                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr4Input" Margin="0,130,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,130,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr5Input" Margin="0,160,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,160,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr6Input" Margin="0,190,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,190,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr7Input" Margin="0,220,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,220,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr8Input" Margin="0,250,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,250,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr9Input" Margin="0,280,5,0" Grid.Column="1"
-                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
-                         TextChanged="TextBox_TextChanged"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Bankverbindung" Grid.Column="1" Grid.Row="5" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
-                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
+                    <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Betrieb" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="90"/>
-                    <ColumnDefinition Width="150"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                         TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+                    <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
+                    <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+                    <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
+                             TextChanged="TextBox_TextChanged"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Bankverbindung" Grid.Column="0" Grid.Row="4" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
+                    <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                             TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
-                <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"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="2" Grid.Row="2" Grid.RowSpan="2" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="65"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                             TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Betrieb" Grid.Column="1" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="150"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
 
-                <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="Betriebs-Nr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="LfbisNrInput" Margin="0,40,10,0" Grid.Column="1" Width="64" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
 
-                <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
-                         TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
-                <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
-                          Margin="47,70,10,0" Grid.Column="1"/>
-            </Grid>
-        </GroupBox>
-        <GroupBox Header="Genossenschaft" Grid.Column="2" Grid.Row="4" Grid.RowSpan="2" Margin="5,5,5,10">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition/>
-                </Grid.ColumnDefinitions>
+                    <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"/>
 
-                <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <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">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="65"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                    <Label Content="Name:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingNameInput" Margin="0,10,10,10" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                         TextChanged="IntegerInput_TextChanged"/>
+                    <Label Content="Adresse:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingAddressInput" Margin="0,40,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
-                <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
-                         TextChanged="TextBox_TextChanged"/>
+                    <Label Content="PLZ/Ort:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BillingPlzInput" Margin="0,70,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus" Tag="PLZ"/>
+                    <ComboBox x:Name="BillingOrtInput" ItemTemplate="{StaticResource PostalDestTemplate}" TextSearch.TextPath="Ort.Name"
+                              Margin="47,70,10,0" Grid.Column="1"/>
+                </Grid>
+            </GroupBox>
+            <GroupBox Header="Genossenschaft" Grid.Column="1" Grid.Row="3" Grid.RowSpan="2" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition Width="120"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
 
-                <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Eintritt:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="EntryDateInput" Margin="0,10,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Austritt:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="ExitDateInput" Margin="0,40,10,0" Width="78" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
 
-                <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Label Content="Geschäftsanteile:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="BusinessSharesInput" Margin="0,70,10,0" Width="48" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="IntegerInput_TextChanged"/>
 
-                <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <Label Content="BH-Konto:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="AccountingNrInput" Margin="0,100,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
 
-                <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"/>
+                    <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <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"
-                         TextChanged="TextBox_TextChanged"/>
+                    <CheckBox x:Name="VollLieferantInput" Content="Volllieferant" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
-                <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
-                <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
-                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                          HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/>
-                <TextBlock x:Name="AreaCommitment" Text="- m²"
-                           Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
+                    <Label Content="Stamm-Zwst.:" Margin="10,130,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="BranchInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                              Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-                <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
-                        HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-                <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
-                        HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
-            </Grid>
-        </GroupBox>
+                    <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"/>
+
+                    <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"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                    <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                              HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+
+                    <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                    <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
+                </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="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="3*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusMembers" Text="Mitglieder: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusBusinessShares" Text="Geschäftsanteile: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusAreaCommitment" Text="Gebundene Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock Name="StatusDeliveriesLastSeason" Text="Lieferungen (letzte Saison): -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8">
+                <TextBlock Name="StatusDeliveriesThisSeason" Text="Lieferungen (aktuelle Saison): -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -10,6 +10,7 @@ using Elwig.Models;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;
+using Elwig.Documents;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -54,6 +55,9 @@ 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;
+
             ActiveMemberInput.IsChecked = true;
             UpdatePhoneNrInputVisibility();
             LockInputs();
@@ -89,7 +93,8 @@ namespace Elwig.Windows {
                     .ToList();
             }
 
-            ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr, MemberList_SelectionChanged, ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
+            ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr,
+                MemberList_SelectionChanged, TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
         }
 
         private void RefreshInputs(bool validate = false) {
@@ -130,11 +135,13 @@ namespace Elwig.Windows {
             ValidateRequiredInputs();
         }
 
-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(DefaultKgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
             await RefreshMemberList();
+            StatusMembers.Text = $"Mitglieder: {await Context.Members.CountAsync(m => m.IsActive):N0} ({await Context.Members.CountAsync():N0})";
+            StatusBusinessShares.Text = $"Geschäftsanteile: {await Context.Members.Where(m => m.IsActive).SumAsync(m => m.BusinessShares):N0} ({await Context.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
         private void SetPhoneNrInput(int nr, string? type, string? number, string? comment) {
@@ -265,7 +272,71 @@ namespace Elwig.Windows {
         }
 
         private void Menu_Member_SendEmail_Click(object sender, RoutedEventArgs evt) {
-            Utils.MailTo(((Member)MemberList.SelectedItem).Email);
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Utils.MailTo(m.EmailAddresses.Select(a => a.Address));
+        }
+
+        private async void Menu_Print_Letterhead_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = new Letterhead(m);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async Task PrintLetterheads(int ordering) {
+            var n = await Context.Members.CountAsync(m => m.IsActive);
+            var res = MessageBox.Show(
+                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
+                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var members = Context.Members.Where(m => m.IsActive && m.ContactViaPost);
+            switch (ordering) {
+                case 0: members = members
+                        .OrderBy(m => m.MgNr);
+                    break;
+                case 1: members = members
+                        .OrderBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+                case 2: members = members
+                        .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                        .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+            }
+            using var doc = Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(0);
+        }
+
+        private async void Menu_Print_Letterheads_Name_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(1);
+        }
+
+        private async void Menu_Print_Letterheads_Plz_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(2);
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -348,14 +419,13 @@ namespace Elwig.Windows {
             m.PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id;
             m.Address = AddressInput.Text;
 
-            m.Email = (EmailAddressInput.Text == "") ? null : EmailAddressInput.Text;
-
             m.Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", "");
             m.Bic = (BicInput.Text == "") ? null : BicInput.Text;
 
             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());
@@ -423,6 +493,27 @@ namespace Elwig.Windows {
                     }
                 }
 
+                for (int i = 0; i < 2; i++) {
+                    var input = i == 0 ? EmailAddress1Input : EmailAddress2Input;
+                    var emailAddr = m.EmailAddresses.FirstOrDefault(a => a.Nr - 1 == i);
+                    if (input.Text == "") {
+                        if (emailAddr != null) {
+                            Context.Remove(emailAddr);
+                        }
+                    } else {
+                        MemberEmailAddr a = emailAddr ?? Context.CreateProxy<MemberEmailAddr>();
+                        a.Nr = i + 1;
+                        a.Address = input.Text;
+                        a.Comment = null;
+                        if (emailAddr == null) {
+                            a.MgNr = newMgNr;
+                            await Context.AddAsync(a);
+                        } else {
+                            Context.Update(a);
+                        }
+                    }
+                }
+
                 await Context.SaveChangesAsync();
 
                 if (newMgNr != m.MgNr) {
@@ -474,7 +565,10 @@ namespace Elwig.Windows {
                 OrtInput.SelectedItem = null;
             }
 
-            EmailAddressInput.Text = m.Email;
+            var emailAddrs = m.EmailAddresses.OrderBy(a => a.Nr).ToList();
+            EmailAddress1Input.Text = emailAddrs.Count > 0 ? emailAddrs[0].Address : "";
+            EmailAddress2Input.Text = emailAddrs.Count > 1 ? emailAddrs[1].Address : "";
+
             var phoneNrs = m.TelephoneNumbers.OrderBy(p => p.Nr).ToList();
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
                 if (i < phoneNrs.Count) {
@@ -492,6 +586,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) {
@@ -522,16 +617,24 @@ namespace Elwig.Windows {
             ContactPostalInput.IsChecked = m.ContactViaPost;
             ContactEmailInput.IsChecked = m.ContactViaEmail;
 
-            AreaCommitment.Text = $"{m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
+            var d1 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
+            var d2 = Context.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): {d2.Count():N0} ({d2.Sum(d => d.Parts.Count):N0}), {d2.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): {d1.Count():N0} ({d1.Sum(d => d.Parts.Count):N0}), {d1.SelectMany(d => d.Parts).Sum(p => p.Weight):N0} kg";
+            StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
 
-            Menu_Member_SendEmail.IsEnabled = m.Email != null;
+            Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
+            Menu_Print_Letterhead.IsEnabled = true;
 
             FinishInputFilling();
         }
 
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
-            AreaCommitment.Text = "- m²";
+            Menu_Print_Letterhead.IsEnabled = false;
+            StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
+            StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
+            StatusAreaCommitment.Text = "Gebundene Fläche: -";
             Age.Text = "-";
             base.ClearInputs(validate);
         }
@@ -567,7 +670,7 @@ 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);
         }

Elwig/Windows/QueryWindow.xaml.cs

@@ -44,7 +44,7 @@ namespace Elwig.Windows {
             for (int i = 0; i < header.Count; i++) {
                 var h = header[i];
                 DataList.Columns.Add(new DataGridTextColumn {
-                    Header = h.ColumnName,
+                    Header = h.ColumnName.Replace("_", "__"),
                     Binding = new Binding($"[{i}]"),
                     CellStyle = (h.DataTypeName == "INTEGER" || h.DataTypeName == "REAL") ? styleRight : null,
                 });

Elwig/Windows/SeasonFinishWindow.xaml

@@ -0,0 +1,50 @@
+<local:ContextWindow x:Class="Elwig.Windows.SeasonFinishWindow"
+        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:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Loaded="Window_Loaded"
+        Title="Leseabschluss - Elwig" Height="450" Width="800">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="Width" Value="200"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Label Content="Saison:" Margin="50,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="2,4,2,4" Height="25"/>
+        <xctk:IntegerUpDown Name="SeasonInput" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+                            Margin="110,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
+                            ValueChanged="SeasonInput_ValueChanged"/>
+
+        <Button x:Name="CalculateBucketsButton" Content="Aufteilung Berechnen"
+                Click="CalculateBucketsButton_Click"
+                Margin="50,80,0,0"/>
+        <CheckBox x:Name="AllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,68,0,0"/>
+        <CheckBox x:Name="AvoidUnderDeliveriesInput" Content="Unterlieferungen durch Abzug bei &quot;besseren&quot; Flächenbindungen vermeiden"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,88,0,0"/>
+        <CheckBox x:Name="HonorGebundenInput" Margin="255,108,0,0" VerticalAlignment="Top">
+            <TextBlock>Bei Lieferungen das Feld <Italic>Gebunden</Italic> berücksichtigen</TextBlock>
+        </CheckBox>
+
+        <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
+                Click="DeliveryConfirmationButton_Click"
+                Margin="50,122,0,0"/>
+
+        <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
+                Click="OverUnderDeliveryButton_Click"
+                Margin="50,164,0,0"/>
+
+        <Button x:Name="PaymentButton" Content="Auszahlung"
+                Click="PaymentButton_Click"
+                Margin="50,206,0,0"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -0,0 +1,201 @@
+using Elwig.Dialogs;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Windows {
+    public partial class SeasonFinishWindow : ContextWindow {
+        public SeasonFinishWindow() {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            SeasonInput.Value = Utils.CurrentLastSeason;
+        }
+
+        protected override async Task OnRenewContext() {
+            SeasonInput_ValueChanged(null, null);
+        }
+
+        private async void SeasonInput_ValueChanged(object? sender, RoutedEventArgs? evt) {
+            var s0 = await Context.Seasons.FindAsync(SeasonInput.Value);
+            var s1 = await Context.Seasons.FindAsync(SeasonInput.Value + 1);
+            var valid = (s0 != null);
+            var last = (s1 == null);
+            CalculateBucketsButton.IsEnabled = valid && last;
+            DeliveryConfirmationButton.IsEnabled = valid;
+            OverUnderDeliveryButton.IsEnabled = valid;
+        }
+
+        private async void CalculateBucketsButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            CalculateBucketsButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new Billing(year);
+            await b.FinishSeason();
+            await b.CalculateBuckets(
+                AllowAttrIntoLowerInput.IsChecked ?? false,
+                AvoidUnderDeliveriesInput.IsChecked ?? false,
+                HonorGebundenInput.IsChecked ?? false);
+            Mouse.OverrideCursor = null;
+            CalculateBucketsButton.IsEnabled = true;
+        }
+
+        private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var w = new DeliveryConfirmationsWindow(year);
+            w.Show();
+        }
+
+        private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new SaveFileDialog() {
+                FileName = $"Über-Unterlieferungen-{year}.csv",
+                DefaultExt = "csv",
+                Filter = "CSV-Datei (*.csv)|*.csv",
+                Title = $"Über-/Unterlieferungen {year} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
+                return;
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
+            try {
+                using var file = new StreamWriter(d.FileName, false, Encoding.Latin1);
+                using var cnx = await AppDbContext.ConnectAsync();
+                await file.WriteLineAsync($"Auswertungen {year};;;;;;;;;;;");
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Über-/Unterlieferungen lt. gez. GA;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;GA;Lieferpflicht;Lieferrecht;Geliefert;Über-/Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, 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 sum = 0 DESC, 100.0 * sum / max_kg, m.mgnr;
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4).Split(',')[0];
+                        var addr = reader.GetString(5);
+                        var ga = reader.GetInt32(6);
+                        var minKg = reader.GetInt32(7);
+                        var maxKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        var s1 = sum < minKg ? $"{sum - minKg}" : sum > maxKg ? $"{sum - maxKg}" : "";
+                        var s2 = sum < minKg ? $"{sum * 100.0 / minKg - 100.0:0.0}" : sum > maxKg ? $"{sum * 100.0 / maxKg - 100:0.0}" : "";
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{ga};{minKg};{maxKg};{sum};{s1};{s2}");
+                    }
+                }
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Unterlieferungen lt. Flächenbindungen;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Vertrag;Fläche;Lieferpflicht;Geliefert;Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, 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
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4).Split(',')[0];
+                        var addr = reader.GetString(5);
+                        var id = reader.GetString(6);
+                        var area = reader.GetInt32(7);
+                        var minKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id};{area};{minKg};{sum};{sum - minKg};{sum * 100.0 / minKg - 100.0:0.0}");
+                    }
+                }
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Lieferungen pro Mitglied und Sorte;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Sorte;Attribut;Geliefert;Fläche;Ertrag");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, 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
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4).Split(',')[0];
+                        var addr = reader.GetString(5);
+                        var id = reader.GetString(6);
+                        var sum = reader.GetInt32(7);
+                        var area = reader.GetInt32(8);
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id[..2]};{id[2..]};{sum};{area};{(area > 0 ? sum * 10000 / area : "")}");
+                    }
+                }
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            Mouse.OverrideCursor = null;
+        }
+
+        private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
+            var w = new ChartWindow();
+            w.Show();
+        }
+    }
+}

Elwig/Windows/TestWindow.xaml

@@ -19,9 +19,9 @@
         <Button x:Name="ChartButton" Content="Chart" Click="ChartButton_Click"
                 Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 
-        <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print"
+        <Button x:Name="PdfDeliveryButton" Content="Lieferschein Erzeugen" Click="PdfDeliveryButton_Click" Tag="Print" IsEnabled="False"
                 Margin="260,190,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print"
+        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print" IsEnabled="False"
                 Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
     </Grid>
 </Window>

Elwig/Windows/TestWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Elwig.Documents;
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
@@ -51,7 +52,7 @@ namespace Elwig.Windows {
         }
 
         private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var ctx = new AppDbContext();
             using var doc = new DeliveryNote(await ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).LastAsync(), ctx);
             await doc.Generate();
@@ -60,7 +61,7 @@ namespace Elwig.Windows {
         }
 
         private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
             using var ctx = new AppDbContext();
             using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx);
             await doc.Generate();

Elwig/fetch-resources.bat

@@ -3,3 +3,4 @@
 mkdir "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
+::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"

Installer/Files/config.ini

@@ -2,6 +2,7 @@
 [general]
 ; Only needed, if more than one branch is stored in database
 branch = Zweigstelle
+;debug = true
 
 [database]
 ; Relative or absolute path to database file

Installer/MainComponents.wxs

@@ -7,9 +7,12 @@
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
         <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
       </Component>
-	  <Component Directory="InstallFolder">
-	    <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
-	  </Component>
+      <Component Directory="InstallFolder">
+        <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/>
+      </Component>
+      <Component Directory="InstallFolder">
+        <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
+      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>

Installer/Package.wxs

@@ -3,7 +3,7 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
 	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">

Setup/Bundle.wxs

@@ -1,7 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\elwig.ico" >
+  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico" >
 	<BootstrapperApplication>
-      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />   
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />
 	</BootstrapperApplication>
 	  
     <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists" Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle" />

Tests/HelpersUtilsTest.cs

@@ -72,14 +72,14 @@ namespace Tests {
         [Test]
         public void Test_SplitAddress() {
             Assert.Multiple(() => {
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 1"), Is.EqualTo(("Winzerstra<EFBFBD>e", "1")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 1"), Is.EqualTo(("Winzerstraße", "1")));
                 Assert.That(Utils.SplitAddress("Auf dem Feld 12"), Is.EqualTo(("Auf dem Feld", "12")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 5a"), Is.EqualTo(("Winzerstra<EFBFBD>e", "5a")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 1-3/2"), Is.EqualTo(("Winzerstra<EFBFBD>e", "1-3/2")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 3/4/5"), Is.EqualTo(("Winzerstra<EFBFBD>e", "3/4/5")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 7/2/4/77"), Is.EqualTo(("Winzerstra<EFBFBD>e", "7/2/4/77")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 95b"), Is.EqualTo(("Winzerstra<EFBFBD>e", "95b")));
-                Assert.That(Utils.SplitAddress("Winzerstra<EFBFBD>e 1, TOP 3"), Is.EqualTo(("Winzerstra<EFBFBD>e", "1, TOP 3")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 5a"), Is.EqualTo(("Winzerstraße", "5a")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 1-3/2"), Is.EqualTo(("Winzerstraße", "1-3/2")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 3/4/5"), Is.EqualTo(("Winzerstraße", "3/4/5")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 7/2/4/77"), Is.EqualTo(("Winzerstraße", "7/2/4/77")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 95b"), Is.EqualTo(("Winzerstraße", "95b")));
+                Assert.That(Utils.SplitAddress("Winzerstraße 1, TOP 3"), Is.EqualTo(("Winzerstraße", "1, TOP 3")));
             });
         }