Bump version to 0.2.0

Elwig.sln

@@ -6,7 +6,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elwig", "Elwig\Elwig.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{30D7700A-7B0A-4E5D-B839-B4C1D95E307E}"
 EndProject
-Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Setup", "Setup\Setup.wixproj", "{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}"
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Installer", "Installer\Installer.wixproj", "{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}"
+EndProject
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "Setup", "Setup\Setup.wixproj", "{952E309C-2090-4978-8996-65900D8E8FA4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,6 +70,22 @@ Global
 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x64.Build.0 = Release|x64
 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x86.ActiveCfg = Release|x86
 		{4A82C9C0-EB6D-409C-B0B2-09A5F727D16F}.Release|x86.Build.0 = Release|x86
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|Any CPU.Build.0 = Debug|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x64.ActiveCfg = Debug|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x64.Build.0 = Debug|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x86.ActiveCfg = Debug|x86
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Debug|x86.Build.0 = Debug|x86
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|Any CPU.ActiveCfg = Release|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|Any CPU.Build.0 = Release|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|ARM64.Build.0 = Release|ARM64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x64.ActiveCfg = Release|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x64.Build.0 = Release|x64
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x86.ActiveCfg = Release|x86
+		{952E309C-2090-4978-8996-65900D8E8FA4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Elwig/App.xaml

@@ -11,17 +11,13 @@
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Dest}"/>
-                <TextBlock Text=" ("/>
+                <TextBlock Text="{Binding Ort.Name, StringFormat='{} ({0})'}"/>
-                <TextBlock Text="{Binding Ort.Name}"/>
-                <TextBlock Text=")"/>
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Key="KgNrTemplate">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
-                <TextBlock Text=" ("/>
+                <TextBlock Text="{Binding KgNr, StringFormat='{} ({0:00000})'}"/>
-                <TextBlock Text="{Binding KgNr}"/>
-                <TextBlock Text=")"/>
             </StackPanel>
         </DataTemplate>
         <DataTemplate x:Key="MemberAdminNameTemplate">
@@ -55,7 +51,7 @@
 
         <DataTemplate x:Key="ModifierTemplate">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}" MinWidth="150" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}" MinWidth="250" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding ValueStr}"/>
             </StackPanel>
         </DataTemplate>

Elwig/App.xaml.cs

@@ -29,7 +29,7 @@ namespace Elwig {
         public static string? BranchFaxNr { get; private set; }
         public static string? BranchMobileNr { get; private set; }
         public static IList<IScale> Scales { get; private set; }
-        public static ClientParameters Client { get; private set;  }
+        public static ClientParameters Client { get; private set; }
 
         public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
@@ -58,22 +58,34 @@ namespace Elwig {
 
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
             using (var ctx = new AppDbContext()) {
-                if (!ctx.Database.CanConnect()) {
+                try {
-                    MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                    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;
+                        }
+                    }
+                } catch (Exception e) {
+                    MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
-                } else {
+                    return;
-                    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));
                 }
             }
             Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
             Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
 
-            Client = new();
-
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
+                var id = s[0];
                 try {
-                    var id = s[0];
                     var type = s[1]?.ToLower();
                     var model = s[2];
                     var cnx = s[3];
@@ -87,6 +99,7 @@ namespace Elwig {
                         throw new ArgumentException($"Invalid scale type: \"{type}\"");
                     }
                 } catch (Exception e) {
+                    list.Add(new InvalidScale(id));
                     MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
@@ -125,11 +138,6 @@ namespace Elwig {
             base.OnStartup(evt);
         }
 
-        protected override void OnExit(ExitEventArgs evt) {
-            Utils.RunBackground("PDF Close", () => Documents.Pdf.Close());
-            base.OnExit(evt);
-        }
-
         private void PrintingReadyChanged() {
             Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
         }

Elwig/Dialogs/AbwertenDialog.xaml

@@ -0,0 +1,59 @@
+<Window x:Class="Elwig.Dialogs.AbwertenDialog"
+        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.Dialogs"
+        mc:Ignorable="d"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False"
+        Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
+        Title="Teillieferung abwerten" Height="190" Width="400">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="70"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Margin="10,10,10,10" Grid.ColumnSpan="2" TextWrapping="Wrap" TextAlignment="Center">
+            Welche Menge der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/>
+            von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/><LineBreak/>
+            mit <Run x:Name="TextWeight" FontWeight="Bold" Text="1&#x202f;000&#x202f;kg"/> soll abgewertet werden?
+        </TextBlock>
+
+        <Label Content="Gewicht:" Margin="10,70,10,10"/>
+        <Grid Grid.Column="1" Width="70" Height="25" Margin="0,70,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <TextBox x:Name="WeightInput" TextAlignment="Right" Padding="2,2,17,2"
+                     TextChanged="WeightInput_TextChanged"/>
+            <Label Content="kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/>
+        </Grid>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsEnabled="False" IsDefault="True"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AbwertenDialog.xaml.cs

@@ -0,0 +1,33 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AbwertenDialog : Window {
+
+        public int Weight;
+
+        public AbwertenDialog(string lsnr, string name, int weight) {
+            Weight = weight;
+            InitializeComponent();
+            TextLsNr.Text = lsnr;
+            TextMember.Text = name;
+            TextWeight.Text = $"{weight:N0}\u202fkg";
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Weight = int.Parse(WeightInput.Text);
+            Close();
+        }
+
+        private void UpdateButtons() {
+            ConfirmButton.IsEnabled = int.TryParse(WeightInput.Text, out var w) && w > 0 && w <= Weight;
+        }
+
+        private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger(WeightInput, true, 5);
+            UpdateButtons();
+        }
+    }
+}

Elwig/Dialogs/DeliveryExtractionDialog.xaml

@@ -0,0 +1,60 @@
+<Window x:Class="Elwig.Dialogs.DeliveryExtractionDialog"
+        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.Dialogs"
+        mc:Ignorable="d"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False"
+        Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
+        Title="Teillieferung extrahieren" Height="210" Width="380">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="200"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Margin="10,10,0,10" TextWrapping="Wrap">
+            Was soll mit der Teillieferung <Run x:Name="TextLsNr" FontWeight="Bold" Text="20201010A000/1"/><LineBreak/>
+            von <Run x:Name="TextMember" FontWeight="Bold" Text="Max Mustermann"/> geschehen?
+        </TextBlock>
+        <RadioButton x:Name="NewDeliveryButton" Content="Neue Lieferung erstellen"
+                     Margin="10,80,0,10" HorizontalAlignment="Left" VerticalAlignment="Top"
+                     Checked="Selection_Changed" Unchecked="Selection_Changed"/>
+        <RadioButton x:Name="AddToDeliveryButton" Content="Zu Lieferung hinzufügen"
+                     Margin="10,100,0,10" HorizontalAlignment="Left" VerticalAlignment="Top"
+                     Checked="Selection_Changed" Unchecked="Selection_Changed"/>
+
+        <ListBox x:Name="DeliveryList" Grid.Column="1" Margin="10,10,10,45"
+                 SelectionChanged="DeliveryList_SelectionChanged"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.ColumnSpan="2" IsEnabled="False" IsDefault="True"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.ColumnSpan="2" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/DeliveryExtractionDialog.xaml.cs

@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Elwig.Dialogs {
+    public partial class DeliveryExtractionDialog : Window {
+
+        public string? AddTo;
+
+        public DeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) {
+            InitializeComponent();
+            TextLsNr.Text = lsnr;
+            TextMember.Text = name;
+            NewDeliveryButton.IsEnabled = !single;
+            DeliveryList.IsEnabled = false;
+            DeliveryList.ItemsSource = lsnrs;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            AddTo = NewDeliveryButton.IsChecked == true ? "new" : DeliveryList.SelectedItem as string;
+            Close();
+        }
+
+        private void UpdateButtons() {
+            ConfirmButton.IsEnabled = NewDeliveryButton.IsChecked == true || (AddToDeliveryButton.IsChecked == true && DeliveryList.SelectedItem != null);
+            DeliveryList.IsEnabled = AddToDeliveryButton.IsChecked == true;
+        }
+
+        private void Selection_Changed(object sender, RoutedEventArgs evt) {
+            UpdateButtons();
+        }
+
+        private void DeliveryList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            UpdateButtons();
+        }
+    }
+}

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml

@@ -0,0 +1,53 @@
+<Window x:Class="Elwig.Dialogs.LinearPriceIncreaseDialog"
+        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.Dialogs"
+        mc:Ignorable="d"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False"
+        Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        FocusManager.FocusedElement="{Binding ElementName=PriceInput}"
+        Title="Linear wachsen" Height="140" Width="270">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="55"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <Label Content="Preis:" Margin="10,20,10,10"/>
+        <Grid Grid.Column="1" Width="145" Height="25" Margin="0,20,0,0" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <TextBox x:Name="PriceInput" TextAlignment="Right" Padding="2,2,30,2"
+                     TextChanged="PriceInput_TextChanged"/>
+            <Label Content="€/kg" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10" Padding="2,4,2,4"/>
+        </Grid>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="17,0,133,10" IsEnabled="False" IsDefault="True"
+                Click="ConfirmButton_Click" Grid.ColumnSpan="2" HorizontalAlignment="Stretch"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="0,0,20,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml.cs

@@ -0,0 +1,30 @@
+using Elwig.Helpers;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class LinearPriceIncreaseDialog : Window {
+
+        public double Price = 0.0;
+
+        public LinearPriceIncreaseDialog() {
+            InitializeComponent();
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Price = double.Parse(PriceInput.Text.Replace("\u202f", ""));
+            Close();
+        }
+
+        private void UpdateButtons(ValidationResult res) {
+            ConfirmButton.IsEnabled = res.IsValid;
+        }
+
+        private void PriceInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var res = Validator.CheckDecimal(PriceInput, true, 2, 8);
+            UpdateButtons(res);
+        }
+    }
+}

Elwig/Dialogs/ManualWeighingDialog.xaml.cs

@@ -15,7 +15,7 @@ namespace Elwig.Dialogs {
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
-            Weight = int.Parse(WeightInput.Text.Replace("\u202f", ""));
+            Weight = int.Parse(WeightInput.Text);
             Reason = Regex.Replace(ReasonInput.Text, @"\s+", "").Trim();
             if (Reason == "") {
                 Reason = null;
@@ -26,7 +26,7 @@ namespace Elwig.Dialogs {
         }
 
         private void UpdateButtons() {
-            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0 && ReasonInput.Text.Trim().Length > 0;
+            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0;
         }
 
         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {

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" />
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">
@@ -15,6 +15,4 @@
     </div>
     <aside>@Raw(Model.Aside)</aside>
 </div>
-<main>
+@RenderBody()
-    @RenderBody()
-</main>

Elwig/Documents/BusinessDocument.cshtml.cs

@@ -5,15 +5,16 @@ namespace Elwig.Documents {
 
         public Member Member;
         public bool IncludeSender = false;
-        public string Aside { get; set; }
+        public bool UseBillingAddress = false;
-        public string? Location { get; set; }
+        public string Aside;
+        public string? Location;
 
         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
             Member = m;
             Location = App.BranchName;
             IncludeSender = includeSender;
-            var uid = (m.UstId ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
+            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
-            Aside = $"<table><colgroup><col span='1' style='width: 2.25cm;'/><col span='1' style='width: 100%;'/></colgroup>" +
+            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
                 $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
                 $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
@@ -24,10 +25,11 @@ namespace Elwig.Documents {
         public string Address {
             get {
                 var b = Member.BillingAddress;
-                var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz;
+                if (b != null && UseBillingAddress) {
-                if (b != null) {
+                    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";
                 }
             }

Elwig/Documents/BusinessLetter.cshtml

@@ -2,7 +2,8 @@
 @inherits TemplatePage<Elwig.Documents.BusinessLetter>
 @model Elwig.Documents.BusinessLetter
 @{ Layout = "BusinessDocument"; }
-
+<main>
 <p>Sehr geehrtes Mitglied,</p>
 <p>nein.</p>
 <p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p>
+</main>

Elwig/Documents/CreditNote.cshtml

@@ -0,0 +1,86 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.CreditNote>
+@model Elwig.Documents.CreditNote
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-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>
+            <col style="width: 24mm;"/>
+            <col style="width: 6mm;"/>
+            <col style="width: 31mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 8mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 17mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <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="2" colspan="2">Gradation</th>
+                <th colspan="2">Zu-/Abschläge</th>
+                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
+                <th rowspan="2">Betrag</th>
+            </tr>
+            <tr>
+                <th>Abs.</th>
+                <th>Rel.</th>
+                <th>Gewicht</th>
+                <th>Preis</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th>[@Model.CurrencySymbol/kg]</th>
+                <th>[%]</th>
+                <th>[kg]</th>
+                <th>[@Model.CurrencySymbol/kg]</th>
+                <th>[@Model.CurrencySymbol]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int? weight, decimal? amount) {
+                    var w = weight == null || weight == 0 ? "-" : $"{weight:N0}";
+                    return $"<td class='weight'>{w}</td><td class='amount'>{amount?.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)))}</td>";
+                }
+                string? last = null;
+            }
+            @foreach (var part in Model.Parts) {
+                var pmt = part.Payment;
+                var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
+                var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
+                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
+                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
+                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
+                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
+                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</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)))
+                    <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)))
+                    </tr>
+                }
+                last = part.SortId;
+            }
+        </tbody>
+    </table>
+</main>

Elwig/Documents/CreditNote.cshtml.cs

@@ -0,0 +1,39 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class CreditNote : BusinessDocument {
+
+        public Credit Credit;
+        public string? Text;
+        public string CurrencySymbol;
+        public string[] BucketNames;
+        public int Precision;
+        public IEnumerable<DeliveryPart> Parts;
+
+        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
+            UseBillingAddress = true;
+            Credit = c;
+            Aside = Aside.Replace("</table>", "") +
+                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
+                $"<tr><th>TG-Nr.</th><td>{c.TgId}</td></tr>" +
+                $"<tr><th>Überw. am</th><td>{c.Payment.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Datum/Zeit</th><td>{c.ModifiedTimestamp:dd.MM.yyyy} / {c.ModifiedTimestamp:HH:mm}</td></tr>" +
+                $"</tbody></table>";
+            Text = App.Client.TextDeliveryNote;
+            DocumentId = $"Tr.-Gutschr. {c.TgId}";
+            CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
+            BucketNames = c.Payment.Variant.BucketNames;
+            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
+                """).ToList();
+        }
+    }}

Elwig/Documents/DeliveryNote.cshtml

@@ -2,27 +2,59 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
+<main>
 <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 <h1>@Model.Title</h1>
-@if (Model.Delivery.Parts.Count > 2) {
+@{
-    <p>Siehe nächste Seite.</p>
+    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-    if (Model.Delivery.Year == Model.CurrentNextSeason) {
-        <p>Gesamtlieferung usw.</p>
-    }
-    <hr class="page-break"/>
 }
+<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: 1cm;"/>
+        <col style="width: 10.00mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 3cm;"/>
+        <col style="width: 30.00mm;"/>
-        <col style="width: 1.25cm;"/>
+        <col style="width: 12.50mm;"/>
-        <col style="width: 1.25cm;"/>
+        <col style="width: 12.50mm;"/>
-        <col style="width: 1.5cm;"/>
+        <col style="width: 15.00mm;"/>
     </colgroup>
     <thead>
         <tr>
@@ -54,12 +86,12 @@
             @if (part.Modifiers.Count() > 0) {
                 var first = true;
                 foreach (var mod in part.Modifiers) {
-                    <tr class="tight @(first ? "first" : "")"><td></td><td>@Raw(first ? "<i>Zu-/Abschläge:</i>" : "")</td><td colspan="3">@mod.Name</td><td style="white-space: pre;">@mod.ValueStr</td></tr>
+                    <tr class="tight @(first ? "first" : "")"><td></td><td>@Raw(first ? "<i>Zu-/Abschläge:</i>" : "")</td><td colspan="3"><b>@mod.Name</b></td><td style="white-space: pre;">@mod.ValueStr</td></tr>
                     first = false;
                 }
             }
             <tr><td></td><td colspan="5">
-                @(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {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"))
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
@@ -70,8 +102,7 @@
         }
         @if (Model.Delivery.Parts.Count() > 1) {
             <tr class="main sum">
-                <td style="text-align: center;">&sum;</td>
+                <td colspan="6">Gesamt:</td>
-                <td colspan="5"></td>
                 <td style="text-align: center;">@($"{Model.Delivery.Oe:N0}")</td>
                 <td style="text-align: center;">@($"{Model.Delivery.Kmw:N1}")</td>
                 <td style="text-align: right;">@($"{Model.Delivery.Weight:N0}")</td>
@@ -82,11 +113,60 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (Model.Delivery.Parts.Count <= 2 && Model.Delivery.Year == Model.CurrentNextSeason) {
+@if (displayStats) {
-    <p>Gesamtlieferung usw.</p>
+    <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();
+                }
+                <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)))
+                </tr>
+                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
+                    if (right > 0 && obligation > 0) {
+                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
+                            <th>@name</th>
+                            @Raw(FormatRow(obligation, right, sum))
+                        </tr>
+                    }
+                }
+            </tbody>
+        </table>
+    </div>
 }
+</main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "bottom" : "hidden")">
+    <div class="@(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

Elwig/Documents/DeliveryNote.cshtml.cs

@@ -1,12 +1,16 @@
+using Elwig.Helpers;
 using Elwig.Models;
+using System.Collections.Generic;
 
 namespace Elwig.Documents {
     public class DeliveryNote : BusinessDocument {
 
         public Delivery Delivery;
         public string? Text;
+        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
 
-        public DeliveryNote(Delivery d) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+        public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+            UseBillingAddress = true;
             Delivery = d;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
@@ -14,8 +18,9 @@ namespace Elwig.Documents {
                 $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
                 $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
-            Text = App.Client.DeliveryNoteText;
+            Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
+            MemberBuckets = ctx.GetMemberBuckets(d.Member, d.Year).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/Document.cshtml

@@ -1,26 +1,29 @@
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.Document>
 @model Elwig.Documents.Document
-
 <!DOCTYPE html>
 <html lang="de-AT">
 <head>
     <title>@Model.Title</title>
+    <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
     <script>
-        window.PagedConfig = { auto: false };
+        const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25;
-        if (!navigator.webdriver) {
+        const heightMain = heightA4 - heightFooter - heightHeader;
-            window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); });
+        function px2mm(px1, px2) {
-            window.addEventListener("afterprint", () => { location.reload(); });
+            return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10;
         }
     </script>
-    <script src="@Raw(Model.DataPath)\resources\paged.polyfill.js"></script>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
-    <link rel="stylesheet" href="@Raw(Model.DataPath)\resources\style.css" />
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
 </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>
     <div class="footer-wrapper">
         <div class="pre-footer">
             <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>

Elwig/Documents/Document.cshtml.cs

@@ -8,17 +8,28 @@ namespace Elwig.Documents {
 
         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 = $"{c.NameFull}<br/>" +
+            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
-                $"{c.Address} \u00b7 {c.Plz} {c.Ort} \u00b7 Österreich \u00b7 " +
+                .Item(c.NameFull).NextLine()
-                $"Tel.: {c.PhoneNr} \u00b7 Fax: {c.FaxNr}<br/>{c.EmailAddress} \u00b7 {c.Website} \u00b7 " +
+                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
-                $"Betriebs-Nr.: {c.LfbisNr} \u00b7 UID: {c.UstId}<br/>" +
+                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
-                $"BIC: {c.Bic} \u00b7 IBAN: {c.Iban}";
+                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                .ToString();
             Date = DateTime.Today;
         }
 
@@ -32,33 +43,30 @@ namespace Elwig.Documents {
             GC.SuppressFinalize(this);
         }
 
-        public string DataPath { get; set; }
+        private Task<string> Render() {
-        public int CurrentNextSeason { get; set; }
-        public string Title { get; set; }
-        public string Header { get; set; }
-        public string Footer { get; set; }
-        public DateTime Date { get; set; }
-        public string? DocumentId { get; set; }
-
-        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 {
                 throw new InvalidOperationException("Invalid document object");
             }
-            return await Html.CompileRenderAsync(name, this);
+            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());
+                await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
                 await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
             }
-            Pdf.UpdateMetadata(pdf.FilePath, Title, App.Client.NameFull);
             PdfFile = pdf;
         }
 

Elwig/Documents/Html.cs

@@ -18,6 +18,7 @@ namespace Elwig.Documents {
             await e.CompileTemplateAsync("BusinessDocument");
             await e.CompileTemplateAsync("BusinessLetter");
             await e.CompileTemplateAsync("DeliveryNote");
+            await e.CompileTemplateAsync("CreditNote");
 
             Engine = e;
             evtHandler();

Elwig/Documents/Pdf.cs

@@ -1,64 +1,45 @@
-using System;
 using System.Threading.Tasks;
-using System.Windows;
-using PdfSharp.Pdf.IO;
-using PuppeteerSharp;
 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 Chromium = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe";
         private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static IBrowser? Browser = null;
+        private static readonly FilesManager WeasyPrintManager = new();
-        public static bool IsReady => Browser != null;
+        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) {
-            Browser = await Puppeteer.LaunchAsync(new LaunchOptions {
+            if (!WeasyPrintManager.IsFilesExsited()) {
-                Headless = true,
+                await WeasyPrintManager.InitFilesAsync();
-                ExecutablePath = Chromium,
+            }
-                // paged.js uses XHRs to load styles, so this is needed
+            WeasyPrintPython = Path.Combine(WeasyPrintManager.FolderPath, "python.exe");
-                Args = new[] { "--allow-file-access-from-files" },
-            });
             evtHandler();
         }
 
-        public static async Task Close() {
-            if (Browser == null) return;
-            await Browser.CloseAsync();
-            Browser = null;
-        }
-
         public static async Task Convert(string htmlPath, string pdfPath) {
-            if (Browser == null) throw new InvalidOperationException("The puppeteer engine has not been initialized yet");
+            var p = new Process() { StartInfo = new() {
-            using var page = await Browser.NewPageAsync();
+                FileName = WeasyPrintPython,
-            page.Console += OnConsole;
+                CreateNoWindow = true,
-            await page.GoToAsync($"file://{htmlPath}");
+                WorkingDirectory = WeasyPrintDir,
-            await page.EvaluateFunctionAsync("async () => { await window.PagedPolyfill.preview(); }");
+                RedirectStandardError = true,
-            await page.PdfAsync(pdfPath, new() {
+            } };
-                PreferCSSPageSize = true,
+            p.StartInfo.EnvironmentVariables["PATH"] = "Scripts;gtk3;" + Environment.GetEnvironmentVariable("PATH");
-                //Format = PaperFormat.A4,
+            p.StartInfo.ArgumentList.Add("scripts/weasyprint.exe");
-                DisplayHeaderFooter = false,
+            p.StartInfo.ArgumentList.Add("-e");
-                MarginOptions = new() {
+            p.StartInfo.ArgumentList.Add("utf8");
-                    Top = "0mm",
+            p.StartInfo.ArgumentList.Add(htmlPath);
-                    Right = "0mm",
+            p.StartInfo.ArgumentList.Add(pdfPath);
-                    Bottom = "0mm",
+            p.Start();
-                    Left = "0mm",
+            await p.WaitForExitAsync();
-                },
+            var stderr = await p.StandardError.ReadToEndAsync();
-            });
+            if (p.ExitCode != 0) throw new Exception(stderr);
-        }
-
-        private static void OnConsole(object? sender, ConsoleEventArgs e) {
-            MessageBox.Show(e.Message.Text);
-        }
-
-        public static void UpdateMetadata(string path, string title, string author) {
-            using var doc = PdfReader.Open(path);
-            doc.Info.Title = title;
-            doc.Info.Author = author;
-            doc.Save(path);
         }
 
         public static void Show(TempFile file, string title) {

Elwig/Documents/style-businessdocument.css

@@ -0,0 +1,131 @@
+
+.address-wrapper, aside, main {
+    overflow: hidden;
+}
+
+.spacing {
+    height: 20mm;
+}
+
+.info-wrapper {
+    width: 100%;
+    height: 45mm;
+    margin: 0 0 2mm 0;
+    position: relative;
+}
+
+.address-wrapper {
+    height: 45mm;
+    width: 85mm;
+    margin: 0;
+    padding: 5mm;
+    position: absolute;
+    left: -5mm;
+    top: 0;
+}
+
+.address-wrapper .sender {
+    height: 4em;
+    font-size: 8pt;
+    padding: 1em 0;
+}
+
+address {
+    height: 5em;
+    white-space: pre-line;
+    font-size: 12pt;
+    font-style: normal;
+}
+
+aside {
+    height: 40mm;
+    width: 75mm;
+    margin: 0;
+    position: absolute;
+    left: 100mm;
+    top: 5mm;
+}
+
+aside table {
+    border-collapse: collapse;
+    border: 0.5pt solid #808080;
+    width: 65mm;
+    margin-right: 10mm;
+}
+
+aside table thead:not(:first-child) tr {
+    border-top: 0.5pt solid #808080;
+}
+
+aside table thead th {
+    background-color: #E0E0E0;
+    font-size: 10pt;
+}
+
+aside table tbody th,
+aside table tbody td {
+    text-align: left;
+    font-size: 10pt;
+}
+
+aside table tbody th {
+    font-weight: normal;
+}
+
+main {
+    margin: 2em 0 1em 0;
+}
+
+main > *:first-child {
+    margin-top: 0;
+}
+
+.main-wrapper h1, .main-wrapper p {
+    font-size: 12pt;
+    margin: 1em 0;
+    text-align: justify;
+}
+
+.main-wrapper p {
+    widows: 3;
+    orphans: 3;
+    hyphens: manual;
+}
+
+.main-wrapper .date {
+    margin-bottom: 2em;
+    text-align: right;
+}
+
+.main-wrapper h1 {
+    margin-bottom: 2em;
+}
+
+.main-wrapper p.comment {
+    font-size: 10pt;
+}
+
+.main-wrapper .hidden {
+    break-before: avoid;
+}
+
+.main-wrapper .bottom {
+    bottom: 0;
+    position: absolute;
+    width: 165mm;
+}
+
+.main-wrapper .signatures {
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    margin: 20mm 0 2mm 0;
+}
+
+.main-wrapper .signatures > * {
+    width: 50mm;
+    border-top: 0.5pt solid black;
+    padding-top: 1mm;
+    text-align: center;
+    font-size: 10pt;
+}

Elwig/Documents/style-creditnote.css

@@ -0,0 +1,64 @@
+
+table.credit {
+    font-size: 10pt;
+}
+
+table.credit th,
+table.credit td {
+    padding: 0 0.25mm;
+}
+
+table.credit thead {
+    font-size: 8pt
+}
+
+table.credit thead th {
+    font-weight: normal;
+    font-style: italic;
+    vertical-align: bottom;
+}
+
+table.credit td {
+    vertical-align: top;
+}
+
+table.credit .oe,
+table.credit .kmw {
+    text-align: center;
+}
+
+table.credit .dpnr {
+    text-align: center;
+}
+
+table.credit .amount,
+table.credit .weight {
+    text-align: right;
+}
+
+table.credit .rel,
+table.credit .abs {
+    text-align: center;
+}
+
+table.credit .amount.sum {
+    vertical-align: bottom;
+    padding-bottom: 1mm;
+}
+
+table.credit tbody tr:not(.first):not(.last) {
+    break-before: avoid;
+    break-after: avoid;
+}
+
+table.credit tbody tr.first td {
+    padding-top: 1mm;
+}
+
+table.credit tbody tr.last td {
+    padding-bottom: 1mm;
+}
+
+table.credit tbody tr.new {
+    border-top: 0.5pt solid black;
+}

Elwig/Documents/style-deliverynote.css

@@ -0,0 +1,95 @@
+
+table.delivery {
+    margin-bottom: 5mm;
+}
+
+table.delivery tr:not(.main) {
+    break-before: avoid;
+}
+
+table.delivery th {
+    font-weight: normal;
+    font-style: italic;
+    font-size: 10pt;
+}
+
+table.delivery th.main {
+    text-align: left;
+}
+
+table.delivery tr.main td {
+    font-weight: bold;
+    padding-top: 2mm;
+}
+
+table.delivery tbody tr:not(.main) td {
+    font-size: 8pt;
+}
+
+table.delivery tr.tight:not(.first) td {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+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;
+}
+*/
+
+table.delivery tr.sum {
+    border-top: 0.5pt solid black;
+    break-before: avoid;
+}
+
+table.delivery tr.sum td {
+    padding-top: 1mm;
+}
+
+table.delivery-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 {
+    padding: 0.125mm 0;
+}
+
+table.delivery-stats:not(.expanded) tr.optional {
+    display: none;
+}
+
+table.delivery-stats thead th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: right;
+}
+
+table.delivery-stats thead th:first-child {
+    text-align: left;
+}
+
+table.delivery-stats.expanded tbody {
+    font-size: 10pt;
+}
+
+table.delivery-stats td {
+    text-align: right;
+}
+
+table.delivery-stats tbody th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: left;
+}

Elwig/Documents/style-page.css

@@ -0,0 +1,71 @@
+
+.m1, .m2, .m3 {
+    height: 0;
+    width: 10mm;
+    position: fixed;
+    left: -25mm;
+    border-top: 0.5pt solid black;
+}
+.m1.r, .m2.r, .m3.r {
+    left: initial;
+    right: -20mm;
+}
+.m1 {top: 80mm;}
+.m2 {top: 123.5mm;}
+.m3 {top: 185mm;}
+
+.page-break {
+    break-before: page;
+}
+hr.page-break {
+    display: none;
+}
+
+@page {
+    size: A4;
+    margin: 25mm 20mm 35mm 25mm;
+
+    @bottom-center {
+        content: element(page-footer);
+    }
+}
+
+@media screen {
+    body, header, .footer-wrapper {
+        width: 210mm;
+    }
+
+    header, .address-wrapper, aside, main {
+        border: 1px solid lightgray;
+    }
+
+    .m1, .m2, .m3 {
+        display: none;
+    }
+
+    header {
+        top: 0;
+    }
+
+    .spacing {
+        height: 45mm;
+    }
+
+    .main-wrapper {
+        margin: 0 20mm 40mm 25mm;
+    }
+
+    .footer-wrapper {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: white;
+    }
+}
+
+@media print {
+    .page::after {
+        content: "Seite " counter(page) " von " counter(pages) !important;
+    }
+}

Elwig/Documents/style.css

@@ -12,20 +12,19 @@ body {
     margin: 0;
 }
 
-.m1, .m2, .m3 {
+table {
-    height: 0;
+    width: 100%;
-    width: 1cm;
+    border-collapse: collapse;
-    position: fixed;
+    table-layout: fixed;
-    left: 0;
-    border-top: 1pt solid black;
 }
 
-.m1 {top: 105mm;}
+table td,
-.m2 {top: 148.5mm;}
+table th {
-.m3 {top: 210mm;}
+    padding: 0.5mm 1mm;
+}
 
-header, .address-wrapper, aside, main {
+table th {
-    overflow: hidden;
+    text-align: center;
 }
 
 header {
@@ -36,142 +35,27 @@ header {
     left: 0;
     right: 0;
     text-align: center;
+    overflow: hidden;
 }
 
-header h1{
+header h1 {
     font-size: 18pt;
-    margin-top: 1cm;
+    margin-top: 10mm;
-}
-
-.spacing {
-    height: 20mm;
-}
-
-.info-wrapper {
-    width: 100%;
-    height: 45mm;
-    margin: 0 0 8.46mm 0;
-    position: relative;
-}
-
-.address-wrapper {
-    height: 45mm;
-    width: 85mm;
-    margin: 0;
-    padding: 5mm;
-    position: absolute;
-    left: 20mm;
-    top: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-}
-
-.address-wrapper .sender {
-    flex: 17.7mm 1 1;
-    font-size: 8pt;
-    display: flex;
-    flex-direction: column;
-    justify-content: flex-end;
-    padding-bottom: 2mm;
-}
-
-address {
-    flex: 27.3mm 1 1;
-    white-space: pre-line;
-    font-size: 12pt;
-    font-style: normal;
-}
-
-table td,
-table th {
-    padding: 0.5mm 1mm;
-}
-
-aside {
-    height: 40mm;
-    width: 75mm;
-    margin: 0;
-    position: absolute;
-    left: 125mm;
-    top: 5mm;
-}
-
-aside table {
-    border-collapse: collapse;
-    border: 1pt solid #808080;
-    width: calc(100% - 1cm);
-    margin-right: 1cm;
-}
-
-aside table thead:not(:first-child) tr {
-    border-top: 1pt solid #808080;
-}
-
-aside table thead th {
-    background-color: #E0E0E0;
-    font-size: 10pt;
-}
-
-aside table tbody th,
-aside table tbody td {
-    text-align: left;
-    font-size: 10pt;
-}
-
-aside table tbody th {
-    font-weight: normal;
-}
-
-main {
-    margin: 8.46mm 20mm 4.23mm 25mm;
-}
-
-main :first-child {
-    margin-top: 0;
-}
-
-main h1, main p {
-    font-size: 12pt;
-    margin: 1em 0;
-    text-align: justify;
-}
-
-main p {
-    widows: 3;
-    orphans: 3;
-    hyphens: auto;
-}
-
-main .date {
-    margin-bottom: 2em;
-    text-align: right;
-}
-
-main h1 {
-    margin-bottom: 2em;
-}
-
-main p.comment {
-    font-size: 10pt;
 }
 
 .footer-wrapper {
-    padding: 0 20mm 0 25mm;
     position: running(page-footer);
-    bottom: 0;
+    width: 165mm;
-    left: 0;
-    right: 0;
 }
 
 .pre-footer {
-    margin: 4.23mm 0;
+    margin: 1em 0;
     font-size: 10pt;
-    display: flex;
 }
 
 .pre-footer > * {
-    flex: 5cm 1 1;
+    display: inline-block;
+    width: 33%;
 }
 
 .pre-footer .date {
@@ -185,141 +69,27 @@ main p.comment {
 
 .pre-footer .page {
     text-align: right;
+    float: right;
 }
 
-.pre-fotter .page::after {
+.pre-footer .page::after {
     content: "Seite 1 von 1";
 }
 
 footer {
     font-size: 10pt;
-    border-top: 1pt solid black;
+    border-top: 0.5pt solid black;
     height: 25mm;
     padding-top: 1mm;
     text-align: center;
 }
 
-table {
-    width: 100%;
-    border-collapse: collapse;
-    table-layout: fixed;
-}
-
-table.delivery {
-    margin-bottom: 1cm;
-}
-
-table.delivery th {
-    font-weight: normal;
-    font-style: italic;
-    font-size: 10pt;
-}
-
-table.delivery th.main {
-    text-align: left;
-}
-
-table.delivery tr.main td {
-    font-weight: bold;
-    padding-top: 2mm;
-}
-
-table.delivery tbody tr:not(.main) td {
-    font-size: 8pt;
-}
-
-table.delivery tr.tight:not(.first) td {
-    padding-top: 0;
-    padding-bottom: 0;
-}
-
-table.delivery tr.tight.first td {
-    padding-bottom: 0;
-}
-
-table.delivery tr.tight:has(+ tr:not(.tight)) td {
-    padding-bottom: 0.5mm !important;
-}
-
-table.delivery tr.sum {
-    border-top: 1pt solid black;
-}
-
-table.delivery tr.sum td {
-    padding-top: 1mm;
-}
-
 .hidden {
     visibility: hidden;
 }
 
-main .bottom {
-    bottom: 0;
-    position: absolute;
-    width: calc(100% - 25mm - 20mm);
-}
-
-main .signatures {
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
-    margin: 20mm 0 5mm 0;
-}
-
-main .signatures > * {
-    width: 5cm;
-    border-top: 1pt solid black;
-    padding-top: 1mm;
-    text-align: center;
-    font-size: 10pt;
-}
-
 hr {
     border: none;
-    border-top: 1pt solid black;
+    border-top: 0.5pt solid black;
     margin: 5mm 0;
 }
-
-hr.page-break {
-    display: none;
-    break-after: page;
-}
-
-@page {
-    size: A4;
-    margin: 25mm 0 35mm 0;
-    @bottom-center {
-        content: element(page-footer);
-    }
-}
-
-@media screen {
-    body, header, .footer-wrapper {
-        width: 210mm;
-    }
-    header, .address-wrapper, aside, main {
-        border: 1pt solid lightgray;
-    }
-    .m1, .m2, .m3 {display: none;}
-    header {top: 0;}
-    .spacing {height: 45mm;}
-    .main-wrapper {
-        margin-bottom: 40mm;
-    }
-    .footer-wrapper {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: white;
-    }
-}
-
-@media print {
-    .page::after {
-        content: "Seite " counter(page) " von " counter(pages);
-    }
-    .footer-wrapper {
-        display: none;
-    }
-}

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.0.1</Version>
+    <Version>0.2.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
@@ -16,15 +16,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
+    <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.16" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1774.30" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-    <PackageReference Include="PdfSharp" Version="1.50.5147" />
-    <PackageReference Include="PuppeteerSharp" Version="10.0.0" />
     <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>

Elwig/Helpers/AppDbContext.cs

@@ -6,6 +6,9 @@ using System.IO;
 using System;
 using System.Windows;
 using Microsoft.Extensions.Logging;
+using Microsoft.Data.Sqlite;
+using System.Text.RegularExpressions;
+using System.Collections.Generic;
 
 namespace Elwig.Helpers {
     public class AppDbContext : DbContext {
@@ -28,17 +31,20 @@ namespace Elwig.Helpers {
         public DbSet<WineAttr> WineAttributes { get; private set; }
         public DbSet<WineCult> WineCultivations { get; private set; }
         public DbSet<Branch> Branches { get; private set; }
+        public DbSet<AreaComType> AreaCommitmentTypes { get; private set; }
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
-        public DbSet<AreaComAttr> AreaCommitmentAttributes { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         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; }
+        public DbSet<Credit> Credits { get; private set; }
 
         private readonly StreamWriter? LogFile = null;
         public static DateTime LastWriteTime => File.GetLastWriteTime(App.Config.DatabaseFile);
@@ -60,7 +66,20 @@ namespace Elwig.Helpers {
             }
             SavedLastWriteTime = LastWriteTime;
             SavedChanges += OnSavedChanges;
+        }
 
+        public static SqliteConnection Connect() {
+            var cnx = new SqliteConnection(ConnectionString);
+            cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
+            cnx.Open();
+            return cnx;
+        }
+
+        public static async Task<SqliteConnection> ConnectAsync() {
+            var cnx = new SqliteConnection(ConnectionString);
+            cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
+            await cnx.OpenAsync();
+            return cnx;
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
@@ -103,14 +122,14 @@ namespace Elwig.Helpers {
         public async Task<int> NextMgNr() {
             int c = await Members.Select(m => m.MgNr).MinAsync();
             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 100) c = a; });
+                .ForEach(a => { if (a <= c + 1000) c = a; });
             return c + 1;
         }
 
         public async Task<int> NextFbNr() {
             int c = await AreaCommitments.Select(ac => ac.FbNr).MinAsync();
             (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 100) c = a; });
+                .ForEach(a => { if (a <= c + 1000) c = a; });
             return c + 1;
         }
 
@@ -118,21 +137,21 @@ namespace Elwig.Helpers {
             var dateStr = date.ToString("yyyy-MM-dd");
             int c = 0;
             (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 10) c = a; });
+                .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
 
         public async Task<int> NextDId(int year) {
             int c = 0;
             (await Deliveries.Where(d => d.Year == year).Select(d => d.DId).ToListAsync())
-                .ForEach(a => { if (a <= c + 10) c = a; });
+                .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
 
         public async Task<int> NextDPNr(int year, int did) {
             int c = 0;
             (await DeliveryParts.Where(p => p.Year == year && p.DId == did).Select(d => d.DPNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 10) c = a; });
+                .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
 
@@ -142,5 +161,71 @@ namespace Elwig.Helpers {
                 .OrderBy(q => q.MinKmw)
                 .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();
+                if (modifiers.Contains(m)) {
+                    DeliveryPartModifier dpm = mod ?? this.CreateProxy<DeliveryPartModifier>();
+                    dpm.Year = part.Year;
+                    dpm.DId = part.DId;
+                    dpm.DPNr = part.DPNr;
+                    dpm.ModId = m.ModId;
+                    if (mod == null) {
+                        await AddAsync(dpm);
+                    } else {
+                        Update(dpm);
+                    }
+                } else {
+                    if (mod != null) {
+                        Remove(mod);
+                    }
+                }
+            }
+        }
+
+        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
+                ));
+            }
+
+            return list;
+        }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -0,0 +1,130 @@
+using Microsoft.Data.Sqlite;
+using System.Collections.Generic;
+using System.Linq;
+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;
+
+        public Billing(int year, int avnr) {
+            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));
+        }
+
+        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 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
+                    """;
+                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(",")
+                    ));
+                }
+            }
+
+            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
+                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
+                    // 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();
+                    continue;
+                }
+
+                // TODO
+            }
+
+        }
+    }
+}

Elwig/Helpers/Billing/Graph.cs

@@ -0,0 +1,119 @@
+using ScottPlot;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class Graph : ICloneable {
+
+        public string Type { get; set; }
+        public int Num { get; set; }
+        private int MinX { get; set; }
+        private int MaxX { get; set; }
+        public string Contracts { get; set; }
+        public double[] DataX { get; set; }
+        public double[] DataY { get; set; }
+
+        public Graph(int num, int minX, int maxX) {
+            Type = "oe";
+            Num = num;
+            Contracts = "";
+            MinX = minX;
+            MaxX = maxX;
+
+            DataX = DataGen.Range(MinX, MaxX + 1);
+            DataY = DataGen.Zeros(MaxX - MinX + 1);
+        }
+
+        public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
+            Type = type;
+            Num = num;
+            Contracts =  contracts;
+            MinX = minX;
+            MaxX = maxX;
+
+            DataX = DataGen.Range(MinX, MaxX + 1);
+            DataY = DataGen.Zeros(MaxX - MinX + 1);
+            ParseGraphData(graphData);
+        }
+
+        public Graph(string type, int num, int minX, int maxX, string contracts, double[] dataX, double[] dataY) {
+            Type = type;
+            Num = num;
+            MinX = minX;
+            MaxX = maxX;
+            Contracts = contracts;
+            DataX = dataX;
+            DataY = dataY;
+        }
+
+        private void ParseGraphData(JsonObject graphData) {
+            var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
+
+            if (GraphPoints.Keys.Count < 1) {
+                return;
+            }
+
+            var minKey = GraphPoints.Keys.Order().First();
+            var maxKey = GraphPoints.Keys.OrderDescending().First();
+
+            if (!GraphPoints.ContainsKey(MinX)) {
+                GraphPoints.Add(MinX, GraphPoints.GetValueOrDefault(minKey));
+            }
+            if (!GraphPoints.ContainsKey(MaxX)) {
+                GraphPoints.Add(MaxX, GraphPoints.GetValueOrDefault(maxKey));
+            }
+
+            var keys = GraphPoints.Keys.Order().ToArray();
+
+            for (int i = 0; i < keys.Length; i++) {
+                double point1Value = GraphPoints[keys[i]];
+                if (i + 1 < keys.Length) {
+                    double point2Value = GraphPoints[keys[i + 1]];
+                    if (point1Value == point2Value) {
+                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX; j++) {
+                            DataY[j] = point1Value;
+                        }
+                    } else {
+                        int steps = Math.Abs(keys[i + 1] - keys[i]);
+                        double step = (point2Value - point1Value) / steps;
+
+                        DataY[keys[i] - MinX] = point1Value;
+                        DataY[keys[i + 1] - MinX] = point2Value;
+
+                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX - 1; j++) {
+                            DataY[j + 1] = Math.Round(DataY[j] + step, 4); // TODO richtig runden
+                        }
+                    }
+                }
+                else {
+                    for (int j = keys[i] - MinX; j < DataX.Length; j++) {
+                        DataY[j] = point1Value;
+                    }
+                }
+            }
+        }
+
+        public JsonObject ToJson() {
+            JsonObject graph = new();
+
+            if (DataY[0] != DataY[1]) {
+                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
+            }
+            for (int i = 1; i < DataX.Length - 1; i++) {
+                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
+                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
+                }
+            }
+            if (DataY[^1] != DataY[^2]) {
+                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
+            }
+            return graph;
+        }
+
+        public object Clone() {
+            return new Graph(Type, Num, MinX, MaxX, Contracts, (double[])DataX.Clone(), (double[])DataY.Clone());
+        }
+    }
+}

Elwig/Helpers/Billing/Transaction.cs

@@ -0,0 +1,32 @@
+using Elwig.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Helpers.Billing {
+    public class Transaction {
+
+        public readonly Member Member;
+        public readonly long AmountCent;
+        public readonly string Currency;
+        public readonly int Nr;
+
+        public Transaction(Member m, decimal amount, string currency, int nr) {
+            Member = m;
+            AmountCent = (long)Math.Round(amount * 100);
+            Currency = currency;
+            Nr = nr;
+        }
+
+        public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
+            var last = variant.Season.PaymentVariants.Where(v => v.TransferDate != null).OrderBy(v => v.TransferDate).LastOrDefault();
+            var dict = last?.MemberPayments.ToDictionary(m => m.MgNr, m => m.Amount) ?? new();
+            return variant.Credits
+                .OrderBy(c => c.MgNr)
+                .Select(c => new Transaction(c.Member, c.Amount, variant.Season.CurrencyCode, c.TgNr))
+                .ToList();
+        }
+
+        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -1,16 +1,26 @@
 using Elwig.Models;
+using Microsoft.Data.Sqlite;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace Elwig.Helpers {
     public class ClientParameters {
 
-        public enum Type { Matzen, GWK };
+        public enum Type { Matzen, Winzerkeller };
+
+        public bool IsMatzen => Client == Type.Matzen;
+        public bool IsWinzerkeller => Client == Type.Winzerkeller;
+        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
+        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
+        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
 
         public string NameToken;
         public string NameShort;
-        public string NameShortened;
         public string Name;
-        public string NameSuffix;
+        public string? NameSuffix;
-        public string NameFull => $"{Name} {NameSuffix}";
+        public string NameType;
+        public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;
 
         public PostalDest PostalDest {
@@ -19,15 +29,15 @@ namespace Elwig.Helpers {
                 Ort = value.AtPlz.Ort.Name;
             }
         }
-        public int Plz { get; private set; }
+        public int Plz;
-        public string Ort { get; private set; }
+        public string Ort;
         public string Address;
         public string Sender1 => $"{NameShort} | {Address} | {Plz} {Ort}";
         public string Sender2;
 
         public string? Iban;
         public string? Bic;
-        public string? UstId;
+        public string? UstIdNr;
         public string? LfbisNr;
 
         public string? PhoneNr;
@@ -35,33 +45,98 @@ namespace Elwig.Helpers {
         public string? EmailAddress;
         public string? Website;
 
-        public string? DeliveryNoteText;
+        public int DeliveryObligation;
+        public int DeliveryRight;
+        public decimal VatNormal;
+        public decimal VatReduced;
+        public decimal VatFlatRate;
 
-        public ClientParameters() {
+        public string? TextDeliveryNote;
-            NameToken = "WGM";
+
-            NameShort = "WG Matzen";
+        public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
-            NameShortened = "Winzergenossenschaft f. Matzen u. Umgebung";
+
-            Name = "Winzergenossenschaft für Matzen und Umgebung";
+        public ClientParameters(Dictionary<string, string?> parameters) {
-            NameSuffix = "reg. Gen.m.b.H.";
+            try {
-            Client = Type.Matzen;
+                NameToken = parameters["CLIENT_NAME_TOKEN"] ?? throw new KeyNotFoundException();
-            Plz = 2243;
+                NameShort = parameters["CLIENT_NAME_SHORT"] ?? throw new KeyNotFoundException();
-            Ort = "Matzen";
+                Name = parameters["CLIENT_NAME"] ?? throw new KeyNotFoundException();
-            Address = "Schloßstraße 6";
+                NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX");
-            PhoneNr = "+43 2289 2221";
+                NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
-            FaxNr = "+43 2289 2221";
+                switch (Name) {
-            EmailAddress = "winzermatzen@aon.at";
+                    case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break;
-            Website = "winzermatzen.at";
+                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
-            LfbisNr = "0901768";
+                };
-            UstId = "ATU16328105";
+
-            Bic = "RLNWATWWGAE";
+                Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
-            Iban = "AT92 3209 2000 0240 0075";
+                Ort = parameters["CLIENT_ORT"] ?? throw new KeyNotFoundException();
-            Sender2 = "E Österreichische Post AG Eco Brief";
+                Address = parameters["CLIENT_ADDRESS"] ?? throw new KeyNotFoundException();
-            DeliveryNoteText = "Das Mitglied erklärt, dass die gelieferte Ware dem österreichischen Weingesetz entspricht und insbesondere die " +
+                PhoneNr = parameters.GetValueOrDefault("CLIENT_PHONE");
-                "Bestimmungen über die Mengenbeschränkungen sowie für die Erzeugung von Wein besonderer Leseart eingehalten wird. " +
+                FaxNr = parameters.GetValueOrDefault("CLIENT_FAX");
-                "Alle maßgeblichen Veränderungen obiger Angaben sind der Winzergenossenschaft unverzüglich zu melden. " +
+                EmailAddress = parameters.GetValueOrDefault("CLIENT_EMAIL");
-                "Das Mitglied bestätigt weiters mit seiner Unterschrift, dass die gelieferten Trauben entsprechend der guten Herstellungspraxis erzeugt wurden, " +
+                Website = parameters.GetValueOrDefault("CLIENT_WEBSITE");
-                "insbesondere die Einhaltung der vom Hersteller vorgegebenen Wartefristen für Pflanzenschutzmittel. " +
+                LfbisNr = parameters.GetValueOrDefault("CLIENT_LFBISNR");
-                "Weiters wird bestätigt, dass die Datenschutzerklärung der Winzergenossenschaft für Matzen und Umgebung in der Übernahmestelle zur freien Entnahme aufliegt.";
+                UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
+                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(".", ","));
+
+                Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
+                TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+            } catch {
+                throw new KeyNotFoundException();
+            }
+        }
+
+        private IEnumerable<(string, string?)> GetParamValues() {
+            return new (string, string?)[] {
+                ("CLIENT_NAME_TOKEN", NameToken),
+                ("CLIENT_NAME_SHORT", NameShort),
+                ("CLIENT_NAME", Name),
+                ("CLIENT_NAME_SUFFIX", NameSuffix),
+                ("CLIENT_NAME_TYPE", NameType),
+                ("CLIENT_PLZ", Plz.ToString()),
+                ("CLIENT_ORT", Ort),
+                ("CLIENT_ADDRESS", Address),
+                ("CLIENT_PHONE", PhoneNr),
+                ("CLIENT_FAX", FaxNr),
+                ("CLIENT_EMAIL", EmailAddress),
+                ("CLIENT_WEBSITE", Website),
+                ("CLIENT_LFBISNR", LfbisNr),
+                ("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(",", ".")),
+                ("DOCUMENT_SENDER", Sender2),
+                ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+            };
+        }
+
+        public async Task UpdateValues() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using var cmd = cnx.CreateCommand();
+            var pv = GetParamValues();
+            cmd.CommandText = "INSERT INTO client_parameter (param, value) VALUES " +
+                string.Join(", ", pv.Select((pv, i) => $"(@p{i}, " + (pv.Item2 != null ? $"@v{i}" : "NULL") + ")")) +
+                " ON CONFLICT DO UPDATE SET value = excluded.value";
+
+            int i = 0;
+            foreach (var (p, v) in pv) {
+                cmd.Parameters.Add(new SqliteParameter($"@p{i}", p));
+                if (v != null)
+                    cmd.Parameters.Add(new SqliteParameter($"@v{i}", v));
+                i++;
+            }
+
+            await cmd.ExecuteNonQueryAsync();
         }
     }
 }

Elwig/Helpers/Config.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using IniParser;
 using IniParser.Model;
 
@@ -25,7 +24,7 @@ namespace Elwig.Helpers {
             var parser = new FileIniDataParser();
             IniData? ini = null;
             try {
-                ini = parser.ReadFile(FileName, Encoding.UTF8);
+                ini = parser.ReadFile(FileName, Utils.UTF8);
             } catch {}
 
             if (ini == null || !ini.TryGetKey("database.file", out string db)) {
@@ -70,7 +69,7 @@ namespace Elwig.Helpers {
         }
 
         public void Write() {
-            using var file = new StreamWriter(FileName, false, Encoding.UTF8);
+            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");
             file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n");

Elwig/Helpers/ControlUtils.cs

@@ -25,6 +25,10 @@ namespace Elwig.Helpers {
             }
         }
 
+        public static void SetInputNotDefault(Control input) {
+            SetControlBrush(input, Brushes.Gold);
+        }
+
         public static void SetInputChanged(Control input) {
             SetControlBrush(input, Brushes.Orange);
         }
@@ -102,6 +106,7 @@ namespace Elwig.Helpers {
             var selectedIds = selector.SelectedItems.Cast<object>().Select(i => getId(i)).ToList();
             selector.ItemsSource = source;
             if (source != null) {
+                selector.SelectedItems.Clear();
                 foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(getId(i))))
                     selector.SelectedItems.Add(i);
             }
@@ -198,5 +203,21 @@ namespace Elwig.Helpers {
         public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items, Func<object?, object?> getId) {
             SelectCheckComboBoxItems(ccb, getId, items?.Select(i => getId(i)));
         }
+
+        public static object? GetInputValue(Control input) {
+            if (input is TextBox tb) {
+                return tb.Text;
+            } else if (input is ComboBox sb) {
+                return sb.SelectedItem;
+            } else if (input is Xceed.Wpf.Toolkit.CheckComboBox ccb) {
+                return ccb.SelectedItems.Cast<object>().ToArray();
+            } else if (input is CheckBox cb) {
+                return cb.IsChecked?.ToString();
+            } else if (input is RadioButton rb) {
+                return rb.IsChecked?.ToString();
+            } else {
+                return null;
+            }
+        }
     }
 }

Elwig/Helpers/Export/Bki.cs

@@ -0,0 +1,67 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System;
+
+namespace Elwig.Helpers.Export {
+
+    using Row = Tuple<(string?, string?, string?, string?, string, int, string, int), (string, int, string, string, string, int, string, double, double)>;
+
+    public class Bki : Csv<Row> {
+
+        private readonly string _clientData;
+
+        public Bki(string filename) : base(filename, ';', Encoding.Latin1) {
+            Header = """
+                EDV-Liste zum automatischen Einlesen in die Weindatenbank;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                Stammdaten;;;;;;;;;;;;;;Transportschein;;;;;;;;;;;;;;;;
+                Empfänger:;;;;;;;Versender:;;;;;;;;;;;;;;;;;;;;;;;
+                Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Betriebsnr;Name od. Firmenname;Vorname;Straße;Hausnr;Plz;Ort;Datum der Lieferung;Menge in kg;Art;Weiß;Rot;Sorte1;Sorte2;Sorte3;Qualitätsstufe;Jahrgang;Herkunft;°KMW;°Oe;Vollablieferer;Ha Gesamt;Ha Ertragsfähig;Flächenbindung in Ha für AMA
+                """;
+            var c = App.Client;
+            var (a1, a2) = Utils.SplitAddress(c.Address);
+            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};{a2};{c.Plz};{c.Ort}";
+        }
+
+        public async Task ExportAsync(int year) {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = $"""
+                SELECT lfbis_nr, family_name, name, billing_name, address, plz, ort, area,
+                       date, weight, type, sortid, qualid, year, hkid, kmw, oe
+                FROM v_bki_delivery
+                WHERE year = {year}
+                """;
+            var r = await cmd.ExecuteReaderAsync();
+            List<Row> rows = new();
+            while (await r.ReadAsync()) {
+                rows.Add(new(
+                    (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
+                    (r.GetString(8), r.GetInt32(9), r.GetString(10), r.GetString(11), r.GetString(12), r.GetInt32(13), r.GetString(14), r.GetDouble(15), r.GetDouble(16))
+                ));
+            }
+
+            await ExportAsync(rows);
+        }
+
+        public void Export(int year) {
+            ExportAsync(year).GetAwaiter().GetResult();
+        }
+
+        public override string FormatRow(Row row) {
+            var (member, delivery) = row;
+            var (lfBisNr, familyName, name, billingName, address, plz, ort, area) = member;
+            var (date, weight, type, sortid, qualid, year, hkid, kmw, oe) = delivery;
+
+            var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
+            var (a1, a2) = Utils.SplitAddress(address);
+            var memberData = $"{lfBisNr};{n1};{n2};{a1};{a2};{plz};{ort}";
+            var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
+            var vollData = $"N;;;{area / 10_000.0}";
+
+            return $"{_clientData};{memberData};{deliveryData};{vollData}";
+        }
+    }
+}

Elwig/Helpers/Export/Csv.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public abstract class Csv<T> : IExporter<T> {
+
+        public static string FileExtension => "csv";
+
+        private readonly StreamWriter _writer;
+        protected readonly char Separator;
+        protected string? Header;
+
+        public Csv(string filename, char separator = ';') : this(filename, separator, Utils.UTF8) { }
+
+        public Csv(string filename, char separator, Encoding encoding) {
+            _writer = new StreamWriter(filename, false, encoding);
+            Separator = separator;
+        }
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+            _writer.Dispose();
+        }
+
+        public ValueTask DisposeAsync() {
+            GC.SuppressFinalize(this);
+            return _writer.DisposeAsync();
+        }
+
+        public async Task ExportAsync(IEnumerable<T> data, IProgress<double>? progress = null) {
+            progress?.Report(0.0);
+            int count = data.Count() + 2, i = 0;
+
+            if (Header != null) await _writer.WriteLineAsync(Header);
+            progress?.Report(100.0 * ++i / count);
+
+            foreach (var row in data) {
+                await _writer.WriteLineAsync(FormatRow(row));
+                progress?.Report(100.0 * ++i / count);
+            }
+
+            await _writer.FlushAsync();
+            progress?.Report(100.0);
+        }
+
+        public void Export(IEnumerable<T> data, IProgress<double>? progress = null) {
+            ExportAsync(data, progress).GetAwaiter().GetResult();
+        }
+
+        public string FormatRow(IEnumerable row) {
+            return string.Join(Separator, row);
+        }
+
+        public abstract string FormatRow(T row);
+    }
+}

Elwig/Helpers/Export/Ebics.cs

@@ -0,0 +1,109 @@
+using Elwig.Helpers.Billing;
+using Elwig.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public class Ebics : IBankingExporter {
+
+        public static string FileExtension => "xml";
+
+        private readonly StreamWriter _writer;
+        private readonly DateOnly _date;
+        private readonly int _year;
+        private readonly string _name;
+        private readonly int _nr;
+
+        public Ebics(PaymentVar variant, string filename) {
+            _writer = new(filename, false, Utils.UTF8);
+            _date = variant.TransferDate ?? DateOnly.Parse("2021-01-10"); //throw new ArgumentException("TransferDate has to be set in PaymentVar");
+            _year = variant.Year;
+            _name = variant.Name;
+            _nr = variant.AvNr;
+        }
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+            _writer.Dispose();
+        }
+
+        public ValueTask DisposeAsync() {
+            GC.SuppressFinalize(this);
+            return _writer.DisposeAsync();
+        }
+
+        public void Export(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
+            ExportAsync(transactions, progress).GetAwaiter().GetResult();
+        }
+
+        public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
+            progress?.Report(0.0);
+            var nbOfTxs = transactions.Count();
+            int count = nbOfTxs + 2, i = 0;
+            var ctrlSum = Transaction.FormatAmountCent(transactions.Sum(tx => tx.AmountCent));
+            var msgId = $"ELWIG-{App.Client.NameToken}-{_year}-AV{_nr:00}";
+            var pmtInfId = $"{msgId}-1";
+
+            await _writer.WriteLineAsync($"""
+                <?xml version="1.0" encoding="UTF-8"?>
+                <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09"
+                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                          xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 pain.001.001.09.xsd">
+                  <CstmrCdtTrfInitn>
+                    <GrpHdr>
+                      <MsgId>{msgId}</MsgId>
+                      <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
+                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
+                      <CtrlSum>{ctrlSum}</CtrlSum>
+                      <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
+                    </GrpHdr>
+                    <PmtInf>
+                      <PmtInfId>{pmtInfId}</PmtInfId>
+                      <PmtMtd>TRF</PmtMtd>
+                      <NbOfTxs>{nbOfTxs}</NbOfTxs>
+                      <CtrlSum>{ctrlSum}</CtrlSum>
+                      <ReqdExctnDt><Dt>{_date:yyyy-MM-dd}</Dt></ReqdExctnDt>
+                      <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
+                      <DbtrAcct><Id><IBAN>{App.Client.Iban?.Replace(" ", "")}</IBAN></Id></DbtrAcct>
+                      <DbtrAgt><FinInstnId><BICFI>{App.Client.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></DbtrAgt>
+                """);
+            progress?.Report(100.0 * ++i / count);
+
+            foreach (var tx in transactions) {
+                var a = (IAddress?)tx.Member.BillingAddress ?? tx.Member;
+                var (a1, a2) = Utils.SplitAddress(a.Address);
+                var id = $"ELWIG-{App.Client.NameToken}-{_year}-TG{tx.Nr:0000}";
+                var info = $"{_name} - Traubengutschrift {_year}/{tx.Nr:000}";
+                await _writer.WriteLineAsync($"""
+                          <CdtTrfTxInf>
+                            <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
+                            <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmountCent(tx.AmountCent)}</InstdAmt></Amt>
+                            <Cdtr>
+                              <Nm>{a.Name}</Nm>
+                              <PstlAdr>
+                                <StrtNm>{a1}</StrtNm><BldgNb>{a2}</BldgNb>
+                                <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
+                                <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
+                              </PstlAdr>
+                            </Cdtr>
+                            <CdtrAcct><Id><IBAN>{tx.Member.Iban}</IBAN></Id><CdtrAcct>
+                            <CdtrAgt><FinInstnId><BICFI>{tx.Member.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></CdtrAgt>
+                            <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
+                          </CdtTrfTxInf>
+                    """);
+                progress?.Report(100.0 * ++i / count);
+            }
+
+            await _writer.WriteLineAsync("""
+                    </PmtInf>
+                  </CstmrCdtTrfInitn>
+                </Document>
+                """);
+            await _writer.FlushAsync();
+            progress?.Report(100.0);
+        }
+    }
+}

Elwig/Helpers/Export/Elba.cs

@@ -0,0 +1,15 @@
+using Elwig.Helpers.Billing;
+using System;
+
+namespace Elwig.Helpers.Export {
+    public class Elba : Csv<Transaction>, IBankingExporter {
+
+        public static new string FileExtension => "elba";
+
+        public Elba(string filename) : base(filename) { }
+
+        public override string FormatRow(Transaction row) {
+            throw new NotImplementedException();
+        }
+    }
+}

Elwig/Helpers/Export/IBankingExporter.cs

@@ -0,0 +1,8 @@
+using Elwig.Helpers.Billing;
+
+namespace Elwig.Helpers.Export {
+    /// <summary>
+    /// Interface for exporting banking data
+    /// </summary>
+    public interface IBankingExporter : IExporter<Transaction> { }
+}

Elwig/Helpers/Export/IExporter.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public interface IExporter<T> : IDisposable, IAsyncDisposable {
+        /// <summary>
+        /// The default file extension of the exported files to be used (whithout a preceding ".")
+        /// </summary>
+        static abstract string FileExtension { get; }
+
+        /// <summary>
+        /// Export the given data to the given file.
+        /// </summary>
+        /// <param name="data">The data to be exported</param>
+        /// <param name="progress">The progress object to report to</param>
+        void Export(IEnumerable<T> data, IProgress<double>? progress = null);
+
+        /// <summary>
+        /// Asynchronosly export the given data to the given file.
+        /// </summary>
+        /// <param name="data">The data to be exported</param>
+        /// <param name="progress">The progress object to report to</param>
+        Task ExportAsync(IEnumerable<T> data, IProgress<double>? progress = null);
+    }
+}

Elwig/Helpers/IAddress.cs

@@ -0,0 +1,9 @@
+using Elwig.Models;
+
+namespace Elwig.Helpers {
+    public interface IAddress {
+        string Name { get; }
+        string Address { get; }
+        PostalDest PostalDest { get; }
+    }
+}

Elwig/Helpers/Utils.cs

@@ -9,10 +9,14 @@ using System.IO.Ports;
 using System.Net.Sockets;
 using Elwig.Dialogs;
 using System.Text;
+using System.Numerics;
+using Elwig.Models;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
 
+        public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
+
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
@@ -20,6 +24,10 @@ 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 FromToRegex = GeneratedFromToRegex();
+        public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
+        public static readonly Regex AddressRegex = GeneratedAddressRegex();
 
         [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedSerialRegex();
@@ -27,6 +35,18 @@ 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-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToRegex();
+
+        [GeneratedRegex(@"^([0-9]{1,2}:[0-9]{2})?-([0-9]{1,2}:[0-9]{2})?$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToTimeRegex();
+
+        [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedAddressRegex();
+
         private static readonly ushort[] Crc16ModbusTable = {
             0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
             0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
@@ -173,27 +193,135 @@ namespace Elwig.Helpers {
             if (!searchKeywords.Any())
                 return 0;
 
-            words = words.Select(w => w?.ToLower());
+            return words
-            int i = 0;
+                .Select(w => {
-            foreach (string? c in words) {
+                    w = w?.ToLower();
-                if (c == null) continue;
+                    var p = w?.ToLower()?.Split(" ");
-                var parts = c.Split(" ");
+                    if (w == null || p == null)
-                if (searchKeywords.Any(f => c == f)) {
+                        return 0;
-                    i += 100;
+
-                } else if (searchKeywords.Any(f => parts.Any(a => a == f))) {
+                    var t1 = searchKeywords.Where(f => w == f).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    i += 90;
+                    var t2 = searchKeywords.Where(f => p.Any(a => a == f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                } else if (searchKeywords.Any(f => parts.Any(a => a.StartsWith(f)))) {
+                    var t3 = searchKeywords.Where(f => p.Any(a => a.StartsWith(f))).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    i += 50;
+                    var t4 = searchKeywords.Where(f => w.Contains(f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                } else if (searchKeywords.Any(f => f != null && c.Contains(f))) {
+                    if (t1 > 0) {
-                    i += 1;
+                        return 4 + t1;
-                }
+                    } else if (t2 > 0) {
-            }
+                        return 3 + t2;
-            return i;
+                    } else if (t3 > 0) {
+                        return 2 + t3;
+                    } else if (t4 > 0) {
+                        return 1 + t4;
+                    } else {
+                        return 0;
+                    }
+                })
+                .Sum();
         }
 
         public static (int, string?)? ShowManualWeighingDialog() {
             var d = new ManualWeighingDialog();
             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
         }
+
+        public static int? ShowAbwertenDialog(string lsnr, string name, int weight) {
+            var d = new AbwertenDialog(lsnr, name, weight);
+            return d.ShowDialog() == true ? d.Weight : null;
+        }
+
+        public static double? ShowLinearPriceIncreaseDialog() {
+            var d = new LinearPriceIncreaseDialog();
+            return d.ShowDialog() == true ? d.Price : null;
+        }
+
+        public static string? ShowDeliveryExtractionDialog(string lsnr, string name, bool single, IEnumerable<string> lsnrs) {
+            var d = new DeliveryExtractionDialog(lsnr, name, single, lsnrs);
+            return d.ShowDialog() == true ? d.AddTo : null;
+        }
+
+        public static Footer GenerateFooter(string lineBreak, string seperator) {
+            return new Footer(lineBreak, seperator);
+        }
+
+        public class Footer {
+            private string Text = "";
+            private readonly string LineBreak;
+            private readonly string Seperator;
+            private bool FirstLine = true;
+            private bool FirstItemInLine = true;
+
+            public Footer(string lineBreak, string seperator) {
+                LineBreak = lineBreak;
+                Seperator = seperator;
+            }
+
+            public Footer Item(string? text) {
+                if (text == null) return this;
+                Text += FirstItemInLine ? (FirstLine ? "" : LineBreak) : Seperator;
+                Text += text;
+                FirstLine = false;
+                FirstItemInLine = false;
+                return this;
+            }
+
+            public Footer Item(string name, string? text) {
+                return text == null ? this : Item($"{name}: {text}");
+            }
+
+            public Footer NextLine() {
+                FirstItemInLine = true;
+                return this;
+            }
+
+            public override string ToString() {
+                return Text;
+            }
+        }
+
+        public static string GetSign<T>(T number) where T : INumber<T>
+            => T.Sign(number) switch {
+                < 0 => "\u2212",  // minus
+                  0 => "\u00b1",  // plus minus
+                > 0 => "+",
+            };
+
+        public static double AggregateDeliveryPartsKmw(IEnumerable<DeliveryPart> parts)
+            => parts.Aggregate(
+                (Weight: 0, Kmw: 0.0),
+                (sum, item) => (
+                    sum.Weight + item.Weight,
+                    (sum.Kmw * sum.Weight + item.Kmw * item.Weight) / (sum.Weight + item.Weight)
+                ),
+                sum => sum.Kmw
+            );
+
+        public static string GenerateLsNr(Delivery d) => GenerateLsNr(d.Date, d.ZwstId, d.LNr);
+
+        public static string GenerateLsNr(DateOnly date, string zwstid, int lnr) => $"{date:yyyyMMdd}{zwstid}{lnr:000}";
+
+        public static (string, string?) SplitAddress(string address) {
+            var m = AddressRegex.Match(address);
+            return (m.Groups[1].Value, m.Groups[2].Value);
+        }
+
+        public static (string, string?) SplitName(string fullName, string? familyName) {
+            if (familyName == null || familyName == "") return (fullName, null);
+            var p0 = fullName.ToLower().IndexOf(familyName.ToLower());
+            if (p0 == -1) return (fullName, null);
+            var p1 = fullName.IndexOf(" und ");
+            var p2 = fullName.ToLower().LastIndexOf(" und ");
+            if (p1 != p2) {
+                if (p0 > p1) {
+                    // A und B familyName [und ...]
+                    return (fullName[p0..^0], fullName[0..(p0 - 1)]);
+                } else {
+                    // familyName und ... A und B
+                    var p3 = fullName.LastIndexOf(' ', p2 - 1);
+                    return (fullName[0..p3], fullName[(p3 + 1)..^0]);
+                }
+            } else {
+                return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            }
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -332,7 +332,7 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckUstId(TextBox input, bool required) {
+        public static ValidationResult CheckUstIdNr(TextBox input, bool required) {
             string text = "";
             int pos = input.CaretIndex;
             for (int i = 0, v = 0; i < input.Text.Length; i++) {

Elwig/Helpers/Weighing/InvalidScale.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Weighing {
+    public class InvalidScale : IScale {
+
+        public string Manufacturer => "NONE";
+        public string Model => "NONE";
+        public string ScaleId { get; private set; }
+        public int InternalScaleNr => 0;
+        public bool IsReady => false;
+        public bool HasFillingClearance => false;
+        public int? WeightLimit => null;
+        public string? LogPath => null;
+
+        public InvalidScale(string id) {
+            ScaleId = id;
+        }
+
+        public void Dispose() {
+            GC.SuppressFinalize(this);
+        }
+
+        public Task<WeighingResult> Weigh() {
+            throw new NotImplementedException();
+        }
+
+        public Task<WeighingResult> GetCurrentWeight() {
+            throw new NotImplementedException();
+        }
+
+        public Task Empty() {
+            throw new NotImplementedException();
+        }
+
+        public Task GrantFillingClearance() {
+            throw new NotImplementedException();
+        }
+
+        public Task RevokeFillingClearance() {
+            throw new NotImplementedException();
+        }
+    }
+}

Elwig/Models/AreaCom.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models {
     [Table("area_commitment"), PrimaryKey("FbNr")]
@@ -12,8 +10,8 @@ namespace Elwig.Models {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
-        [Column("sortid")]
+        [Column("vtrgid")]
-        public string SortId { get; set; }
+        public string VtrgId { get; set; }
 
         [Column("cultid")]
         public string CultId { get; set; }
@@ -42,8 +40,8 @@ namespace Elwig.Models {
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; }
 
-        [ForeignKey("SortId")]
+        [ForeignKey("VtrgId")]
-        public virtual WineVar WineVar { get; private set; }
+        public virtual AreaComType AreaComType { get; private set; }
 
         [ForeignKey("CultId")]
         public virtual WineCult WineCult { get; private set; }
@@ -53,11 +51,5 @@ namespace Elwig.Models {
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
-
-        [InverseProperty("AreaCom")]
-        public virtual ISet<AreaComAttr> AttributeEntries { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => AttributeEntries.Select(e => e.WineAttr);
     }
 }

Elwig/Models/AreaComAttr.cs

@@ -1,19 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Elwig.Models {
-    [Table("area_commitment_attribute"), PrimaryKey("FbNr", "AttrId")]
-    public class AreaComAttr {
-        [Column("fbnr")]
-        public int FbNr { get; set; }
-
-        [Column("attrid")]
-        public string AttrId { get; set; }
-
-        [ForeignKey("FbNr")]
-        public virtual AreaCom AreaCom { get; private set; }
-
-        [ForeignKey("AttrId")]
-        public virtual WineAttr WineAttr { get; private set; }
-    }
-}

Elwig/Models/AreaComType.cs

@@ -0,0 +1,51 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]
+    public class AreaComType {
+        [Column("vtrgid")]
+        public string VtrgId { get; set; }
+
+        [Column("sortid")]
+        public string SortId { get; set; }
+
+        [Column("attrid_1")]
+        public string? AttrId1 { get; set; }
+
+        [Column("attrid_2")]
+        public string? AttrId2 { get; set; }
+
+        [Column("disc")]
+        public string? Discriminator { get; set; }
+
+        [Column("min_kg_per_ha")]
+        public int? MinKgPerHa { get; set; }
+
+        [Column("max_kg_per_ha")]
+        public int? MaxKgPerHa { get; set; }
+
+        [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;
+        }
+
+        [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; }
+
+        [NotMapped]
+        public string DisplayName => WineVar.Name + (WineAttr1 != null ? $" {WineAttr1.Name}" : "") +
+            (WineAttr2 != null ? $" {WineAttr2.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
+    }
+}

Elwig/Models/BillingAddr.cs

@@ -1,9 +1,10 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models {
     [Table("member_billing_address"), PrimaryKey("MgNr")]
-    public class BillingAddr {
+    public class BillingAddr : IAddress {
         [Column("mgnr")]
         public int MgNr { get; set; }
 

Elwig/Models/Credit.cs

@@ -0,0 +1,104 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]
+    public class Credit {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("tgnr")]
+        public int TgNr { get; set; }
+
+        [NotMapped]
+        public string TgId => $"{Year}/{TgNr:000}";
+
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("net_amount")]
+        public long NetAmountValue { get; set; }
+        [NotMapped]
+        public decimal NetAmount {
+            get => Utils.DecFromDb(NetAmountValue, 2);
+            set => NetAmountValue = Utils.DecToDb(value, 2);
+        }
+
+        [Column("prev_net_amount")]
+        public long? PrevNetAmountValue { get; set; }
+        [NotMapped]
+        public decimal? PrevNetAmount {
+            get => PrevNetAmountValue != null ? Utils.DecFromDb(PrevNetAmountValue.Value, 2) : null;
+            set => PrevNetAmountValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
+        }
+
+        [Column("vat")]
+        public double VatValue { get; set; }
+        [NotMapped]
+        public decimal Vat {
+            get => (decimal)VatValue;
+            set => VatValue = (double)value;
+        }
+
+        [Column("vat_amount")]
+        public long VatAmountValue { get; private set; }
+        [NotMapped]
+        public decimal VatAmount {
+            get => Utils.DecFromDb(VatAmountValue, 2);
+        }
+
+        [Column("gross_amount")]
+        public long GrossAmountValue { get; private set; }
+        [NotMapped]
+        public decimal GrossAmount {
+            get => Utils.DecFromDb(GrossAmountValue, 2);
+        }
+
+        [Column("modifiers")]
+        public long? ModifiersValue { get; set; }
+        [NotMapped]
+        public decimal? Modifiers {
+            get => ModifiersValue != null ? Utils.DecFromDb(ModifiersValue.Value, 2) : null;
+            set => ModifiersValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
+        }
+
+        [Column("prev_modifiers")]
+        public long? PrevModifiersValue { get; set; }
+        [NotMapped]
+        public decimal? PrevModifiers {
+            get => PrevModifiersValue != null ? Utils.DecFromDb(PrevModifiersValue.Value, 2) : null;
+            set => PrevModifiersValue = value != null ? Utils.DecToDb(value.Value, 2) : null;
+        }
+
+        [Column("amount")]
+        public long AmountValue { get; private set; }
+        [NotMapped]
+        public decimal Amount {
+            get => Utils.DecFromDb(AmountValue, 2);
+        }
+
+        [Column("ctime")]
+        public long CTime { get; private set; }
+        [NotMapped]
+        public DateTime CreatedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [Column("mtime")]
+        public long MTime { get; private set; }
+        [NotMapped]
+        public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
+
+        [ForeignKey("Year, AvNr, MgNr")]
+        public virtual PaymentMember Payment { get; private set; }
+
+        [ForeignKey("Year, AvNr")]
+        public virtual PaymentVar Variant { get; private set; }
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; }
+    }
+}

Elwig/Models/Currency.cs

@@ -18,6 +18,6 @@ namespace Elwig.Models {
         public long? OneEuroValue { get; private set; }
 
         [NotMapped]
-        public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb((long)OneEuroValue, 6) : null;
+        public decimal? OneEuro => OneEuroValue != null ? Utils.DecFromDb(OneEuroValue.Value, 6) : null;
     }
 }

Elwig/Models/Delivery.cs

@@ -19,12 +19,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly Date {
-            get {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
-                return DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => DateString = value.ToString("yyyy-MM-dd");
-            }
-            set {
-                DateString = value.ToString("yyyy-MM-dd");
-            }
         }
 
         [Column("time")]
@@ -32,19 +28,13 @@ namespace Elwig.Models {
 
         [NotMapped]
         public TimeOnly? Time {
-            get {
+            get => (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
-                return (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
+            set => TimeString = value?.ToString("HH:mm:ss");
-            }
-            set {
-                TimeString = value?.ToString("HH:mm:ss");
-            }
         }
 
         [NotMapped]
         public DateTime DateTime {
-            get {
+            get => Date.ToDateTime(Time ?? TimeOnly.MinValue);
-                return Date.ToDateTime(Time ?? TimeOnly.MinValue);
-            }
             set {
                 Date = DateOnly.FromDateTime(value);
                 Time = TimeOnly.FromDateTime(value);
@@ -72,6 +62,9 @@ namespace Elwig.Models {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [ForeignKey("Year")]
+        public virtual Season Season { get; private set; }
+
         [InverseProperty("Delivery")]
         public virtual ISet<DeliveryPart> Parts { get; private set; }
 
@@ -84,24 +77,16 @@ namespace Elwig.Models {
 
         public string SortIdString => string.Join(", ", SortIds);
 
-        public double Kmw => Parts.Aggregate(
+        public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
-            (Weight: 0, Kmw: 0.0),
-            (sum, item) => (
-                sum.Weight + item.Weight,
-                (sum.Kmw * sum.Weight + item.Kmw * item.Weight) / (sum.Weight + item.Weight)
-            ),
-            sum => sum.Kmw
-        );
 
         public double Oe => Utils.KmwToOe(Kmw);
 
         public int SearchScore(IEnumerable<string> keywords) {
             var list = new string?[] {
-                LsNr, Year.ToString(), Date.ToString("dd.MM.yyyy"), Time?.ToString("HH:mm"),
+                LsNr, Time?.ToString("HH:mm"),
-                MgNr.ToString(), Member.FamilyName, Member.MiddleName, Member.GivenName, Member.BillingAddress?.Name,
+                Member.FamilyName, Member.MiddleName, Member.GivenName, Member.BillingAddress?.Name,
                 Comment
             }.ToList();
-            list.AddRange(Parts.Select(p => p.SortId).Distinct());
             list.AddRange(Parts.Select(p => p.Comment).Distinct());
             return Utils.GetSearchScore(list, keywords);
         }

Elwig/Models/DeliveryPart.cs

@@ -30,15 +30,10 @@ namespace Elwig.Models {
 
         [Column("kmw")]
         public double Kmw { get; set; }
-
         [NotMapped]
         public double Oe {
-            get {
+            get => Utils.KmwToOe(Kmw);
-                return Utils.KmwToOe(Kmw);
+            set => Kmw = Utils.OeToKmw(value);
-            }
-            set {
-                Kmw = Utils.OeToKmw(value);
-            }
         }
 
         [Column("qualid")]
@@ -105,8 +100,12 @@ namespace Elwig.Models {
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
         [NotMapped]
-        public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier);
+        public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 
+        [InverseProperty("DeliveryPart")]
+        public virtual PaymentDeliveryPart? Payment { get; private set; }
+
+        [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
     }
 }

Elwig/Models/Member.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace Elwig.Models {
     [Table("member"), PrimaryKey("MgNr")]
-    public class Member {
+    public class Member : IAddress {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
@@ -95,8 +95,8 @@ namespace Elwig.Models {
         [Column("lfbis_nr")]
         public string? LfbisNr { get; set; }
 
-        [Column("ustid")]
+        [Column("ustid_nr")]
-        public string? UstId { get; set; }
+        public string? UstIdNr { get; set; }
 
         [Column("volllieferant")]
         public bool IsVollLieferant { get; set; }
@@ -110,6 +110,9 @@ namespace Elwig.Models {
         [Column("active")]
         public bool IsActive { get; set; }
 
+        [Column("deceased")]
+        public bool IsDeceased { get; set; }
+
         [Column("iban")]
         public string? Iban { get; set; }
 
@@ -173,6 +176,9 @@ namespace Elwig.Models {
 
         public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
 
+        public int DeliveryRight => BusinessShares * App.Client.DeliveryRight;
+        public int DeliveryObligation => BusinessShares * App.Client.DeliveryObligation;
+
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {
                 MgNr.ToString(),

Elwig/Models/Modifier.cs

@@ -1,6 +1,8 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 namespace Elwig.Models {
     [Table("modifier"), PrimaryKey("Year", "ModId")]
@@ -11,6 +13,9 @@ namespace Elwig.Models {
         [Column("modid")]
         public string ModId { get; set; }
 
+        [Column("ordering")]
+        public int Ordering { get; set; }
+
         [Column("name")]
         public string Name { get; set; }
 
@@ -19,16 +24,18 @@ namespace Elwig.Models {
 
         [NotMapped]
         public decimal? Abs {
-            get {
+            get => AbsValue != null ? Season.DecFromDb(AbsValue.Value) : null;
-                return AbsValue != null ? Season.DecFromDb((long)AbsValue) : null;
+            set => AbsValue = value != null ? Season.DecToDb(value.Value) : null;
-            }
-            set {
-                AbsValue = value != null ? Season.DecToDb((decimal)value) : null;
-            }
         }
 
         [Column("rel")]
-        public double? Rel { get; set; }
+        public double? RelValue { get; set; }
+
+        [NotMapped]
+        public decimal? Rel {
+            get => (decimal?)RelValue;
+            set => RelValue = (double?)value;
+        }
 
         [Column("standard")]
         public bool IsStandard { get; set; }
@@ -39,9 +46,10 @@ namespace Elwig.Models {
         [ForeignKey("Year")]
         public virtual Season Season { get; private set; }
 
-        public string ValueStr => (Abs != null) ?
+        public string ValueStr =>
-            $"{(Abs < 0 ? " -" : "+")}{Math.Abs(Abs.Value)} {Season.Currency.Symbol}/kg" :
+            (Abs != null) ? $"{Utils.GetSign(Abs.Value)}{Math.Abs(Abs.Value).ToString("0." + string.Concat(Enumerable.Repeat('0', Season.Precision)))}\u00a0{Season.Currency.Symbol}/kg" :
-            $"{(Rel < 0 ? " -" : "+")}{Math.Abs(Rel.Value):P2}";
+            (Rel != null) ? $"{Utils.GetSign(Rel.Value)}{(Math.Abs(Rel.Value) < 0.1m ? "\u2007" : "")}{Math.Abs(Rel.Value):0.00##\u00a0%}" :
+            "";
 
         public override string ToString() {
             return Name;

Elwig/Models/PaymentDeliveryPart.cs

@@ -0,0 +1,158 @@
+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")]
+    public class PaymentDeliveryPart {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("mod_abs")]
+        public long ModAbsValue { get; set; }
+        [NotMapped]
+        public decimal ModAbs {
+            get => Variant.Season.DecFromDb(ModAbsValue);
+            set => ModAbsValue = Variant.Season.DecToDb(value);
+        }
+
+        [Column("mod_rel")]
+        public double ModRelValue { get; set; }
+        [NotMapped]
+        public decimal ModRel {
+            get => (decimal)ModRelValue;
+            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]
+        public decimal? Amount {
+            get => AmountValue != null ? Variant.Season.DecFromDb(AmountValue.Value) : null;
+            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; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart DeliveryPart { get; private set; }
+    }
+}

Elwig/Models/PaymentMember.cs

@@ -0,0 +1,34 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("payment_member"), PrimaryKey("Year", "AvNr", "MgNr")]
+    public class PaymentMember {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [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("MgNr")]
+        public virtual Member Member { get; private set; }
+
+        [InverseProperty("Payment")]
+        public virtual Credit? Credit { get; private set; }
+    }
+}

Elwig/Models/PaymentVar.cs

@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+
+namespace Elwig.Models {
+    [Table("payment_variant"), PrimaryKey("Year", "AvNr")]
+    public class PaymentVar {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+
+        [Column("date")]
+        public string DateString { get; set; }
+
+        [NotMapped]
+        public DateOnly Date {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => DateString = value.ToString("yyyy-MM-dd");
+        }
+
+        [Column("transfer_date")]
+        public string? TransferDateString { get; set; }
+
+        [NotMapped]
+        public DateOnly? TransferDate {
+            get => TransferDateString != null ? DateOnly.ParseExact(TransferDateString, "yyyy-MM-dd") : null;
+            set => TransferDateString = value?.ToString("yyyy-MM-dd");
+        }
+
+        [Column("test_variant")]
+        public bool TestVariant { get; set; }
+
+        [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; }
+
+        [Column("data")]
+        public string Data { get; set; }
+
+        [ForeignKey("Year")]
+        public virtual Season Season { get; private set; }
+
+        [InverseProperty("Variant")]
+        public virtual ISet<PaymentMember> MemberPayments { get; private set; }
+
+        [InverseProperty("Variant")]
+        public virtual ISet<Credit> Credits { get; private set; }
+    }
+}

Elwig/Models/Season.cs

@@ -48,6 +48,12 @@ namespace Elwig.Models {
         [InverseProperty("Season")]
         public virtual ISet<Modifier> Modifiers { get; private set; }
 
+        [InverseProperty("Season")]
+        public virtual ISet<PaymentVar> PaymentVariants { get; private set; }
+
+        [InverseProperty("Season")]
+        public virtual ISet<Delivery> Deliveries { get; private set; }
+
         public decimal DecFromDb(long value) {
             return Utils.DecFromDb(value, Precision);
         }

Elwig/Models/WineVar.cs

@@ -18,6 +18,9 @@ namespace Elwig.Models {
 
         public string CommentFormat => (Comment != null) ? $" ({Comment})" : "";
 
+        public bool IsRed => Type == "R";
+        public bool IsWhite => Type == "W";
+
         public override string ToString() {
             return Name;
         }

Elwig/Windows/AdministrationWindow.cs

@@ -32,6 +32,7 @@ namespace Elwig.Windows {
                 LockContext = IsEditing;
             }
         }
+        protected bool DoShowWarningWindows = true;
         protected bool IsClosing { get; private set; }
 
         private TextBox[] TextBoxInputs;
@@ -43,6 +44,7 @@ namespace Elwig.Windows {
         private RadioButton[] RadioButtonInputs;
         private readonly Dictionary<Control, bool> Valid;
         private readonly Dictionary<Control, object?> OriginalValues;
+        private readonly Dictionary<Control, object?> DefaultValues;
 
         public AdministrationWindow() : base() {
             IsEditing = false;
@@ -58,6 +60,7 @@ namespace Elwig.Windows {
             RadioButtonInputs = Array.Empty<RadioButton>();
             Valid = new();
             OriginalValues = new();
+            DefaultValues = new();
             Closing += OnClosing;
             Loaded += OnLoaded;
         }
@@ -79,6 +82,14 @@ 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<69>en best<73>tigen",
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) {
+                    evt.Cancel = true;
+                    return;
+                }
+            }
             IsClosing = true;
         }
 
@@ -101,6 +112,12 @@ namespace Elwig.Windows {
             return (sender is Control c) && RequiredInputs.Contains(c);
         }
 
+        protected void FinishInputFilling() {
+            FillOriginalValues();
+            ValidateDefaultValues();
+            ValidateRequiredInputs();
+        }
+
         protected void ClearInputStates() {
             foreach (var tb in TextBoxInputs)
                 ControlUtils.ClearInputState(tb);
@@ -121,15 +138,28 @@ namespace Elwig.Windows {
                     Valid[input] = false;
                 } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null) {
                     ControlUtils.SetInputInvalid(input);
+                } else if (input is CheckComboBox ccb && ccb.SelectedItem == null && ccb.ItemsSource != null) {
+                    ControlUtils.SetInputInvalid(input);
+                } else if (input is CheckBox ckb && ckb.IsChecked != true) {
+                    ControlUtils.SetInputInvalid(input);
+                    Valid[input] = false;
+                } else if (input is RadioButton rb && rb.IsChecked != true) {
+                    ControlUtils.SetInputInvalid(input);
+                    Valid[input] = false;
                 }
             }
         }
 
-        protected void LockInputs() {
+        protected void ValidateDefaultValues() {
-            foreach (var tb in TextBoxInputs) {
+            foreach (var input in DefaultValues.Keys) {
-                tb.IsReadOnly = true;
+                if (InputIsNotDefault(input))
-                tb.Focusable = false;
+                    ControlUtils.SetInputNotDefault(input);
             }
+        }
+
+        protected void LockInputs() {
+            foreach (var tb in TextBoxInputs)
+                tb.IsReadOnly = true;
             foreach (var cb in ComboBoxInputs)
                 cb.IsEnabled = false;
             foreach (var ccb in CheckComboBoxInputs)
@@ -141,10 +171,8 @@ namespace Elwig.Windows {
         }
 
         protected void UnlockInputs() {
-            foreach (var tb in TextBoxInputs) {
+            foreach (var tb in TextBoxInputs)
                 tb.IsReadOnly = false;
-                tb.Focusable = true;
-            }
             foreach (var cb in ComboBoxInputs)
                 cb.IsEnabled = true;
             foreach (var ccb in CheckComboBoxInputs)
@@ -159,6 +187,10 @@ namespace Elwig.Windows {
             OriginalValues.Clear();
         }
 
+        protected void ClearDefaultValues() {
+            DefaultValues.Clear();
+        }
+
         protected void FillOriginalValues() {
             foreach (var tb in TextBoxInputs)
                 OriginalValues[tb] = tb.Text;
@@ -167,17 +199,49 @@ namespace Elwig.Windows {
             foreach (var ccb in CheckComboBoxInputs)
                 OriginalValues[ccb] = ccb.SelectedItems.Cast<object>().ToArray();
             foreach (var cb in CheckBoxInputs)
-                OriginalValues[cb] = (cb.IsChecked ?? false) ? bool.TrueString : null;
+                OriginalValues[cb] = cb.IsChecked?.ToString();
             foreach (var rb in RadioButtonInputs)
-                OriginalValues[rb] = (rb.IsChecked ?? false) ? bool.TrueString : null;
+                OriginalValues[rb] = rb.IsChecked?.ToString();
         }
 
         protected void SetOriginalValue(Control input, object? value) {
-            OriginalValues[input] = value;
+            OriginalValues[input] = value is bool b ? b.ToString() : value;
+            if (InputHasChanged(input)) {
+                ControlUtils.SetInputChanged(input);
+            } else {
+                ControlUtils.ClearInputState(input);
+            }
+        }
+
+        protected void SetOriginalValue(Control input) {
+            SetOriginalValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetOriginalValue(Control input) {
             OriginalValues.Remove(input);
+            ControlUtils.ClearInputState(input);
+        }
+
+        protected void SetDefaultValue(Control input, object? value) {
+            DefaultValues[input] = value is bool b ? b.ToString() : value;
+            if (!InputHasChanged(input)) {
+                if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
+                } else {
+                    ControlUtils.ClearInputState(input);
+                }
+            }
+        }
+
+        protected void SetDefaultValue(Control input) {
+            SetDefaultValue(input, ControlUtils.GetInputValue(input));
+        }
+
+        protected void UnsetDefaultValue(Control input) {
+            DefaultValues.Remove(input);
+            if (!InputHasChanged(input)) {
+                ControlUtils.ClearInputState(input);
+            }
         }
 
         protected void ClearInputs(bool validate = true) {
@@ -210,21 +274,47 @@ namespace Elwig.Windows {
             } else if (input is CheckComboBox ccb) {
                 return !ccb.SelectedItems.Cast<object>().ToArray().SequenceEqual(((object[]?)OriginalValues[ccb]) ?? Array.Empty<object>());
             } else if (input is CheckBox cb) {
-                return (OriginalValues[cb] != null) != (cb.IsChecked ?? false);
+                return (string?)OriginalValues[cb] != cb.IsChecked?.ToString();
             } else if (input is RadioButton rb) {
-                return (OriginalValues[rb] != null) != (rb.IsChecked ?? false);
+                return (string?)OriginalValues[rb] != rb.IsChecked?.ToString();
+            } else {
+                return false;
+            }
+        }
+
+        protected bool InputIsNotDefault(Control input) {
+            if (!DefaultValues.ContainsKey(input)) {
+                return false;
+            } else if (input is TextBox tb) {
+                return DefaultValues[tb]?.ToString() != tb.Text;
+            } else if (input is ComboBox sb) {
+                return DefaultValues[sb] != sb.SelectedItem;
+            } else if (input is CheckComboBox ccb) {
+                return !ccb.SelectedItems.Cast<object>().ToArray().SequenceEqual(((object[]?)DefaultValues[ccb]) ?? Array.Empty<object>());
+            } else if (input is CheckBox cb) {
+                return (string?)DefaultValues[cb] != cb.IsChecked?.ToString();
+            } else if (input is RadioButton rb) {
+                return (string?)DefaultValues[rb] != rb.IsChecked?.ToString();
             } else {
                 return false;
             }
         }
 
         protected bool HasChanged =>
-            !IsValid ||
+            IsEditing && (
-            TextBoxInputs.Any(InputHasChanged) ||
+                !IsValid ||
-            ComboBoxInputs.Any(InputHasChanged) ||
+                TextBoxInputs.Any(InputHasChanged) ||
-            CheckComboBoxInputs.Any(InputHasChanged) ||
+                ComboBoxInputs.Any(InputHasChanged) ||
-            CheckBoxInputs.Any(InputHasChanged) ||
+                CheckComboBoxInputs.Any(InputHasChanged) ||
-            RadioButtonInputs.Any(InputHasChanged);
+                CheckBoxInputs.Any(InputHasChanged) ||
+                RadioButtonInputs.Any(InputHasChanged)
+            ) || IsCreating && (
+                TextBoxInputs.Any(i => InputIsNotDefault(i) || (!i.IsReadOnly && i.Text != "")) ||
+                ComboBoxInputs.Any(i => InputIsNotDefault(i) || (i.IsEnabled && i.SelectedItem != null)) ||
+                CheckComboBoxInputs.Any(i => InputIsNotDefault(i) || i.SelectedItem != null) ||
+                CheckBoxInputs.Any(InputIsNotDefault) ||
+                RadioButtonInputs.Any(InputIsNotDefault)
+            );
 
         protected void UpdatePlz(TextBox plzInput, ComboBox ortInput) {
             var plzInputValid = GetInputValid(plzInput);
@@ -269,6 +359,8 @@ namespace Elwig.Windows {
             if (res.IsValid) {
                 if (InputHasChanged(input)) {
                     ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
                     ControlUtils.ClearInputState(input);
                 }
@@ -288,7 +380,7 @@ namespace Elwig.Windows {
         }
 
         protected bool InputLostFocus(TextBox input, ValidationResult res, string? msg = null) {
-            if (!res.IsValid && !IsClosing)
+            if (DoShowWarningWindows && !res.IsValid && !IsClosing && (IsEditing || IsCreating))
                 System.Windows.MessageBox.Show(res.ErrorContent.ToString(), msg ?? res.ErrorContent.ToString(), MessageBoxButton.OK, MessageBoxImage.Warning);
             return res.IsValid;
         }
@@ -299,6 +391,8 @@ namespace Elwig.Windows {
                 ControlUtils.SetInputInvalid(input);
             } else if (InputHasChanged(input)) {
                 ControlUtils.SetInputChanged(input);
+            } else if (InputIsNotDefault(input)) {
+                ControlUtils.SetInputNotDefault(input);
             } else {
                 ControlUtils.ClearInputState(input);
             }
@@ -311,6 +405,8 @@ namespace Elwig.Windows {
                 ControlUtils.SetInputInvalid(input);
             } else if (InputHasChanged(input)) {
                 ControlUtils.SetInputChanged(input);
+            } else if (InputIsNotDefault(input)) {
+                ControlUtils.SetInputNotDefault(input);
             } else {
                 ControlUtils.ClearInputState(input);
             }
@@ -326,6 +422,8 @@ namespace Elwig.Windows {
                 ValidateInput(input, true);
                 if (InputHasChanged(input)) {
                     ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
                     ControlUtils.ClearInputState(input);
                 }
@@ -344,6 +442,8 @@ namespace Elwig.Windows {
                 ValidateInput(input, true);
                 if (InputHasChanged(input)) {
                     ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
                     ControlUtils.ClearInputState(input);
                 }
@@ -381,20 +481,22 @@ namespace Elwig.Windows {
         protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
-            UpdatePlz(plz, GetPlzOrtInput(plz));
+            if ("PLZ".Equals(plz.Tag))
+                UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
         protected void PlzInput_LostFocus(object sender, RoutedEventArgs evt) {
             var plz = (TextBox)sender;
             InputLostFocus(plz, Validator.CheckPlz);
-            UpdatePlz(plz, GetPlzOrtInput(plz));
+            if ("PLZ".Equals(plz.Tag))
+                UpdatePlz(plz, GetPlzOrtInput(plz));
         }
 
-        protected void EmailInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void EmailAddressInput_TextChanged(object sender, RoutedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckEmailAddress);
         }
 
-        protected void EmailInput_LostFocus(object sender, RoutedEventArgs evt) {
+        protected void EmailAddressInput_LostFocus(object sender, RoutedEventArgs evt) {
             InputLostFocus((TextBox)sender, Validator.CheckEmailAddress);
         }
 
@@ -422,12 +524,12 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckBic);
         }
 
-        protected void UstIdInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void UstIdNrInput_TextChanged(object sender, RoutedEventArgs evt) {
-            InputTextChanged((TextBox)sender, Validator.CheckUstId);
+            InputTextChanged((TextBox)sender, Validator.CheckUstIdNr);
         }
 
-        protected void UstIdInput_LostFocus(object sender, RoutedEventArgs evt) {
+        protected void UstIdNrInput_LostFocus(object sender, RoutedEventArgs evt) {
-            InputLostFocus((TextBox)sender, Validator.CheckUstId);
+            InputLostFocus((TextBox)sender, Validator.CheckUstIdNr);
         }
 
         protected void LfbisNrInput_TextChanged(object sender, RoutedEventArgs evt) {

Elwig/Windows/AreaComAdminWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         mc:Ignorable="d"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindugen - Elwig" Height="480" Width="745"
+        Title="Flächenbindungen - Elwig" Height="480" Width="850"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -47,20 +47,19 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="19"/>
-            <RowDefinition Height="110"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="175"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="415"/>
+            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="330"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
             <MenuItem Header="Flächenbindugen"/>
         </Menu>
 
-        <Grid Grid.RowSpan="3" Grid.Row="1" Grid.Column="0">
+        <Grid Grid.RowSpan="2" Grid.Row="1" Grid.Column="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1*"/>
                 <ColumnDefinition Width="1*"/>
@@ -69,37 +68,44 @@
 
             <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,47" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
+                  Margin="5,10,5,42" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr"               Binding="{Binding FbNr}"        Width="2*"/>
+                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="2*"/>
-                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="5*"/>
+                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="6*"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"     Width="4*"/>
+                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="4*"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"       Width="4*"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="4*"/>
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="4*">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                 </DataGrid.Columns>
             </DataGrid>
 
             <Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
             <Button x:Name="EditAreaCommitmentButton" Content="Bearbeiten" Click="EditAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1"/>
             <Button x:Name="DeleteAreaCommitmentButton" Content="Löschen" Click="DeleteAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2"/>
 
             <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
             <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1"/>
             <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2"/>
         </Grid>
 
         <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
             <Grid>
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="60"/>
+                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="70"/>
+                    <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="100"/>
+                    <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
 
                 <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
@@ -107,67 +113,51 @@
                          TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
                 <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="MgNrInput" Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
+                <TextBox x:Name="MgNrInput" IsEnabled="False"
+                         Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
 
                 <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                <TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
                          TextChanged="IntegerInput_TextChanged"/>
 
                 <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
-                <TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                <TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="41" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
                          TextChanged="IntegerInput_TextChanged"/>
+
+                <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                <ComboBox x:Name="AreaComTypeInput" DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
+                          HorizontalAlignment="Stretch" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+
+                <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>
 
-        <GroupBox Header="Lage" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,5">
+        <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="Gemeinde:" Margin="10,10,0,0" Grid.Column="0"/>
+                <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
                 <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                          Width="200" HorizontalAlignment="Left" SelectionChanged="KgInput_SelectionChanged"
+                          HorizontalAlignment="Stretch" Margin="0,10,10,0" Grid.Column="1"
-                          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"
-                          Width="200" HorizontalAlignment="Left"
+                          HorizontalAlignment="Stretch" Margin="0,40,10,0" Grid.Column="1"/>
-                          Margin="0,40,0,0" Grid.Column="1"/>
 
-                <Label Content="Parzelle:" Margin="10,70,0,0" Grid.Column="0"/>
+                <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
-                <TextBox x:Name="GstNrInput" Margin="0,70,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
                          TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
 
-                <Label Content="Fläche (m²):" Margin="10,100,0,0" Grid.Column="0"/>
+                <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>
-
-        <GroupBox Header="Eigenschaften" Grid.Column="2" Grid.Row="3" Grid.RowSpan="1" Margin="5,5,5,5">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-
-                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="WineVarietyInput" ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
-                          Width="200" HorizontalAlignment="Left"
-                          Margin="0,10,10,0" Grid.Column="1"/>
-
-                <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-                <xctk:CheckComboBox x:Name="AttributesInput" Grid.Column="1" Margin="0,40,0,0" IsEnabled="False"
-                                    ItemTemplate="{StaticResource WineAttributeTemplate}" Delimiter=", " AllItemsSelectedContent="Alle"
-                                    Width="200" HorizontalAlignment="Left" ItemSelectionChanged="AttributesInput_SelectionChanged"/>
-
-                <Label Content="Bewirt. Art:" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                          Width="200" HorizontalAlignment="Left" Margin="0,70,10,0" Grid.Column="1"/>
-            </Grid>
         </GroupBox>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/AreaComAdminWindow.xaml.cs

@@ -25,12 +25,12 @@ namespace Elwig.Windows {
             };
             RequiredInputs = new Control[] {
                 FbNrInput, YearFromInput, KgInput,
-                GstNrInput, AreaInput, WineVarietyInput, WineCultivationInput
+                GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
             };
         }
 
-        private async void Window_Loaded(object sender, RoutedEventArgs e) {
+        private void Window_Loaded(object sender, RoutedEventArgs e) {
-            await RenewContext();
+            LockInputs();
         }
 
         private async Task RefreshAreaCommitmentList() {
@@ -50,9 +50,7 @@ namespace Elwig.Windows {
 
         private void RefreshInputs(bool validate = false) {
             ClearInputStates();
-            AreaCom? a = (AreaCom)AreaCommitmentList.SelectedItem;
+            if (AreaCommitmentList.SelectedItem is AreaCom a) {
-
-            if (a != null) {
                 EditAreaCommitmentButton.IsEnabled = true;
                 DeleteAreaCommitmentButton.IsEnabled = true;
                 FillInputs(a);
@@ -60,16 +58,16 @@ namespace Elwig.Windows {
                 EditAreaCommitmentButton.IsEnabled = false;
                 DeleteAreaCommitmentButton.IsEnabled = false;
                 ClearOriginalValues();
-                ClearInputs();
+                ClearDefaultValues();
-                AttributesInput.UnSelectAll();
+                ClearInputs(validate);
-                MgNrInput.Text = "";
+                ClearInputStates();
             }
-            if (!validate) ClearInputStates();
             GC.Collect();
         }
 
         private void FillInputs(AreaCom a) {
             ClearOriginalValues();
+            ClearDefaultValues();
 
             FbNrInput.Text = a.FbNr.ToString();
             MgNrInput.Text = a.MgNr.ToString();
@@ -81,30 +79,27 @@ namespace Elwig.Windows {
             GstNrInput.Text = a.GstNr;
             AreaInput.Text = a.Area.ToString();
 
-            WineVarietyInput.SelectedItem = a.WineVar;
+            AreaComTypeInput.SelectedItem = a.AreaComType;
-
-            AttributesInput.UnSelectAll();
-            foreach (var attr in a.Attributes) {
-                AttributesInput.SelectedItems.Add(attr);
-            }
-
             WineCultivationInput.SelectedItem = a.WineCult;
 
-            FillOriginalValues();
+            FinishInputFilling();
         }
 
         private async void InitInputs() {
+            ClearOriginalValues();
+            ClearDefaultValues();
+
             FbNrInput.Text = (await Context.NextFbNr()).ToString();
             MgNrInput.Text = Member.MgNr.ToString();
-            FillOriginalValues();
+
+            SetDefaultValue(FbNrInput);
             ValidateRequiredInputs();
         }
 
         protected override async Task RenewContext() {
             await base.RenewContext();
             ControlUtils.RenewItemsSource(KgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
-            ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
+            ControlUtils.RenewItemsSource(AreaComTypeInput, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), i => (i as AreaComType)?.VtrgId);
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
             ControlUtils.RenewItemsSource(WineCultivationInput, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), i => (i as WineCult)?.CultId);
             await RefreshAreaCommitmentList();
         }
@@ -116,7 +111,6 @@ namespace Elwig.Windows {
             HideAreaCommitmentNewEditDeleteButtons();
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
-            AttributesInput.IsEnabled = true;
             InitInputs();
         }
 
@@ -130,7 +124,6 @@ namespace Elwig.Windows {
             HideAreaCommitmentNewEditDeleteButtons();
             ShowAreaCommitmentSaveResetCancelButtons();
             UnlockInputs();
-            AttributesInput.IsEnabled = true;
         }
 
         private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@@ -139,7 +132,7 @@ namespace Elwig.Windows {
 
             var r = MessageBox.Show(
                 $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
-                "Parzelle löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                "Flächenbindung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r == MessageBoxResult.Yes) {
                 Context.Remove(a);
                 Context.SaveChanges();
@@ -156,8 +149,8 @@ namespace Elwig.Windows {
             a.RdNr = RdInput.SelectedItem.GetType() == typeof(NullItem) ? null : ((WbRd)RdInput.SelectedItem).RdNr;
             a.GstNr = GstNrInput.Text;
             a.Area = int.Parse(AreaInput.Text);
-            a.SortId = ((WineVar)WineVarietyInput.SelectedItem).SortId;
+            a.VtrgId = (AreaComTypeInput.SelectedItem as AreaComType)?.VtrgId;
-            a.CultId = ((WineCult)WineCultivationInput.SelectedItem).CultId;
+            a.CultId = (WineCultivationInput.SelectedItem as WineCult)?.CultId;
 
             EntityEntry<AreaCom>? tr = null;
             try {
@@ -166,35 +159,25 @@ namespace Elwig.Windows {
                 } else if (IsCreating) {
                     a.FbNr = newFbNr;
                     tr = (await Context.AddAsync(a));
-                }
+                } else {
-
+                    throw new Exception();
-
-                foreach (WineAttr attr in a.Attributes) {
-                    if (!AttributesInput.SelectedItems.Contains(attr)) {
-                        var aca = a.AttributeEntries.FirstOrDefault(h => h.AttrId == attr.AttrId);
-                        Context.Remove(aca);
-                    }
-                }
-
-                foreach (WineAttr attr in AttributesInput.SelectedItems) {
-                    if (!a.Attributes.Contains(attr)) {
-                        AreaComAttr aca = Context.CreateProxy<AreaComAttr>();
-                        aca.FbNr = a.FbNr;
-                        aca.AttrId = attr.AttrId;
-                        await Context.AddAsync(aca);
-                    }
                 }
 
                 await Context.SaveChangesAsync();
 
                 if (newFbNr != a.FbNr) {
                     await Context.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {a.FbNr}");
-                    await Context.Members.LoadAsync();
+                    tr.State = EntityState.Detached;
+                    await Context.SaveChangesAsync();
+                    await tr.ReloadAsync();
                     a = await Context.AreaCommitments.FindAsync(newFbNr);
                 }
 
             } catch (Exception exc) {
-                if (tr != null) await tr.ReloadAsync();
+                if (tr != null) {
+                    tr.State = EntityState.Detached;
+                    await tr.ReloadAsync();
+                }
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                 MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -211,7 +194,6 @@ namespace Elwig.Windows {
             HideAreaCommitmentSaveResetCancelButtons();
             ShowAreaCommitmentNewEditDeleteButtons();
             LockInputs();
-            AttributesInput.IsEnabled = false;
             await RefreshAreaCommitmentList();
             AreaCommitmentList.SelectedItem = a;
         }
@@ -234,7 +216,6 @@ namespace Elwig.Windows {
             RefreshInputs();
             ClearInputStates();
             LockInputs();
-            AttributesInput.IsEnabled = false;
         }
 
         override protected void UpdateButtons() {
@@ -297,11 +278,13 @@ namespace Elwig.Windows {
         }
 
         private async void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            AT_Kg? curr_kg = (AT_Kg)KgInput.SelectedItem;
+            if (KgInput.SelectedItem is AT_Kg curr_kg) {
-            if (curr_kg != null) {
                 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);
+            } else {
+                var rdList = new object[] { new NullItem() };
+                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr);
             }
             ComboBox_SelectionChanged(sender, evt);
         }

Elwig/Windows/BaseDataWindow.xaml

@@ -0,0 +1,235 @@
+<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"
+        mc:Ignorable="d"
+        Title="Stammdaten - Elwig" Height="500" MinHeight="400" Width="800" MinWidth="800"
+        Loaded="Window_Loaded">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TabControl Margin="10,10,10,42">
+            <TabItem Header="Mandant">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="130"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Vollständiger Name:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,10,0,10"/>
+                    <TextBox x:Name="ClientNameFull" IsEnabled="False"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="3" Margin="0,10,10,10"/>
+
+                    <Label Content="Name:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,40,0,10"/>
+                    <TextBox x:Name="ClientNameInput"
+                             TextChanged="ClientNames_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="3" Margin="0,40,10,10"/>
+
+                    <Label Content="Namenszusatz:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,70,0,10"/>
+                    <TextBox x:Name="ClientNameSuffixInput"
+                             TextChanged="ClientNames_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Grid.ColumnSpan="3" Margin="0,70,10,10"/>
+
+                    <Label Content="Gesellschaftsform:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,100,0,10"/>
+                    <TextBox x:Name="ClientNameTypeInput"
+                             TextChanged="ClientNames_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Margin="0,100,10,10"/>
+
+                    <Label Content="Kürzel/Kurzform:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,130,0,10"/>
+                    <TextBox x:Name="ClientNameTokenInput"
+                             TextChanged="TextBox_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="1" Margin="0,130,10,10" Width="70"/>
+                    <TextBox x:Name="ClientNameShortInput"
+                                TextChanged="TextBox_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Margin="75,130,10,10"/>
+
+                    <Label Content="Adresse:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,160,0,10"/>
+                    <TextBox x:Name="ClientAddressInput"
+                             TextChanged="TextBox_TextChanged"
+                             VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Column="1" Margin="0,160,10,10"/>
+
+                    <Label Content="PLZ/Ort:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="0" Margin="10,190,0,10"/>
+                    <TextBox x:Name="ClientPlzInput"
+                             Margin="0,190,0,0" Width="42" Grid.Column="1" HorizontalAlignment="Left"
+                             TextChanged="PlzInput_TextChanged" LostFocus="PlzInput_LostFocus"/>
+                    <TextBox x:Name="ClientOrtInput" Margin="47,190,10,0" Grid.Column="1"
+                             TextChanged="TextBox_TextChanged"/>
+
+                    <Label Content="IBAN:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="ClientIbanInput" Margin="0,220,10,0" Grid.Column="1"
+                         TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
+
+                    <Label Content="BIC:" Margin="10,250,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="ClientBicInput" Margin="0,250,10,0" Grid.Column="1"
+                         TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
+
+                    <Label Content="UID:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,100,0,10"/>
+                    <TextBox x:Name="ClientUstIdNrInput"
+                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,100,10,10" Width="96"
+                             TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
+
+                    <Label Content="Betriebs-Nr.:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,130,0,10"/>
+                    <TextBox x:Name="ClientLfbisNrInput"
+                             VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="3" Margin="0,130,10,10" Width="64"
+                             TextChanged="LfbisNrInput_TextChanged" LostFocus="LfbisNrInput_LostFocus"/>
+
+                    <Label Content="Telefon-Nr.:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,160,0,10"/>
+                    <TextBox x:Name="ClientPhoneNrInput" Margin="0,160,10,10" Grid.Column="3"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+
+                    <Label Content="Fax-Nr.:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,190,0,10"/>
+                    <TextBox x:Name="ClientFaxNrInput" Margin="0,190,10,10" Grid.Column="3"
+                             TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
+
+                    <Label Content="E-Mail-Adr.:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,220,0,10"/>
+                    <TextBox x:Name="ClientEmailAddressInput" Margin="0,220,10,0" Grid.Column="3"
+                             TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                    <Label Content="Website:"
+                           VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Column="2" Margin="10,250,0,10"/>
+                    <TextBox x:Name="ClientWebsiteInput" Margin="0,250,10,0" Grid.Column="3"
+                             TextChanged="TextBox_TextChanged"/>
+                </Grid>
+            </TabItem>
+            <TabItem Header="Zweigstellen">
+
+            </TabItem>
+            <TabItem Header="Sortenattribute">
+
+            </TabItem>
+            <TabItem Header="Bewirtschaftungsarten">
+
+            </TabItem>
+            <TabItem Header="Flächenbindungsverträge">
+
+            </TabItem>
+
+            <TabItem Header="Saisons">
+                <Grid>
+                    <ListBox x:Name="SeasonList" HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="150" Margin="10,10,10,10"
+                             SelectionChanged="SeasonList_SelectionChanged">
+                        <ListBox.ItemTemplate>
+                            <DataTemplate>
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Year}" Width="40"/>
+                                    <TextBlock Text="{Binding Currency.Name}" Width="60"/>
+                                    <TextBlock Text="{Binding Precision}" Width="10"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </ListBox.ItemTemplate>
+                    </ListBox>
+
+                    <GroupBox Header="Zu-/Abschläge" Margin="170,150,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="70"/>
+                                <ColumnDefinition Width="*"/>
+                            </Grid.ColumnDefinitions>
+                            <ListBox x:Name="SeasonModifierList" SelectionChanged="SeasonModifierList_SelectionChanged"
+                                     HorizontalAlignment="Left" VerticalAlignment="Stretch" Width="350" Margin="10,10,10,10">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <StackPanel Orientation="Horizontal">
+                                            <TextBlock Text="{Binding ModId}" Width="30"/>
+                                            <TextBlock Text="{Binding Name}" Width="200" Margin="0,0,10,0"/>
+                                            <TextBlock Text="{Binding ValueStr}"/>
+                                        </StackPanel>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                            <Button x:Name="SeasonModifierUpButton" Content="&#xE96D;" FontFamily="Segoe MDL2 Assets" FontSize="10" Padding="0,0,0,0" IsEnabled="False"
+                                    Click="SeasonModifierUpButton_Click"
+                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="25" Height="25" Margin="365,0,0,90"/>
+                            <Button x:Name="SeasonModifierDownButton" Content="&#xE96E;" FontFamily="Segoe MDL2 Assets" FontSize="10" Padding="0,2,0,0" IsEnabled="False"
+                                    Click="SeasonModifierDownButton_Click"
+                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="25" Height="25" Margin="365,0,0,30"/>
+                            <Button x:Name="SeasonModifierAddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                                    Click="SeasonModifierAddButton_Click"
+                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="25" Height="25" Margin="365,30,0,0"/>
+                            <Button x:Name="SeasonModifierDeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
+                                    Click="SeasonModifierDeleteButton_Click"
+                                    VerticalAlignment="Center" HorizontalAlignment="Left" Width="25" Height="25" Margin="365,90,0,0"/>
+
+                            <Label Content="ID:" Grid.Column="1" Margin="10,10,10,10"/>
+                            <TextBox x:Name="SeasonModifierIdInput" Grid.Column="2" Margin="0,10,10,10" Width="50" HorizontalAlignment="Left"
+                                     TextChanged="SeasonModifierIdInput_TextChanged"/>
+
+                            <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"/>
+
+                            <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"/>
+
+                            <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"/>
+                        </Grid>
+                    </GroupBox>
+                </Grid>
+            </TabItem>
+            <TabItem Header="Parameter">
+
+            </TabItem>
+            <TabItem Header="Textelemente">
+
+            </TabItem>
+        </TabControl>
+
+        <Button x:Name="EditButton" Content="Bearbeiten"
+                HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Width="120"
+                Click="EditButton_Click"/>
+        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False"
+                HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,250,10" Width="120"
+                Click="SaveButton_Click"/>
+        <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
+                HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,10" Width="120"
+                Click="ResetButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" IsCancel="True"
+                HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="250,0,0,10" Width="120"
+                Click="CancelButton_Click"/>
+    </Grid>
+</local:AdministrationWindow>

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -0,0 +1,343 @@
+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[] {
+                ClientNameInput, ClientNameTypeInput, ClientNameTokenInput, ClientNameShortInput,
+                ClientAddressInput, ClientPlzInput, ClientOrtInput,
+            };
+            ExemptInputs = new Control[] {
+                ClientNameFull,
+                SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput, SeasonModifierAbsInput,
+            };
+        }
+
+        new protected void LockInputs() {
+            base.LockInputs();
+            SeasonModifierIdInput.IsReadOnly = true;
+            SeasonModifierNameInput.IsReadOnly = true;
+            SeasonModifierRelInput.IsReadOnly = true;
+            SeasonModifierAbsInput.IsReadOnly = true;
+        }
+
+        new protected void UnlockInputs() {
+            base.UnlockInputs();
+            SeasonModifierIdInput.IsReadOnly = false;
+            SeasonModifierNameInput.IsReadOnly = false;
+            SeasonModifierRelInput.IsReadOnly = false;
+            SeasonModifierAbsInput.IsReadOnly = false;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            LockInputs();
+            FillInputs(App.Client);
+        }
+
+        protected override async Task RenewContext() {
+            await base.RenewContext();
+            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);
+        }
+
+        protected override void UpdateButtons() {
+            if (!IsEditing && !IsCreating) return;
+            bool ch = ModifiersChanged || HasChanged, v = IsValid;
+            CancelButton.IsEnabled = true;
+            ResetButton.IsEnabled = ch;
+            SaveButton.IsEnabled = ch && v;
+            SeasonModifierUpButton.IsEnabled = SeasonModifierList.SelectedIndex >= 1;
+            SeasonModifierDownButton.IsEnabled = SeasonModifierList.SelectedIndex != -1 && SeasonModifierList.SelectedIndex < (ModifierList?.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;
+
+            ModifiersInitEditing();
+            UnlockInputs();
+            UpdateButtons();
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
+            IsEditing = false;
+            IsCreating = false;
+            EditButton.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Hidden;
+            CancelButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            ModifiersFinishEditing();
+
+            ClearInputStates();
+            FillInputs(App.Client);
+            LockInputs();
+        }
+
+        private void ResetButton_Click(object sender, RoutedEventArgs evt) {
+            ModifiersChanged = false;
+            ModifiersInitEditing();
+            ClearInputStates();
+            FillInputs(App.Client);
+            UpdateButtons();
+        }
+
+        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
+            try {
+                await UpdateClientParameters(App.Client);
+                await ModifiersSave();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            IsEditing = false;
+            IsCreating = false;
+            EditButton.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Hidden;
+            CancelButton.IsEnabled = false;
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            ModifiersFinishEditing();
+
+            ClearInputStates();
+            FillInputs(App.Client);
+            LockInputs();
+        }
+
+        private void FillInputs(ClientParameters p) {
+            ClearOriginalValues();
+            ClearDefaultValues();
+
+            ClientNameInput.Text = p.Name;
+            ClientNameSuffixInput.Text = p.NameSuffix;
+            ClientNameTypeInput.Text = p.NameType;
+            ClientNameTokenInput.Text = p.NameToken;
+            ClientNameShortInput.Text = p.NameShort;
+            ClientAddressInput.Text = p.Address;
+            ClientPlzInput.Text = p.Plz.ToString();
+            ClientOrtInput.Text = p.Ort;
+            ClientIbanInput.Text = p.Iban;
+            ClientBicInput.Text = p.Bic;
+            ClientUstIdNrInput.Text = p.UstIdNr;
+            ClientLfbisNrInput.Text = p.LfbisNr;
+            ClientPhoneNrInput.Text = p.PhoneNr;
+            ClientFaxNrInput.Text = p.FaxNr;
+            ClientEmailAddressInput.Text = p.EmailAddress;
+            ClientWebsiteInput.Text = p.Website;
+
+            FinishInputFilling();
+        }
+
+        private async Task UpdateClientParameters(ClientParameters p) {
+            p.Name = ClientNameInput.Text;
+            p.NameSuffix = ClientNameSuffixInput.Text.Length > 0 ? ClientNameSuffixInput.Text : null;
+            p.NameType = ClientNameTypeInput.Text;
+            p.NameToken = ClientNameTokenInput.Text;
+            p.NameShort = ClientNameShortInput.Text;
+            p.Address = ClientAddressInput.Text;
+            p.Plz = int.Parse(ClientPlzInput.Text);
+            p.Ort = ClientOrtInput.Text;
+            p.Iban = ClientIbanInput.Text.Length > 0 ? ClientIbanInput.Text : null;
+            p.Bic = ClientBicInput.Text.Length > 0 ? ClientBicInput.Text : null;
+            p.UstIdNr = ClientUstIdNrInput.Text.Length > 0 ? ClientUstIdNrInput.Text : null;
+            p.LfbisNr = ClientLfbisNrInput.Text.Length > 0 ? ClientLfbisNrInput.Text : null;
+            p.PhoneNr = ClientPhoneNrInput.Text.Length > 0 ? ClientPhoneNrInput.Text : null;
+            p.FaxNr = ClientFaxNrInput.Text.Length > 0 ? ClientFaxNrInput.Text : null;
+            p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
+            p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.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

@@ -0,0 +1,188 @@
+<local:AdministrationWindow x:Class="Elwig.Windows.ChartWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:ScottPlot="clr-namespace:ScottPlot;assembly=ScottPlot.WPF"
+        mc:Ignorable="d"
+        Title="Auszahlung - Elwig" Height="700" Width="1500"
+        Loaded="Window_Loaded">
+
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="IsReadOnly" Value="True"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="IsEnabled" Value="False"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="27"/>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="19"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="200"/>
+        </Grid.ColumnDefinitions>
+
+        <Grid Grid.Row="1" Margin="5,0,0,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            
+            <DataGrid x:Name="GraphList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                      SelectionChanged="GraphList_SelectionChanged"
+                      Margin="5,15,5,0" Grid.Row="0" FontSize="14" Grid.ColumnSpan="3">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Nr."    Binding="{Binding Num}"       Width="40">
+                        <DataGridTextColumn.ElementStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
+                            </Style>
+                        </DataGridTextColumn.ElementStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Typ"    Binding="{Binding Type}"       Width="40"/>
+                    <DataGridTextColumn Header="Angewandte Verträge" Binding="{Binding Contracts}" Width="4*"/>
+                </DataGrid.Columns>
+            </DataGrid>
+
+            <Button x:Name="NewButton" Content="Neu"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
+                    Click="NewButton_Click"/>
+            <Button x:Name="EditButton" Content="Bearbeiten" IsEnabled="False"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
+                    Click="EditButton_Click"/>
+            <Button x:Name="DeleteButton" Content="Löschen" IsEnabled="False"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
+                    Click="DeleteButton_Click"/>
+
+            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
+                    Click="SaveButton_Click"/>
+            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
+                    Click="ResetButton_Click"/>
+            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
+                    Click="CancelButton_Click"/>
+        </Grid>
+
+        <Grid Grid.Row="1" Grid.Column="1">
+            <ScottPlot:WpfPlot x:Name="OechslePricePlot" MouseMove="OechslePricePlot_MouseMove" MouseDown="OechslePricePlot_MouseDown" IsEnabled="False"/>
+        </Grid>
+
+        <Grid Grid.Row="1" Grid.Column="2" Margin="0,0,5,0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="120"/>
+                <RowDefinition Height="120"/>
+                <RowDefinition Height="210"/>
+                <RowDefinition Height="110"/>
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
+
+            <GroupBox Header="Graph" Grid.Row="0" Margin="0,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Nummer:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="GraphNumberInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" Text="" Width="90" TextChanged="GraphNumberInput_TextChanged" LostFocus="GraphNumberInput_LostFocus"/>
+
+                    <Label Content="Typ:" Margin="10,45,0,0" Grid.Column="0"/>
+                    <RadioButton x:Name="OechsleGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,45,0,0">Oechsle</RadioButton>
+                    <RadioButton x:Name="KmwGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,60,0,0">KMW</RadioButton>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Datenpunkt" Grid.Row="1" Margin="0,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="OechsleInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" Text="" Width="90" TextChanged="OechsleInput_TextChanged" LostFocus="OechsleInput_LostFocus"/>
+
+                    <Label Content="Preis pro kg:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <TextBox x:Name="PriceInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,40,0,0" Text="" Width="90" TextChanged="PriceInput_TextChanged" LostFocus="PriceInput_LostFocus"/>
+
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Aktionen" Grid.Row="2" Margin="0,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Button x:Name="LeftFlatButton" Content="Links flach" Click="LeftFlatButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,10,10,10"/>
+
+                    <Button x:Name="RightFlatButton" Content="Rechts flach" Click="RightFlatButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,50,10,10"/>
+
+                    <Button x:Name="InterpolateButton" Content="Interpolieren" Click="InterpolateButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,90,10,10"/>
+
+                    <Button x:Name="LinearIncreaseButton" Content="Linear wachsen" Click="LinearIncreaseButton_Click" IsEnabled="False"
+                            HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="10,130,10,10"/>
+                </Grid>
+            </GroupBox>
+
+            <GroupBox Header="Optionen" Grid.Row="3" Margin="0,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <CheckBox x:Name="FreeZoomInput" Content="Freier Zoom" IsEnabled="False"
+                            Checked="FreeZoomInput_Changed" Unchecked="FreeZoomInput_Changed"
+                            HorizontalAlignment="Left" Margin="10,10,10,0" VerticalAlignment="Top"/>
+
+                    <CheckBox x:Name="GradationLinesInput" Content="Gradationslinien anzeigen" IsEnabled="False"
+                            Checked="GradationLinesInput_Changed" Unchecked="GradationLinesInput_Changed"
+                            HorizontalAlignment="Left" Margin="10,30,10,0" VerticalAlignment="Top" IsChecked="True"/>
+
+                    <CheckBox x:Name="TooltipInput" Content="Tooltips anzeigen" IsEnabled="False"
+                            HorizontalAlignment="Left" Margin="10,50,10,0" VerticalAlignment="Top" IsChecked="True"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+    </Grid>
+</local:AdministrationWindow>

Elwig/Windows/ChartWindow.xaml.cs

@@ -0,0 +1,749 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using ScottPlot;
+using ScottPlot.Plottable;
+
+namespace Elwig.Windows {
+    public partial class ChartWindow : AdministrationWindow {
+
+        private readonly int Year = 2021;
+        private readonly int AvNr = 2;
+
+        private ScatterPlot OechslePricePlotScatter;
+        private MarkerPlot HighlightedPoint;
+        private MarkerPlot PrimaryMarkedPoint;
+        private MarkerPlot SecondaryMarkedPoint;
+        private Tooltip Tooltip;
+
+        private int LastHighlightedIndex = -1;
+        private int HighlightedIndex = -1;
+        private int PrimaryMarkedPointIndex = -1;
+        private int SecondaryMarkedPointIndex = -1;
+        private bool HoverChanged = false;
+        private bool HoverActive = false;
+
+        private const int MinOechsle = 50;
+        private const int MaxOechsle = 140;
+
+        private Graph? Graph;
+
+        public ChartWindow() {
+            InitializeComponent();
+
+            ExemptInputs = new Control[] {
+                GraphList, OechsleInput, PriceInput, FreeZoomInput, GradationLinesInput, TooltipInput
+            };
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            LockInputs();
+            OechslePricePlot.IsEnabled = false;
+        }
+
+        private async Task RefreshGraphList() {
+            await Context.PaymentVariants.LoadAsync();
+            await RefreshGraphListQuery();
+        }
+
+        private async Task RefreshGraphListQuery(bool updateSort = false) {
+            List<PaymentVar> paymentVars = await Context.PaymentVariants.Where(p => p.Year == Year && p.AvNr == AvNr).ToListAsync();
+
+            if (paymentVars.Count != 1) {
+                return;
+            }
+
+            PaymentVar paymentVar = paymentVars[0];
+            var data = JsonNode.Parse(paymentVar.Data).AsObject();
+
+            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
+            if (auszahlungsSorten == null) {
+                return;
+            }
+
+            var Graphs = auszahlungsSorten["Kurven"]?.AsArray();
+
+            if (Graphs == null) {
+                return;
+            }
+
+            List<Graph> GraphsList = new();
+
+            int i = 1;
+            foreach (var graph in Graphs) {
+                GraphsList.Add(new Graph("Oe", i, graph?.AsObject(), ParseContracts(auszahlungsSorten, i - 1), 50, 140));
+                i++;
+            }
+
+            ControlUtils.RenewItemsSource(GraphList, GraphsList, g => (g as Graph)?.Num);
+            if (GraphsList.Count == 1) {
+                GraphList.SelectedIndex = 0;
+            }
+
+            RefreshInputs();
+        }
+
+        private String ParseContracts(JsonObject auszahlungsSorten, int num) {
+            List<string> contracts = new();
+
+            foreach (var sorte in auszahlungsSorten) {
+                if (sorte.Key == "Kurven") continue;
+                foreach (var attribut in sorte.Value.AsObject()) {
+                    foreach (var bindung in attribut.Value.AsObject()) {
+                        if ((int)bindung.Value.AsValue() == num) {
+                            contracts.Add($"{sorte.Key}/{attribut.Key}/{bindung.Key}");
+                        }
+                    }
+                }
+            }
+
+            return string.Join("\n", contracts.ToArray());
+        }
+
+        private async Task<bool> RemoveGraph(int num) {
+            List<PaymentVar> paymentVars = await Context.PaymentVariants.Where(p => p.Year == Year && p.AvNr == AvNr).ToListAsync();
+
+            if (paymentVars.Count != 1) {
+                return false;
+            }
+
+            PaymentVar paymentVar = paymentVars[0];
+            var data = JsonNode.Parse(paymentVar.Data).AsObject();
+
+            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
+            if (auszahlungsSorten == null) {
+                return false;
+            }
+
+            var Graphs = auszahlungsSorten["Kurven"]?.AsObject();
+            if (Graphs == null) {
+                return false;
+            }
+
+            int i = 1;
+            foreach (var graph in Graphs) {
+                if (i == num) {
+                    Graphs.Remove(graph.Key);
+                    break;
+                }
+                i++;
+            }
+
+            foreach (var sorte in auszahlungsSorten) {
+                if (sorte.Key == "Kurven") continue;
+                foreach (var attribut in sorte.Value.AsObject()) {
+                    var bindungen = attribut.Value.AsObject();
+                    foreach (var bindung in bindungen) {
+                        int v = (int)bindung.Value;
+                        if (v == num - 1) {
+                            bindungen.Remove(bindung.Key);
+                        } else if (v > num - 1) {
+                            bindungen[bindung.Key] = v - 1;
+                        }
+                    }
+                }
+            }
+
+            EntityEntry<PaymentVar>? tr = null;
+            try {
+                paymentVar.Data = data.ToString();
+                tr = Context.Update(paymentVar);
+
+                await Context.SaveChangesAsync();
+            } catch (Exception exc) {
+                if (tr != null) await tr.ReloadAsync();
+                var str = "Der Eintrag konnte nicht in der Datenbank gelöscht werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            return true;
+        }
+
+        private void RefreshInputs(bool validate = false) {
+            ResetPlot();
+            ClearInputStates();
+            if (GraphList.SelectedItem is Graph g) {
+                EditButton.IsEnabled = true;
+                DeleteButton.IsEnabled = true;
+                EnableOptionButtons();
+                FillInputs(g);
+            } else {
+                EditButton.IsEnabled = false;
+                DeleteButton.IsEnabled = false;
+                DisableOptionButtons();
+                ClearOriginalValues();
+                ClearInputs(validate);
+                ClearInputStates();
+            }
+            GC.Collect();
+        }
+
+        private void FillInputs(Graph g) {
+            ClearOriginalValues();
+
+            Graph = (Graph)g.Clone();
+            
+            GraphNumberInput.Text = Graph.Num.ToString();
+            if (Graph.Type == "oe") {
+                OechsleGraphType_Input.IsChecked = true;
+            } else if (Graph.Type == "kmw") {
+                KmwGraphType_Input.IsChecked = true;
+            }
+
+            InitPlot();
+            OechslePricePlot.IsEnabled = true;
+
+            FinishInputFilling();
+        }
+
+        private void InitInputs() {
+            GraphNumberInput.Text = (GraphList.Items.Count + 1).ToString();
+            OechsleGraphType_Input.IsChecked = true;
+            FinishInputFilling();
+        }
+
+        protected override async Task RenewContext() {
+            await base.RenewContext();
+            await RefreshGraphList();
+        }
+
+        private void InitPlot() {
+            OechslePricePlotScatter = OechslePricePlot.Plot.AddScatter(Graph.DataX, Graph.DataY);
+
+            OechslePricePlot.Configuration.DoubleClickBenchmark = false;
+            OechslePricePlotScatter.LineColor = Color.Blue;
+            OechslePricePlotScatter.MarkerColor = Color.Blue;
+            OechslePricePlotScatter.MarkerSize = 9;
+
+            //OechslePricePlot.Plot.XAxis.ManualTickSpacing(1);
+            OechslePricePlot.Plot.YAxis.ManualTickSpacing(0.1);
+            OechslePricePlot.Plot.SetAxisLimits(MinOechsle - 1, MaxOechsle + 1, -0.1, 2);
+            
+            OechslePricePlot.Plot.Layout(padding: 0);
+            OechslePricePlot.Plot.XAxis2.Layout(padding: 0);
+            OechslePricePlot.Plot.YAxis.Layout(padding: 0);
+            OechslePricePlot.Plot.YAxis2.Layout(padding: 0);
+
+            HighlightedPoint = OechslePricePlot.Plot.AddPoint(0, 0);
+            HighlightedPoint.Color = Color.Red;
+            HighlightedPoint.MarkerSize = 10;
+            HighlightedPoint.MarkerShape = MarkerShape.openCircle;
+            HighlightedPoint.IsVisible = false;
+
+            PrimaryMarkedPoint = OechslePricePlot.Plot.AddPoint(0, 0);
+            PrimaryMarkedPoint.Color = Color.Red;
+            PrimaryMarkedPoint.MarkerSize = 6;
+            PrimaryMarkedPoint.MarkerShape = MarkerShape.filledCircle;
+            PrimaryMarkedPoint.IsVisible = false;
+
+            SecondaryMarkedPoint = OechslePricePlot.Plot.AddPoint(0, 0);
+            SecondaryMarkedPoint.Color = Color.Red;
+            SecondaryMarkedPoint.MarkerSize = 6;
+            SecondaryMarkedPoint.MarkerShape = MarkerShape.filledCircle;
+            SecondaryMarkedPoint.IsVisible = false;
+
+            OechslePricePlot.Refresh();
+
+            RefreshFreeZoom();
+            RefreshGradationLines();
+        }
+
+        private void ResetPlot() {
+            Graph = null;
+            PrimaryMarkedPointIndex = -1;
+            OechslePricePlot.Plot.Remove(OechslePricePlotScatter);
+            OechslePricePlot.Plot.Clear();
+            OechslePricePlot.Reset();
+            OechslePricePlot.Refresh();
+        }
+
+        private void ChangeMarker(MarkerPlot point, bool visible, double x = 0, double y = 0) {
+            point.X = x;
+            point.Y = y;
+            point.IsVisible = visible;
+        }
+
+        private void FlattenGraph(int begin, int end, double value) {
+            for (int i = begin; i <= end; i++) {
+                Graph.DataY[i] = value;
+            }
+            OechslePricePlot.Render();
+        }
+
+        private void LinearIncreaseGraph(int begin, int end, double inc) {
+            for (int i = begin; i < end; i++) {
+                Graph.DataY[i + 1] = Graph.DataY[i] + inc;
+            }
+            OechslePricePlot.Render();
+        }
+
+        private void EnableActionButtons() {
+            LeftFlatButton.IsEnabled = true; 
+            RightFlatButton.IsEnabled = true; 
+            LinearIncreaseButton.IsEnabled = true;
+        }
+
+        private void DisableActionButtons() {
+            LeftFlatButton.IsEnabled = false;
+            RightFlatButton.IsEnabled = false;
+            InterpolateButton.IsEnabled = false;
+            LinearIncreaseButton.IsEnabled = false;
+        }
+
+        private void FreeZoomInput_Changed(object sender, RoutedEventArgs evt) {
+            RefreshFreeZoom();
+        }
+
+        private void RefreshFreeZoom() {
+            if (FreeZoomInput.IsChecked == true) {
+                UnlockZoom();
+            } else {
+                LockZoom();
+            }
+            OechslePricePlot.Refresh();
+        }
+
+        private void LockZoom() {
+            OechslePricePlot.Plot.XAxis.SetBoundary(MinOechsle - 1, MaxOechsle + 1);
+            OechslePricePlot.Plot.YAxis.SetBoundary(-0.1, 2);
+            OechslePricePlot.Plot.XAxis.SetZoomOutLimit(MaxOechsle - MinOechsle + 2);
+            OechslePricePlot.Plot.YAxis.SetZoomOutLimit(2.1);
+            OechslePricePlot.Plot.SetAxisLimits(MinOechsle - 1, MaxOechsle + 1, -0.1, 2);
+        }
+
+        private void UnlockZoom() {
+            OechslePricePlot.Plot.XAxis.SetBoundary();
+            OechslePricePlot.Plot.YAxis.SetBoundary();
+            OechslePricePlot.Plot.XAxis.SetZoomOutLimit((MaxOechsle - MinOechsle) * 1.5);
+            OechslePricePlot.Plot.YAxis.SetZoomOutLimit(3.5);
+        }
+
+        private void EnableOptionButtons() {
+            FreeZoomInput.IsEnabled = true;
+            GradationLinesInput.IsEnabled = true;
+            TooltipInput.IsEnabled = true;
+        }
+
+        private void DisableOptionButtons() {
+            FreeZoomInput.IsEnabled = false;
+            GradationLinesInput.IsEnabled = false;
+            TooltipInput.IsEnabled = false;
+        }
+
+        private void GradationLinesInput_Changed(object sender, RoutedEventArgs evt) {
+            RefreshGradationLines();
+        }
+
+        private void RefreshGradationLines() {
+            if (GradationLinesInput.IsChecked == true) {
+                ShowGradationLines();
+                ShowLegend();
+            } else {
+                HideGradationLines();
+                HideLegend();
+            }
+            OechslePricePlot.Refresh();
+        }
+
+        private void ShowGradationLines() {
+            OechslePricePlot.Plot.AddVerticalLine(68, Color.Red, 2, label: "68 Oechsle (LDW)");
+            OechslePricePlot.Plot.AddVerticalLine(73, Color.Orange, 2, label: "73 Oechsle (QUW)");
+            OechslePricePlot.Plot.AddVerticalLine(84, Color.Green, 2, label: "84 Oechsle (KAB)");
+        }
+
+        private void HideGradationLines() {
+            OechslePricePlot.Plot.Clear(typeof(VLine));
+        }
+
+        private void ShowLegend() {
+            OechslePricePlot.Plot.Legend(true, Alignment.UpperRight);
+        }
+
+        private void HideLegend() {
+            OechslePricePlot.Plot.Legend(false, Alignment.UpperRight);
+        }
+
+        private void OechsleInput_TextChanged(object sender, RoutedEventArgs evt) {
+            IntegerInput_TextChanged(sender, evt);
+
+            bool success = int.TryParse(OechsleInput.Text, out int oechsle);
+
+            SecondaryMarkedPointIndex = -1;
+            ChangeMarker(SecondaryMarkedPoint, false);
+
+            if (success) {
+                if (oechsle >= MinOechsle && oechsle <= MaxOechsle) {
+                    PrimaryMarkedPointIndex = oechsle - MinOechsle;
+                    ChangeMarker(PrimaryMarkedPoint, true, Graph.DataX[PrimaryMarkedPointIndex], Graph.DataY[PrimaryMarkedPointIndex]);
+
+                    PriceInput.Text = Graph.DataY[PrimaryMarkedPointIndex].ToString();
+
+                    if (IsEditing || IsCreating) EnableActionButtons();
+                    OechslePricePlot.Render();
+                    return;
+                }
+            }
+
+            PrimaryMarkedPointIndex = -1;
+            ChangeMarker(PrimaryMarkedPoint, false);
+            DisableActionButtons();
+            PriceInput.Text = "";
+            OechslePricePlot.Render();
+        }
+
+        private void PriceInput_TextChanged(object sender, RoutedEventArgs evt) {
+            if (PrimaryMarkedPointIndex != -1) {
+                bool success = Double.TryParse(PriceInput.Text, out double price);
+
+                if (success) {
+                    Graph.DataY[PrimaryMarkedPointIndex] = price;
+                    PrimaryMarkedPoint.Y = price;
+                    SaveButton.IsEnabled = true;
+                    ResetButton.IsEnabled = true;
+                    OechslePricePlot.Refresh();
+                }
+            }
+        }
+
+        private void LeftFlatButton_Click(object sender, RoutedEventArgs evt) {
+            if (PrimaryMarkedPointIndex == -1) {
+                return;
+            }
+            FlattenGraph(0, PrimaryMarkedPointIndex, Graph.DataY[PrimaryMarkedPointIndex]);
+            SaveButton.IsEnabled = true;
+            ResetButton.IsEnabled = true;
+        }
+
+        private void RightFlatButton_Click(object sender, RoutedEventArgs evt) {
+            if (PrimaryMarkedPointIndex == -1) {
+                return;
+            }
+            FlattenGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, Graph.DataY[PrimaryMarkedPointIndex]);
+            SaveButton.IsEnabled = true;
+            ResetButton.IsEnabled = true;
+        }
+
+        private void InterpolateButton_Click(object sender, RoutedEventArgs evt) {
+            int steps = Math.Abs(PrimaryMarkedPointIndex - SecondaryMarkedPointIndex);
+            if (PrimaryMarkedPointIndex == -1 || SecondaryMarkedPointIndex == -1 || steps < 2) {
+                return;
+            }
+            var (lowIndex, highIndex) = PrimaryMarkedPointIndex < SecondaryMarkedPointIndex ? (PrimaryMarkedPointIndex, SecondaryMarkedPointIndex): (SecondaryMarkedPointIndex, PrimaryMarkedPointIndex);
+
+            double step = (Graph.DataY[highIndex] - Graph.DataY[lowIndex]) / steps;
+
+            for (int i = lowIndex; i < highIndex - 1; i++) {
+                Graph.DataY[i + 1] = Math.Round(Graph.DataY[i] + step, 4); // TODO richtig runden
+            }
+            SaveButton.IsEnabled = true;
+            ResetButton.IsEnabled = true;
+        }
+
+        private void LinearIncreaseButton_Click(object sender, RoutedEventArgs e) { 
+            if (PrimaryMarkedPointIndex == -1) {
+                return;
+            }
+            double? priceIncrease = Utils.ShowLinearPriceIncreaseDialog();
+            if (priceIncrease == null) {
+                return;
+            }
+            LinearIncreaseGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, priceIncrease.Value);
+            SaveButton.IsEnabled = true;
+            ResetButton.IsEnabled = true;
+        }
+
+        private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
+            if (!IsCreating && GraphList.SelectedItem == null) {
+                return;
+            }
+
+            if (HoverActive) {
+                if ((IsEditing || IsCreating) && Keyboard.IsKeyDown(Key.LeftCtrl)) {
+                    if (PrimaryMarkedPointIndex == -1) {
+                        return;
+                    }
+                    SecondaryMarkedPointIndex = HighlightedIndex;
+                    ChangeMarker(SecondaryMarkedPoint, true, Graph.DataX[SecondaryMarkedPointIndex], Graph.DataY[SecondaryMarkedPointIndex]);
+
+                    InterpolateButton.IsEnabled = true;
+
+                    return;
+                }
+
+                PrimaryMarkedPointIndex = HighlightedIndex;
+                ChangeMarker(PrimaryMarkedPoint, true, Graph.DataX[PrimaryMarkedPointIndex], Graph.DataY[PrimaryMarkedPointIndex]);
+
+                OechsleInput.Text = Graph.DataX[HighlightedIndex].ToString();
+                PriceInput.Text = Graph.DataY[HighlightedIndex].ToString();
+
+                if (IsEditing || IsCreating) {
+                    EnableActionButtons();
+                }
+            } else {
+                PrimaryMarkedPointIndex = -1;
+                SecondaryMarkedPointIndex = -1;
+                ChangeMarker(PrimaryMarkedPoint, false);
+                ChangeMarker(SecondaryMarkedPoint, false);
+
+                OechsleInput.Text = "";
+                PriceInput.Text = "";
+
+                DisableActionButtons();
+            }
+        }
+
+        private void OechslePricePlot_MouseMove(object sender, MouseEventArgs e) {
+            if (!IsCreating && GraphList.SelectedItem == null) {
+                return;
+            }
+
+            (double mouseCoordX, double mouseCoordY) = OechslePricePlot.GetMouseCoordinates();
+            double xyRatio = OechslePricePlot.Plot.XAxis.Dims.PxPerUnit / OechslePricePlot.Plot.YAxis.Dims.PxPerUnit;
+            (double pointX, double pointY, int pointIndex) = OechslePricePlotScatter.GetPointNearest(mouseCoordX, mouseCoordY, xyRatio);
+
+            (double mousePixelX, double mousePixelY) = OechslePricePlot.GetMousePixel();
+            (double pointPixelX, double pointPixelY) = OechslePricePlot.Plot.GetPixel(pointX, pointY);
+
+            HighlightedIndex = LastHighlightedIndex;
+
+            if (Math.Abs(mousePixelX - pointPixelX) < 3 && Math.Abs(mousePixelY - pointPixelY) < 3) {
+                ChangeMarker(HighlightedPoint, true, pointX, pointY);
+                HighlightedPoint.IsVisible = true;
+                HoverChanged = true ^ HoverActive;
+                HoverActive = true;
+            } else {
+                ChangeMarker(HighlightedPoint, false);
+                HoverChanged= false ^ HoverActive;
+                HoverActive= false;
+                OechslePricePlot.Plot.Remove(Tooltip);
+                OechslePricePlot.Render();
+            }
+
+            if (LastHighlightedIndex != HighlightedIndex || HoverChanged) {
+                OechslePricePlot.Plot.Remove(Tooltip);
+                if (TooltipInput.IsChecked == true) {
+                    Tooltip = OechslePricePlot.Plot.AddTooltip($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, 4)})", pointX, pointY);
+                }
+                LastHighlightedIndex = pointIndex;
+                HoverChanged = false;
+                OechslePricePlot.Render();
+            }
+        }
+
+        override protected void UpdateButtons() {
+            if (!IsEditing && !IsCreating) return;
+            bool ch = HasChanged, v = IsValid;
+        }
+
+        private void DisableNewEditDeleteButtons() {
+            NewButton.IsEnabled = false;
+            EditButton.IsEnabled = false;
+            DeleteButton.IsEnabled = false;
+        }
+
+        private void EnableNewEditDeleteButtons() {
+            NewButton.IsEnabled = true;
+            EditButton.IsEnabled = GraphList.SelectedItem != null;
+            DeleteButton.IsEnabled = GraphList.SelectedItem != null;
+        }
+
+        private void ShowSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = true;
+            SaveButton.Visibility = Visibility.Visible;
+            ResetButton.Visibility = Visibility.Visible;
+            CancelButton.Visibility = Visibility.Visible;
+        }
+
+        private void HideSaveResetCancelButtons() {
+            SaveButton.IsEnabled = false;
+            ResetButton.IsEnabled = false;
+            CancelButton.IsEnabled = false;
+            SaveButton.Visibility = Visibility.Hidden;
+            ResetButton.Visibility = Visibility.Hidden;
+            CancelButton.Visibility = Visibility.Hidden;
+        }
+        private void ShowNewEditDeleteButtons() {
+            EnableNewEditDeleteButtons();
+            NewButton.Visibility = Visibility.Visible;
+            EditButton.Visibility = Visibility.Visible;
+            DeleteButton.Visibility = Visibility.Visible;
+        }
+
+        private void HideNewEditDeleteButtons() {
+            DisableNewEditDeleteButtons();
+            NewButton.Visibility = Visibility.Hidden;
+            EditButton.Visibility = Visibility.Hidden;
+            DeleteButton.Visibility = Visibility.Hidden;
+        }
+
+        private void NewButton_Click(object sender, RoutedEventArgs e) {
+            IsCreating = true;
+            GraphList.IsEnabled = false;
+            GraphList.SelectedItem = null;
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            PriceInput.IsReadOnly = false;
+            OechsleInput.IsReadOnly = false;
+            InitInputs();
+            FillInputs(new Graph(GraphList.Items.Count + 1, MinOechsle, MaxOechsle));
+            EnableOptionButtons();
+        }
+
+        private void EditButton_Click(object sender, RoutedEventArgs e) {
+            if (GraphList.SelectedItem == null) {
+                return;
+            }
+
+            IsEditing = true;
+            GraphList.IsEnabled = false;
+
+            HideNewEditDeleteButtons();
+            ShowSaveResetCancelButtons();
+            UnlockInputs();
+            PriceInput.IsReadOnly = false;
+            OechsleInput.IsReadOnly = false;
+            if (PrimaryMarkedPointIndex != -1) EnableActionButtons();
+        }
+
+        private async void DeleteButton_Click(object sender, RoutedEventArgs e) {
+            Graph g = (Graph)GraphList.SelectedItem;
+            if (g == null) return;
+
+            var r = MessageBox.Show(
+                $"Soll der Graph {g.Num} (verwendet in folgenden Verträgen: {g.Contracts}) wirklich unwiderruflich gelöscht werden?",
+                "Graph löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (r == MessageBoxResult.Yes) {
+                bool success = await RemoveGraph(g.Num);
+                if (!success) {
+                    MessageBox.Show("Der Graph konnte nicht gelöscht werden", "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+                await RefreshGraphList();
+            }
+        }
+
+
+        private async void SaveButton_Click(object sender, RoutedEventArgs e) {
+            int? index = await UpdateGraph(Graph);
+            if (index == null) {
+                MessageBox.Show("Der Graph konnte nicht gespeichert werden", "Graph speichern", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            IsEditing = false;
+            IsCreating = false;
+            GraphList.IsEnabled = true;
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            LockInputs();
+            PriceInput.IsReadOnly = true;
+            OechsleInput.IsReadOnly = true;
+            await RefreshGraphList();
+            GraphList.SelectedIndex = index.Value;
+        }
+
+        private async Task<int?> UpdateGraph(Graph g) {
+            List<PaymentVar> paymentVars = await Context.PaymentVariants.Where(p => p.Year == Year && p.AvNr == AvNr).ToListAsync();
+
+            if (paymentVars.Count != 1) {
+                return null;
+            }
+
+            PaymentVar paymentVar = paymentVars[0];
+            var data = JsonNode.Parse(paymentVar.Data).AsObject();
+
+            var auszahlungsSorten = data["AuszahlungSorten"];
+            if (auszahlungsSorten == null) {
+                return null;
+            }
+
+            var Graphs = auszahlungsSorten["Kurven"].AsArray();
+            if (Graphs == null) {
+                return null;
+            }
+
+            if (IsEditing) {
+                Graphs[g.Num - 1] = g.ToJson();
+            } else if(IsCreating) {
+                Graphs.Add(g.ToJson());
+            } else {
+                return null;
+            }
+
+            EntityEntry<PaymentVar>? tr = null;
+            try {
+                paymentVar.Data = data.ToString();
+                tr = Context.Update(paymentVar);
+
+                await Context.SaveChangesAsync();
+            } catch (Exception exc) {
+                if (tr != null) await tr.ReloadAsync();
+                var str = "Der Eintrag konnte nicht in der Datenbank gelöscht werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            return g.Num - 1;
+        }
+
+        private void ResetButton_Click(object sender, RoutedEventArgs e) {
+            if (IsEditing) {
+                RefreshInputs();
+            } else if (IsCreating) {
+                InitInputs();
+            }
+            UpdateButtons();
+        }
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e) {
+            IsEditing = false;
+            IsCreating = false;
+            GraphList.IsEnabled = true;
+            HideSaveResetCancelButtons();
+            ShowNewEditDeleteButtons();
+            DisableActionButtons();
+            RefreshInputs();
+            PriceInput.Text = "";
+            OechsleInput.Text = "";
+            ClearInputStates();
+            LockInputs();
+            PriceInput.IsReadOnly = true;
+            OechsleInput.IsReadOnly = true;
+        }
+
+        private void GraphList_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) {
+            RefreshInputs();
+
+            //var x = OechslePricePlot.Plot.GetPlottables().OfType<ScatterPlot>();
+            //MessageBox.Show($"SelectionChanged\nLength: {x.ToList().Count}, Ys: {string.Join(", ", ((ScatterPlot)x.First()).Ys)}");
+        }
+
+        private void PriceInput_LostFocus(object sender, RoutedEventArgs e) {
+
+        }
+
+        private void OechsleInput_LostFocus(object sender, RoutedEventArgs e) {
+
+        }
+
+        private void GraphNumberInput_TextChanged(object sender, TextChangedEventArgs e) {
+
+        }
+
+        private void GraphNumberInput_LostFocus(object sender, RoutedEventArgs e) {
+
+        }
+    }
+}

Elwig/Windows/ClientParamWindow.xaml

@@ -1,12 +0,0 @@
-<local:AdministrationWindow x:Class="Elwig.Windows.ClientParamWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Elwig.Windows"
-        mc:Ignorable="d"
-        Title="ClientParamWindow" Height="450" Width="800">
-    <Grid>
-        
-    </Grid>
-</local:AdministrationWindow>

Elwig/Windows/ClientParamWindow.xaml.cs

@@ -1,18 +0,0 @@
-
-using System.Threading.Tasks;
-
-namespace Elwig.Windows {
-    public partial class ClientParamWindow : AdministrationWindow {
-        public ClientParamWindow() {
-            InitializeComponent();
-        }
-
-        protected override void UpdateButtons() {
-
-        }
-
-        protected override async Task RenewContext() {
-
-        }
-    }
-}

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Lieferungsverwaltung - Elwig" Height="700" Width="1100" MinHeight="700" MinWidth="1000"
+        Title="Lieferungen - Elwig" Height="720" Width="1100" MinHeight="700" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -47,6 +47,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="24"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*" MinWidth="400"/>
@@ -63,12 +64,15 @@
                 <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
                           Click="Menu_Print_PrintDeliveryNote_Click"/>
             </MenuItem>
+            <MenuItem Header="Exportieren">
+                <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
+            </MenuItem>
             <MenuItem Header="Werkzeuge">
                 <MenuItem Header="Alle Lieferscheine überprüfen"/>
             </MenuItem>
         </Menu>
 
-        <Grid Grid.RowSpan="5" Grid.Row="1" Margin="5,0,5,0">
+        <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="42"/>
                 <RowDefinition Height="*"/>
@@ -80,14 +84,17 @@
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
-            <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,95,0" IsReadOnly="False"
+            <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"
+                                Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                ValueChanged="SeasonInput_ValueChanged"/>
             <CheckBox x:Name="TodayOnlyInput" Content="Nur heute"
-                      HorizontalAlignment="Right" Margin="0,7,14.125,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"
+                      HorizontalAlignment="Right" Margin="0,7,18,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"
                       Checked="TodayOnlyInput_Changed" Unchecked="TodayOnlyInput_Changed"/>
-            <CheckBox x:Name="SeasonOnlyInput" Content="Nur Saison" IsChecked="True"
+            <CheckBox x:Name="AllSeasonsInput" Content="Jede Saison" IsEnabled="False"
                       HorizontalAlignment="Right" Margin="0,24,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"
-                      Checked="SeasonOnlyInput_Changed" Unchecked="SeasonOnlyInput_Changed"/>
+                      Checked="AllSeasonsInput_Changed" Unchecked="AllSeasonsInput_Changed"/>
             <DataGrid x:Name="DeliveryList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
                       SelectionChanged="DeliveryList_SelectionChanged"
                       CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
@@ -153,10 +160,10 @@
 
                 <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"/>
+                         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"/>
+                          SelectionChanged="MemberInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
                 <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"
@@ -188,7 +195,8 @@
                           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"/>
+                <TextBox x:Name="CommentInput" Grid.Column="1" Margin="0,100,10,10"
+                         TextChanged="TextBox_TextChanged"/>
             </Grid>
         </GroupBox>
 
@@ -201,15 +209,15 @@
 
                 <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"/>
+                         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"/>
+                          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"/>
+                                    ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
             </Grid>
         </GroupBox>
 
@@ -238,7 +246,7 @@
                           SelectionChanged="WineQualityLevelInput_SelectionChanged"/>
 
                 <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="0,75,10,10" Grid.Column="1"/>
+                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
             </Grid>
         </GroupBox>
 
@@ -257,10 +265,12 @@
                 </Grid>
 
                 <CheckBox x:Name="ManualWeighingInput" Content="Handwiegung" IsEnabled="False"
-                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,45,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
+                          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"/>
+                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
+                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
 
                 <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
                         Click="WeighingManualButton_Click"
@@ -281,7 +291,7 @@
             </Grid>
         </GroupBox>
 
-        <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,5">
+        <GroupBox Header="Sonstiges" Grid.Column="2" Grid.Row="4" Margin="5,5,5,10">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -295,24 +305,29 @@
                                     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"/>
+                <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"/>
+                    <TextBox x:Name="TemperatureInput" TextAlignment="Right" Padding="2,2,16,2"
+                             TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
                     <Label Content="°C" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
                 </Grid>
 
                 <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"/>
+                    <TextBox x:Name="AcidInput" TextAlignment="Right" Padding="2,2,19,2"
+                             TextChanged="TemperatureAcidInput_TextChanged" LostFocus="TemperatureAcidInput_LostFocus"/>
                     <Label Content="g/l" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
                 </Grid>
 
                 <CheckBox x:Name="LesewagenInput" Content="Lesewagen" Margin="10,75,0,0" Grid.Column="2"
-                          VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                          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"/>
+                          VerticalAlignment="Top" HorizontalAlignment="Left"
+                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
             </Grid>
         </GroupBox>
 
@@ -337,7 +352,7 @@
                     </ListBox.ItemTemplate>
                 </ListBox>
 
-                <Button x:Name="ExtractDeliveryPartButton" Content="Herausheben" IsEnabled="False"
+                <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"/>
@@ -347,7 +362,7 @@
             </Grid>
         </GroupBox>
 
-        <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,5">
+        <GroupBox Header="Herkunft" Grid.Column="1" Grid.Row="4" Margin="5,5,5,10">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -368,5 +383,44 @@
                           DisplayMemberPath="Name"/>
             </Grid>
         </GroupBox>
+
+        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="150"/>
+                            <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="StatusDeliveries" Text="Lieferungen: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusVarieties" Text="Sorten: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock Name="StatusWeight" Text="Gewicht: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="7"/>
+            <StatusBarItem Grid.Column="8">
+                <TextBlock Name="StatusGradation" Text="Gradation: -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -1,8 +1,10 @@
 using Elwig.Documents;
 using Elwig.Helpers;
+using Elwig.Helpers.Export;
 using Elwig.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,7 +28,7 @@ namespace Elwig.Windows {
         private string? ManualWeighingReason = null;
         private string? ScaleId = null;
         private string? WeighingId = null;
-        private Button[] WeighingButtons;
+        private readonly Button[] WeighingButtons;
 
         public DeliveryAdminWindow(bool receipt = false) {
             InitializeComponent();
@@ -41,7 +43,7 @@ namespace Elwig.Windows {
                 WeightInput
             };
             ExemptInputs = new Control[] {
-                SearchInput, TodayOnlyInput, SeasonOnlyInput,
+                SearchInput, SeasonInput, TodayOnlyInput, AllSeasonsInput,
                 DeliveryList, DeliveryPartList,
                 MemberAddressField,
             };
@@ -56,6 +58,9 @@ namespace Elwig.Windows {
 
             InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
             SearchInput.TextChanged -= SearchInput_TextChanged;
+            SeasonInput.Value = Utils.CurrentLastSeason;
+
+            DoShowWarningWindows = false;
 
             if (IsReceipt) {
                 Title = "Übernahme - Elwig";
@@ -66,6 +71,10 @@ namespace Elwig.Windows {
                 if (n < 3) WeighingCButton.Visibility = Visibility.Hidden;
                 if (n < 4) WeighingDButton.Visibility = Visibility.Hidden;
                 if (n == 1) WeighingAButton.Content = "Wiegen";
+                if (n > 1) WeighingAButton.Content = $"Wiegen {App.Scales[0].ScaleId}";
+                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.Scales[1].ScaleId}";
+                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.Scales[2].ScaleId}";
+                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.Scales[3].ScaleId}";
             } else {
                 WeighingManualButton.Visibility = Visibility.Hidden;
                 WeighingAButton.Visibility = Visibility.Hidden;
@@ -78,6 +87,8 @@ namespace Elwig.Windows {
         public DeliveryAdminWindow(int mgnr) : this() {
             Member = Context.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
             Title = $"Lieferungen - {Member.AdministrativeName} - Elwig";
+            AllSeasonsInput.IsEnabled = true;
+            AllSeasonsInput.IsChecked = true;
         }
 
         private async void Window_Loaded(object sender, RoutedEventArgs evt) {
@@ -95,18 +106,38 @@ namespace Elwig.Windows {
 
         private async void Menu_Print_ShowDeliveryNote_Click(object sender, RoutedEventArgs evt) {
             if (DeliveryList.SelectedItem is not Delivery d) return;
-            using var doc = new DeliveryNote(d);
+            Mouse.OverrideCursor = Cursors.Wait;
+            using var doc = new DeliveryNote(d, Context);
             await doc.Generate();
             doc.Show();
+            Mouse.OverrideCursor = null;
         }
 
         private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) {
             if (DeliveryList.SelectedItem is not Delivery d) return;
-            using var doc = new DeliveryNote(d);
+            Mouse.OverrideCursor = Cursors.Wait;
+            using var doc = new DeliveryNote(d, Context);
             await doc.Generate();
+            Mouse.OverrideCursor = null;
             await doc.Print();
         }
 
+        private async void Menu_Export_Bki_Click(object sender, RoutedEventArgs evt) {
+            if (sender is not MenuItem m) return;
+            var year = int.Parse(m.Header.ToString()?.Split(" ")[^1] ?? Utils.CurrentLastSeason.ToString());
+            var d = new SaveFileDialog() {
+                FileName = $"{App.Client.NameToken}-Traubentransportscheinliste-{year}",
+                DefaultExt = Bki.FileExtension,
+                Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                using var file = new Bki(d.FileName);
+                await file.ExportAsync(year);
+                Mouse.OverrideCursor = null;
+            }
+        }
+
         private void OnSecondPassed(object? sender, EventArgs? evt) {
             if (IsReceipt && IsCreating) {
                 var now = DateTime.Now;
@@ -116,15 +147,23 @@ namespace Elwig.Windows {
         }
 
         private void InitialInputs() {
+            ClearOriginalValues();
+            ClearDefaultValues();
+
             HandPickedInput.IsChecked = null;
-            if (App.Client.Client == ClientParameters.Type.Matzen) {
+            if (App.Client.IsMatzen || App.Client.IsWolkersdorf) {
                 GerebeltGewogenInput.IsChecked = true;
                 GerebeltGewogenInput.IsEnabled = false;
+                SetDefaultValue(GerebeltGewogenInput);
             } else {
                 GerebeltGewogenInput.IsChecked = false;
                 GerebeltGewogenInput.IsEnabled = true;
+                UnsetDefaultValue(GerebeltGewogenInput);
             }
-            ClearOriginalValues();
+
+            WineQualityLevelInput.IsEnabled = false;
+
+            SetDefaultValue(HandPickedInput);
             ValidateRequiredInputs();
         }
 
@@ -140,11 +179,21 @@ namespace Elwig.Windows {
             bool ch = HasChanged, v = IsValid;
             ResetButton.IsEnabled = ch;
             SaveButton.IsEnabled = v && ch;
-            FinishButton.IsEnabled = v || !ch;
+            FinishButton.IsEnabled = v && ch;
-            NewDeliveryPartButton.IsEnabled = v;
+            NewDeliveryPartButton.IsEnabled = v && ch;
             CancelCreatingButton.IsEnabled = DeliveryList.SelectedItem == null || DeliveryPartList.SelectedItem == null;
         }
 
+        private void Input_KeyUp(object sender, KeyEventArgs evt) {
+            if (sender is not Control ctrl) return;
+            if (evt.Key != Key.Enter) return;
+            if (ctrl == MgNrInput || ctrl == MemberInput) {
+                SortIdInput.Focus(); SortIdInput.SelectAll();
+            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributesInput) {
+                GradationOeInput.Focus(); GradationOeInput.SelectAll();
+            }
+        }
+
         private async Task RefreshDeliveryList() {
             await RefreshDeliveryListQuery();
         }
@@ -158,13 +207,120 @@ namespace Elwig.Windows {
                 deliveryQuery = deliveryQuery
                     .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) || 
                                 (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0));
-            } else if (SeasonOnlyInput.IsChecked == true) {
+            } else if (AllSeasonsInput.IsChecked == false) {
-                deliveryQuery = deliveryQuery.Where(d => d.Year == Utils.CurrentLastSeason);
+                deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value);
+            }
+
+            var filterVar = new List<string>();
+            var filterQual = new List<string>();
+            var filterMgNr = new List<int>();
+            var filterDate = new List<string>();
+            var filterPartDate = new List<string>();
+            string? filterTimeGt = null;
+            string? filterTimeLt = null;
+            int filterYearGt = 0;
+            int filterYearLt = 0;
+            double filterKmwGt = 0;
+            double filterKmwLt = 0;
+            double filterOeGt = 0;
+            double filterOeLt = 0;
+
+            var filter = TextFilter.ToList();
+            if (filter.Count > 0) {
+                var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
+                var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
+                var mgnr = await Context.Members.Select(m => m.MgNr.ToString()).ToListAsync();
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+                    if (e.Length == 2 && var.Contains(e.ToUpper())) {
+                        filterVar.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (e.Length == 3 && qual.Contains(e.ToUpper())) {
+                        filterQual.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.Contains(e)) {
+                        filterMgNr.Add(int.Parse(e));
+                        filter.RemoveAt(i--);
+                    } else if (e.StartsWith(">") || e.StartsWith("<")) {
+                        if (double.TryParse(e[1..], out var num)) {
+                            switch ((e[0], num)) {
+                                case ('>', <= 30): filterKmwGt = num; break;
+                                case ('<', <= 30): filterKmwLt = num; break;
+                                case ('>', >= 1900): filterYearGt = (int)num; break;
+                                case ('<', >= 1900): filterYearLt = (int)num; break;
+                                case ('>', _): filterOeGt = num; break;
+                                case ('<', _): filterOeLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        } else if (TimeOnly.TryParse(e[1..], out var time)) {
+                            switch ((e[0], time)) {
+                                case ('>', _): filterTimeGt = $"{time:HH:mm}"; break;
+                                case ('<', _): filterTimeLt = $"{time:HH:mm}"; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 1) filter.RemoveAt(i--);
+                    } else if (e.Length > 1 && Utils.FromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        double? from = (parts[0].Length > 0) ? double.Parse(parts[0].Replace(".", ",")) : null;
+                        double? to = (parts[1].Length > 0) ? double.Parse(parts[1].Replace(".", ",")) : null;
+                        switch ((from, to)) {
+                            case (<= 30, <= 30):
+                            case (<= 30, null):
+                            case (null, <= 30):
+                                filterKmwGt = from ?? 0;
+                                filterKmwLt = to ?? 0;
+                                break;
+                            case (>= 1900, >= 1900):
+                            case (>= 1900, null):
+                            case (null, >= 1900):
+                                filterYearGt = (int)(from ?? 0);
+                                filterYearLt = (int)(to ?? -1) + 1;
+                                break;
+                            case (_, _):
+                                filterOeGt = from ?? 0;
+                                filterOeLt = to ?? 0;
+                                break;
+                        }
+                        filter.RemoveAt(i--);
+                    } else if (e.Length > 1 && Utils.FromToTimeRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        filterTimeGt = TimeOnly.TryParse(parts[0], out var from) ? $"{from:HH:mm}" : null;
+                        filterTimeLt = TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null;
+                        filter.RemoveAt(i--);
+                    } else if (DateOnly.TryParse(e, out var date)) {
+                        filterDate.Add($"{date:yyyy-MM-dd}");
+                        filter.RemoveAt(i--);
+                    } else if (Utils.PartialDateRegex.IsMatch(e)) {
+                        var parts = e.Split(".");
+                        filterPartDate.Add($"-{int.Parse(parts[1]):00}-{int.Parse(parts[0]):00}");
+                        filter.RemoveAt(i--);
+                    } else if (e.Length > 2 && e.StartsWith("\"") && e.EndsWith("\"")) {
+                        filter[i] = e[1..^1];
+                    } else if (e.Length <= 2) {
+                        filter.RemoveAt(i--);
+                    }
+                }
+
+                if (filterMgNr.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterMgNr.Contains(d.MgNr));
+                if (filterDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterDate.Contains(d.DateString));
+                if (filterPartDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterPartDate.Contains(d.DateString.Substring(4)));
+                if (filterYearGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year >= filterYearGt);
+                if (filterYearLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year < filterYearLt);
+                if (filterTimeGt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeGt.CompareTo(d.TimeString) <= 0);
+                if (filterTimeLt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeLt.CompareTo(d.TimeString) > 0);
+                if (filterVar.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterVar.Contains(p.SortId)));
+                if (filterQual.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterQual.Contains(p.QualId)));
+                if (filterKmwGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw >= filterKmwGt));
+                if (filterKmwLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw < filterKmwLt));
+                if (filterOeGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt));
+                if (filterOeLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt));
             }
 
             List<Delivery> deliveries = await deliveryQuery.OrderByDescending(d => d.DateString).ThenByDescending(d => d.TimeString).ToListAsync();
-            if (TextFilter.Count > 0) {
+            if (filter.Count > 0 && deliveries.Count > 0) {
-                var dict = deliveries
+                var dict = deliveries.AsParallel()
                     .ToDictionary(d => d, d => d.SearchScore(TextFilter))
                     .OrderByDescending(a => a.Value)
                     .ThenBy(a => a.Key.DateTime);
@@ -175,7 +331,75 @@ namespace Elwig.Windows {
                     .ToList();
             }
 
-            ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId), DeliveryList_SelectionChanged, ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
+            ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId), DeliveryList_SelectionChanged, IsCreating ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
+
+            var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
+            StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
+            StatusDeliveries.Text = $"Lieferungen: {deliveries.Count}";
+
+            if (filter.Count == 0) {
+                var partsQuery = deliveryQuery.SelectMany(d => d.Parts);
+                if (filterVar.Count > 0) partsQuery = partsQuery.Where(p => filterVar.Contains(p.SortId));
+                if (filterQual.Count > 0) partsQuery = partsQuery.Where(p => filterQual.Contains(p.QualId));
+                if (filterKmwGt > 0) partsQuery = partsQuery.Where(p => p.Kmw >= filterKmwGt);
+                if (filterKmwLt > 0) partsQuery = partsQuery.Where(p => p.Kmw < filterKmwLt);
+                if (filterOeGt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
+                if (filterOeLt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
+                var deliveryParts = partsQuery;
+
+                var n = await deliveryParts.CountAsync();
+                StatusDeliveries.Text = $"Lieferungen: {deliveries.Count} ({n})";
+                var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
+                StatusVarieties.Text = $"Sorten: {varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
+
+                var weight = await deliveryParts.SumAsync(p => p.Weight);
+                StatusWeight.Text = $"Gewicht: {weight:N0} kg";
+
+                if (n > 0) {
+                    var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
+                    var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
+                    var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
+                    StatusGradation.Text = $"Gradation: {kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
+                } else {
+                    StatusGradation.Text = "Gradation: -";
+                }
+
+
+                if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
+                    var parts = (await deliveryParts.ToListAsync());
+                    var groups = parts
+                        .GroupBy(p => string.Join("/", p.Attributes.Select(a => a.Name)))
+                        .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
+                        .OrderByDescending(g => g.Item2)
+                        .ToList();
+
+                    if (groups.Count == 1) {
+                        var g = groups.First().Key;
+                        if (g != "") {
+                            StatusWeight.Text += $" ({g})";
+                            StatusGradation.Text += $" ({g})";
+                        }
+
+                        var sortGroups = parts
+                            .GroupBy(p => p.SortId)
+                            .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
+                            .OrderByDescending(g => g.Item2)
+                            .ToList();
+
+                        if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
+                            StatusWeight.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                            StatusGradation.Text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                        }
+                    } else if (groups.Count <= 4) {
+                        StatusWeight.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item2:N0} kg" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                        StatusGradation.Text += $" = {string.Join(" + ", groups.Select(g => $"{g.Item3:N1}/{g.Item4:N1}/{g.Item5:N1}" + (g.Key == "" ? "" : $" ({g.Key})")))}";
+                    }
+                }
+            } else {
+                StatusVarieties.Text = "Sorten: -";
+                StatusWeight.Text = "Gewicht: -";
+                StatusGradation.Text = "Gradation: -";
+            }
         }
 
         protected override async Task RenewContext() {
@@ -190,22 +414,33 @@ namespace Elwig.Windows {
                 Title = $"Lieferungen - {Member.AdministrativeName} - Elwig";
             }
 
+            Menu_Export_Bki.Items.Clear();
+            foreach (var s in await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
+                var i = new MenuItem {
+                    Header = $"Season {s.Year}",
+                };
+                i.Click += Menu_Export_Bki_Click;
+                Menu_Export_Bki.Items.Add(i);
+            }
+
+            // FIXME on "only one" delivery, RenewContext doees not work
             await RefreshDeliveryList();
             var d = DeliveryList.SelectedItem as Delivery;
             var y = d?.Year ?? Utils.CurrentLastSeason;
-            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
+            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsCreating).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await Context.WineQualityLevels.ToListAsync(), i => (i as WineQualLevel)?.QualId);
-            ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Name).ToListAsync(), i => (i as Modifier)?.ModId);
+            ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
             ControlUtils.RenewItemsSource(WineOriginInput, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId);
             var kgList = await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).Cast<object>().ToListAsync();
             kgList.Insert(0, new NullItem());
             ControlUtils.RenewItemsSource(WineKgInput, kgList, i => (i as AT_Kg)?.KgNr);
             UpdateRdInput();
-
             if (IsCreating) await UpdateLsNr();
+
+            await RefreshDeliveryParts();
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -215,12 +450,12 @@ namespace Elwig.Windows {
             }
         }
 
-        private void RefreshDeliveryParts() {
+        private async Task RefreshDeliveryParts() {
             if (DeliveryList.SelectedItem is Delivery d) {
-                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Name).ToList(), i => (i as Modifier)?.ModId);
+                ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == d.Year).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
                 ControlUtils.RenewItemsSource(DeliveryPartList, d.Parts.OrderBy(p => p.DPNr).ToList(), i => ((i as DeliveryPart)?.Year, (i as DeliveryPart)?.DId, (i as DeliveryPart)?.DPNr), DeliveryPartList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
             } else {
-                ControlUtils.RenewItemsSource(ModifiersInput, Context.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Name).ToList(), i => (i as Modifier)?.ModId);
+                ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == Utils.CurrentLastSeason).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
                 DeliveryPartList.ItemsSource = null;
             }
         }
@@ -233,6 +468,7 @@ namespace Elwig.Windows {
                 FillInputs(d);
             } else {
                 ClearOriginalValues();
+                ClearDefaultValues();
                 ClearInputs(validate);
                 ClearInputStates();
             }            
@@ -241,6 +477,7 @@ namespace Elwig.Windows {
 
         private void FillInputs(Delivery d) {
             ClearOriginalValues();
+            ClearDefaultValues();
 
             MgNrInput.Text = d.MgNr.ToString();
             ControlUtils.SelectComboBoxItem(BranchInput, i => (i as Branch)?.ZwstId, d.ZwstId);
@@ -257,12 +494,13 @@ namespace Elwig.Windows {
             TemperatureInput.Text = "";
             AcidInput.Text = "";
 
-            FillOriginalValues();
+            FinishInputFilling();
         }
 
         private void FillInputs(DeliveryPart p) {
-            ClearOriginalValues();
             FillInputs(p.Delivery);
+            ClearOriginalValues();
+            ClearDefaultValues();
 
             SortIdInput.Text = p?.SortId ?? "";
             ControlUtils.SelectCheckComboBoxItems(AttributesInput, p?.Attributes, i => (i as WineAttr)?.AttrId);
@@ -281,12 +519,17 @@ namespace Elwig.Windows {
             LesewagenInput.IsChecked = p?.IsLesewagen ?? false;
             HandPickedInput.IsChecked = p?.IsHandPicked;
 
-            FillOriginalValues();
+            ScaleId = p?.ScaleId;
+            WeighingId = p?.WeighingId;
+
+            FinishInputFilling();
         }
 
         private async Task<DeliveryPart> UpdateDeliveryPart(Delivery? d, DeliveryPart? p) {
             int year, did, dpnr;
             bool deliveryNew = (d == null), partNew = (p == null);
+            var originalMgNr = d?.MgNr;
+            var originalMemberKgNr = d?.Member?.DefaultKgNr;
             if (d == null) {
                 d = Context.CreateProxy<Delivery>();
                 year = Utils.CurrentNextSeason;
@@ -342,8 +585,6 @@ namespace Elwig.Windows {
             if (ManualWeighingReason != null)
                 p.Comment = (p.Comment != null ? $"{p.Comment} / " : "") + $"Begründung Handwiegung: {ManualWeighingReason}";
 
-            // TODO update KgNr when MgNr changes (if default is selected)
-
             EntityEntry<Delivery>? dEntry = null;
             EntityEntry<DeliveryPart>? pEntry = null;
             try {
@@ -355,55 +596,27 @@ namespace Elwig.Windows {
                     pEntry = partNew ? await Context.AddAsync(p) : Context.Update(p);
                 }
 
-                foreach (var a in AttributesInput.ItemsSource.Cast<WineAttr>()) {
+                await Context.UpdateDeliveryPartAttributes(p, AttributesInput.SelectedItems.Cast<WineAttr>());
-                    var attr = p.PartAttributes.Where(pa => pa.AttrId == a.AttrId).FirstOrDefault();
+                await Context.UpdateDeliveryPartModifiers(p, ModifiersInput.SelectedItems.Cast<Modifier>());
-                    if (AttributesInput.SelectedItems.Contains(a)) {
-                        DeliveryPartAttr dpa = attr ?? Context.CreateProxy<DeliveryPartAttr>();
-                        dpa.Year = year;
-                        dpa.DId = did;
-                        dpa.DPNr = dpnr;
-                        dpa.AttrId = a.AttrId;
-                        if (attr == null) {
-                            await Context.AddAsync(dpa);
-                        } else {
-                            Context.Update(dpa);
-                        }
-                    } else {
-                        if (attr != null) {
-                            Context.Remove(attr);
-                        }
-                    }
-                }
 
-                foreach (var m in ModifiersInput.ItemsSource.Cast<Modifier>()) {
+                if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
-                    var mod = p.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
+                    // update origin (KgNr), if default is selected
-                    if (ModifiersInput.SelectedItems.Contains(m)) {
+                    var newKgNr = (await Context.Members.FindAsync(d.MgNr))?.DefaultKgNr;
-                        DeliveryPartModifier dpm = mod ?? Context.CreateProxy<DeliveryPartModifier>();
+                    foreach (var part in d.Parts.Where(part => part.DPNr != dpnr && part.KgNr == originalMemberKgNr)) {
-                        dpm.Year = year;
+                        part.KgNr = newKgNr;
-                        dpm.DId = did;
+                        Context.Update(part);
-                        dpm.DPNr = dpnr;
-                        dpm.ModId = m.ModId;
-                        if (mod == null) {
-                            await Context.AddAsync(dpm);
-                        } else {
-                            Context.Update(dpm);
-                        }
-                    } else {
-                        if (mod != null) {
-                            Context.Remove(mod);
-                        }
                     }
                 }
 
                 await Context.SaveChangesAsync();
             } catch (Exception exc) {
                 if (dEntry != null) {
+                    dEntry.State = EntityState.Detached;
                     await dEntry.ReloadAsync();
-                    if (deliveryNew) dEntry.State = EntityState.Detached;
                 }
                 if (pEntry != null) {
+                    pEntry.State = EntityState.Detached;
                     await pEntry.ReloadAsync();
-                    if (partNew) pEntry.State = EntityState.Detached;
                 }
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -451,19 +664,36 @@ namespace Elwig.Windows {
             await RefreshDeliveryListQuery(true);
         }
 
+        private async void SeasonInput_ValueChanged(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value == null) return;
+            TodayOnlyInput.IsChecked = false;
+            AllSeasonsInput.IsChecked = false;
+            await RefreshDeliveryListQuery();
+        }
+
         private async void TodayOnlyInput_Changed(object sender, RoutedEventArgs evt) {
-            if (TodayOnlyInput.IsChecked == true && SeasonOnlyInput.IsChecked == true) SeasonOnlyInput.IsChecked = false;
+            if (TodayOnlyInput.IsChecked == true && AllSeasonsInput.IsChecked == false) {
+                SeasonInput.Value = Utils.Today.Year;
+                TodayOnlyInput.IsChecked = true;
+            }
             await RefreshDeliveryListQuery();
         }
 
-        private async void SeasonOnlyInput_Changed(object sender, RoutedEventArgs evt) {
+        private async void AllSeasonsInput_Changed(object sender, RoutedEventArgs evt) {
-            if (!IsInitialized) return;
+            if (AllSeasonsInput.IsChecked == true) {
-            if (SeasonOnlyInput.IsChecked == true && TodayOnlyInput.IsChecked == true) TodayOnlyInput.IsChecked = false;
+                SeasonInput.IsEnabled = false;
+                SeasonInput.Text = "";
+            } else {
+                SeasonInput.IsEnabled = true;
+                var today = TodayOnlyInput.IsChecked;
+                SeasonInput.Value = Utils.CurrentLastSeason;
+                TodayOnlyInput.IsChecked = today;
+            }
             await RefreshDeliveryListQuery();
         }
 
-        private void DeliveryList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private async void DeliveryList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
-            RefreshDeliveryParts();
+            await RefreshDeliveryParts();
             if (DeliveryList.SelectedItem != null) {
                 DeleteDeliveryButton.IsEnabled = true;
                 Menu_Print_ShowDeliveryNote.IsEnabled = !IsEditing && !IsCreating;
@@ -477,8 +707,8 @@ namespace Elwig.Windows {
 
         private void DeliveryPartList_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             RefreshInputs();
-            if (DeliveryPartList.SelectedItem != null) {
+            if (DeliveryPartList.SelectedItem is DeliveryPart p) {
-                AbwertenButton.IsEnabled = true;
+                AbwertenButton.IsEnabled = p.QualId != "WEI";
                 EditDeliveryButton.IsEnabled = true;
                 ExtractDeliveryPartButton.IsEnabled = !IsCreating;
                 DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating;
@@ -500,45 +730,65 @@ namespace Elwig.Windows {
             MemberInput.SelectedItem = valid ? Context.Members.Find(int.Parse(MgNrInput.Text)) : null;
         }
 
-        private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+        private void MemberInput_SelectionChanged(object? sender, SelectionChangedEventArgs? evt) {
             var m = MemberInput.SelectedItem as Member;
             if (m != null) MgNrInput.Text = m.MgNr.ToString();
             MemberAddressField.Text = m?.FullAddress;
             if (m == null) {
-                UnsetOriginalValue(WineKgInput);
+                UnsetDefaultValue(WineKgInput);
                 WineKgInput.SelectedIndex = 0;
             } else {
-                SetOriginalValue(WineKgInput, m.DefaultKg);
+                SetDefaultValue(WineKgInput, m.DefaultKg);
                 WineKgInput.SelectedItem = m.DefaultKg;
             }
         }
 
         private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
+            FinishButton.IsEnabled = false;
+            NewDeliveryPartButton.IsEnabled = false;
+            NewDeliveryPartButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
             await RefreshDeliveryList();
-            RefreshDeliveryParts();
+            await RefreshDeliveryParts();
-            DeliveryList.SelectedItem = p.Delivery;
+            NewDeliveryPartButton.Cursor = null;
+            DeliveryList.SelectedItem = p?.Delivery;
             DeliveryPartList.SelectedItem = null;
+            RefreshInputs();
             InitialInputs();
         }
 
         private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
+            FinishButton.IsEnabled = false;
+            NewDeliveryPartButton.IsEnabled = false;
+            FinishButton.Cursor = Cursors.Wait;
             DeliveryPartList.IsEnabled = false;
             var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
             await RefreshDeliveryList();
-            RefreshDeliveryParts();
+            await RefreshDeliveryParts();
-            if (p != null) {
+            if (p?.Delivery != null) {
-                using var doc = new DeliveryNote(p.Delivery);
+                Mouse.OverrideCursor = Cursors.Wait;
+                using var doc = new DeliveryNote(p.Delivery, Context);
                 await doc.Generate();
+                Mouse.OverrideCursor = null;
                 doc.Show();
                 //await doc.Print(2);
             }
+            FinishButton.Cursor = null;
             DeliveryList.SelectedItem = null;
+            RefreshInputs();
             InitInputs();
         }
 
-        private void CancelCreatingButton_Click(object sender, RoutedEventArgs evt) {
+        private async void CancelCreatingButton_Click(object sender, RoutedEventArgs evt) {
+            if (IsCreating && HasChanged) {
+                var r = MessageBox.Show("Soll der Vorgang wirklich abgebrochen werden?", "Abbrechen bestätigen",
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) return;
+            }
+
+            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             if (DeliveryList.SelectedItem is not Delivery d) {
                 // switch away from creating mode
                 IsCreating = false;
@@ -559,21 +809,74 @@ namespace Elwig.Windows {
             }
         }
 
-        private void NewDeliveryButton_Click(object? sender, RoutedEventArgs? evt) {
+        private async void NewDeliveryButton_Click(object? sender, RoutedEventArgs? evt) {
+            TodayOnlyInput.IsChecked = true;
+            SearchInput.Text = "";
+            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             IsCreating = true;
             DeliveryList.IsEnabled = false;
             DeliveryPartList.IsEnabled = false;
             EnableWeighingButtons();
             DeliveryList.SelectedItem = null;
             HideNewEditDeleteButtons();
-            ShowFinishNewPartDeliveryCancelButtons();
             UnlockInputs();
             InitInputs();
+            ShowFinishNewPartDeliveryCancelButtons();
             LockSearchInputs();
         }
 
-        private void AbwertenButton_Click(object sender, RoutedEventArgs evt) {
+        private async void AbwertenButton_Click(object sender, RoutedEventArgs evt) {
-            // TODO abwerten dialog
+            if (DeliveryPartList.SelectedItem is not DeliveryPart p) return;
+            var res = Utils.ShowAbwertenDialog($"{p.Delivery.LsNr}/{p.DPNr}", p.Delivery.Member.AdministrativeName, p.Weight);
+            EntityEntry<DeliveryPart>? entry1 = null, entry2 = null;
+            try {
+                if (res == null || res <= 0)
+                    return;
+                Mouse.OverrideCursor = Cursors.Wait;
+                ClearOriginalValues();
+                if (res >= p.Weight) {
+                    ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, "WEI");
+                    ControlUtils.SelectComboBoxItem(WineOriginInput, o => (o as WineOrigin)?.HkId, "OEST");
+                    p.QualId = "WEI";
+                    p.HkId = "OEST";
+                    entry1 = Context.Update(p);
+                } else {
+                    var w = p.Weight - res.Value;
+                    WeightInput.Text = $"{w:N0}";
+                    p.Weight = w;
+                    entry1 = Context.Update(p);
+
+                    var d = p.Delivery;
+                    var p2 = Context.CreateProxy<DeliveryPart>();
+                    var values = Context.Entry(p).CurrentValues;
+                    Context.Entry(p2).CurrentValues.SetValues(values);
+                    p2.DPNr = await Context.NextDPNr(d.Year, d.DId);
+                    p2.Weight = res.Value;
+                    p2.QualId = "WEI";
+                    p2.HkId = "OEST";
+                    entry2 = await Context.AddAsync(p2);
+
+                    await Context.UpdateDeliveryPartAttributes(p2, p.Attributes);
+                    await Context.UpdateDeliveryPartModifiers(p2, p.Modifiers);
+                }
+                await Context.SaveChangesAsync();
+                await RefreshDeliveryParts();
+                Mouse.OverrideCursor = null;
+                FinishInputFilling();
+            } catch (Exception exc) {
+                if (entry1 != null) {
+                    entry1.State = EntityState.Detached;
+                    await entry1.ReloadAsync();
+                }
+                if (entry2 != null) {
+                    entry2.State = EntityState.Detached;
+                    await entry2.ReloadAsync();
+                }
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
         private void WeighingManualButton_Click(object sender, RoutedEventArgs evt) {
@@ -612,31 +915,38 @@ namespace Elwig.Windows {
                 $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r == MessageBoxResult.Yes) {
+                Mouse.OverrideCursor = Cursors.Wait;
                 Context.Remove(d);
                 await Context.SaveChangesAsync();
                 await RefreshDeliveryList();
-                RefreshDeliveryParts();
+                await RefreshDeliveryParts();
+                Mouse.OverrideCursor = null;
             }
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
-            DeliveryPart p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
+            SaveButton.IsEnabled = false;
+            SaveButton.Cursor = Cursors.Wait;
 
             IsEditing = false;
             IsCreating = false;
             DeliveryList.IsEnabled = true;
             DeliveryPartList.IsEnabled = true;
 
+            DeliveryPart p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
+
+            SaveButton.Cursor = null;
+
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             LockInputs();
             UnlockSearchInputs();
-            FillOriginalValues();
+            FinishInputFilling();
             await RefreshDeliveryList();
-            RefreshDeliveryParts();
+            await RefreshDeliveryParts();
             RefreshInputs();
 
-            AbwertenButton.IsEnabled = true;
+            AbwertenButton.IsEnabled = p.QualId != "WEI";
             ExtractDeliveryPartButton.IsEnabled = DeliveryPartList.SelectedItem != null && !IsCreating;
             DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating;
         }
@@ -660,17 +970,79 @@ namespace Elwig.Windows {
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             RefreshInputs();
-            ClearInputStates();
             LockInputs();
             UnlockSearchInputs();
 
-            AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem != null;
+            AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem is DeliveryPart p && p.QualId != "WEI";
             ExtractDeliveryPartButton.IsEnabled = DeliveryPartList.SelectedItem != null && !IsCreating;
             DeleteDeliveryPartButton.IsEnabled = DeliveryList.SelectedItem is Delivery { Parts.Count: > 1 } && !IsCreating;
         }
 
-        private void ExtractDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
+        private async void ExtractDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
-            // TODO extract delivery part
+            if (DeliveryPartList.SelectedItem is not DeliveryPart p)
+                return;
+
+            var delivery = p.Delivery;
+            var day = delivery.Date;
+            var count = delivery.Parts.Count;
+
+            if (delivery.Time <= new TimeOnly(3, 0))
+                day = day.AddDays(-1);
+            var lsnrs = await Context.Deliveries
+                .Where(d => d.ZwstId == delivery.ZwstId)
+                .Where(d => (d.DateString == day.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||
+                            (d.DateString == day.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0))
+                .Where(d => d.LsNr != delivery.LsNr)
+                .OrderBy(d => d.LsNr)
+                .Select(d => d.LsNr)
+                .ToListAsync();
+
+            var res = Utils.ShowDeliveryExtractionDialog($"{delivery.LsNr}/{p.DPNr}", delivery.Member.AdministrativeName, count == 1, lsnrs);
+            if (res == null) return;
+            EntityEntry<Delivery>? entry = null;
+            try {
+                Delivery? d = null;
+                Mouse.OverrideCursor = Cursors.Wait;
+                if (res == "new") {
+                    d = Context.CreateProxy<Delivery>();
+                    d.Date = delivery.Date;
+                    d.Time = delivery.Time;
+                    d.Year = p.Year;
+                    d.DId = await Context.NextDId(d.Year);
+                    d.LNr = await Context.NextLNr(d.Date);
+                    d.ZwstId = delivery.ZwstId;
+                    d.MgNr = delivery.MgNr;
+                    d.Comment = delivery.Comment;
+                    d.LsNr = Utils.GenerateLsNr(d);
+                    entry = await Context.AddAsync(d);
+                    await Context.SaveChangesAsync();
+                } else {
+                    d = await Context.Deliveries.Where(d => d.LsNr == res).FirstOrDefaultAsync();
+                }
+                if (d == null) return;
+
+                await Context.Database.ExecuteSqlAsync($"UPDATE delivery_part SET year = {d.Year}, did = {d.DId}, dpnr = {await Context.NextDPNr(d.Year, d.DId)} WHERE (year, did, dpnr) = ({p.Year}, {p.DId}, {p.DPNr})");
+                Context.Entry(p).State = EntityState.Detached;
+                if (count == 1) {
+                    await Context.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({delivery.Year}, {delivery.DId})");
+                    Context.Entry(delivery).State = EntityState.Detached;
+                }
+                await Context.SaveChangesAsync();
+                await Context.Entry(p).ReloadAsync();
+                await Context.Entry(delivery).ReloadAsync();
+
+                Mouse.OverrideCursor = null;
+                await RefreshDeliveryList();
+                DeliveryList.SelectedItem = d;
+            } catch (Exception exc) {
+                if (entry != null) {
+                    entry.State = EntityState.Detached;
+                    await entry.ReloadAsync();
+                }
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
         private async void DeleteDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
@@ -681,9 +1053,11 @@ namespace Elwig.Windows {
                 $"Soll die Teillieferung Nr. {p.DPNr} wirklich unwiderruflich gelöscht werden?",
                 "Lieferung löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
             if (r == MessageBoxResult.Yes) {
+                Mouse.OverrideCursor = Cursors.Wait;
                 Context.Remove(p);
                 await Context.SaveChangesAsync();
-                RefreshDeliveryParts();
+                await RefreshDeliveryParts();
+                Mouse.OverrideCursor = null;
             }
         }
 
@@ -707,7 +1081,7 @@ namespace Elwig.Windows {
 
         private void ShowNewEditDeleteButtons() {
             NewDeliveryButton.IsEnabled = IsReceipt;
-            AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem != null;
+            AbwertenButton.IsEnabled = DeliveryPartList.SelectedItem is DeliveryPart p && p.QualId == "WEI";
             EditDeliveryButton.IsEnabled = DeliveryPartList.SelectedItem != null;
             DeleteDeliveryButton.IsEnabled = DeliveryList.SelectedItem != null;
             NewDeliveryButton.Visibility = IsReceipt ? Visibility.Visible : Visibility.Hidden;
@@ -728,8 +1102,8 @@ namespace Elwig.Windows {
         }
 
         private void ShowFinishNewPartDeliveryCancelButtons() {
-            FinishButton.IsEnabled = IsCreating && IsValid;
+            FinishButton.IsEnabled = false;
-            NewDeliveryPartButton.IsEnabled = IsCreating && IsValid;
+            NewDeliveryPartButton.IsEnabled = false;
             CancelCreatingButton.IsEnabled = true;
             FinishButton.Visibility = Visibility.Visible;
             NewDeliveryPartButton.Visibility = Visibility.Visible;
@@ -747,14 +1121,16 @@ namespace Elwig.Windows {
 
         private void LockSearchInputs() {
             SearchInput.IsEnabled = false;
+            SeasonInput.IsEnabled = false;
             TodayOnlyInput.IsEnabled = false;
-            SeasonOnlyInput.IsEnabled = false;
+            AllSeasonsInput.IsEnabled = false;
         }
 
         private void UnlockSearchInputs() {
             SearchInput.IsEnabled = true;
+            SeasonInput.IsEnabled = true;
             TodayOnlyInput.IsEnabled = true;
-            SeasonOnlyInput.IsEnabled = true;
+            AllSeasonsInput.IsEnabled = (Member != null);
         }
 
         new protected void UnlockInputs() {
@@ -782,10 +1158,11 @@ namespace Elwig.Windows {
 
         private void EnableWeighingButtons() {
             WeighingManualButton.IsEnabled = true;
-            WeighingAButton.IsEnabled = true;
+            var n = App.Scales.Count;
-            WeighingBButton.IsEnabled = true;
+            WeighingAButton.IsEnabled = n > 0 && App.Scales[0].IsReady;
-            WeighingCButton.IsEnabled = true;
+            WeighingBButton.IsEnabled = n > 1 && App.Scales[1].IsReady;
-            WeighingDButton.IsEnabled = true;
+            WeighingCButton.IsEnabled = n > 2 && App.Scales[2].IsReady;
+            WeighingDButton.IsEnabled = n > 3 && App.Scales[3].IsReady;
         }
 
         private async Task UpdateLsNr() {
@@ -795,7 +1172,7 @@ namespace Elwig.Windows {
                 var branch = (Branch)BranchInput.SelectedItem;
                 var date = DateOnly.ParseExact(DateInput.Text, "dd.MM.yyyy");
                 var lnr = await Context.NextLNr(date);
-                LsNrInput.Text = $"{date:yyyyMMdd}{branch.ZwstId}{lnr:000}";
+                LsNrInput.Text = Utils.GenerateLsNr(date, branch.ZwstId, lnr);
             }
         }
 
@@ -833,14 +1210,14 @@ namespace Elwig.Windows {
 
         private void UpdateWineQualityLevels() {
             if (!GetInputValid(GradationKmwInput)) {
-                UnsetOriginalValue(WineQualityLevelInput);
+                UnsetDefaultValue(WineQualityLevelInput);
                 WineQualityLevelInput.ItemsSource = Context.WineQualityLevels.Where(q => q.QualId == "WEI").ToList();
                 return;
             }
             var kmw = double.Parse(GradationKmwInput.Text);
             WineQualityLevelInput.ItemsSource = Context.WineQualityLevels.Where(q => q.MinKmw == null || q.MinKmw <= kmw).ToList();
             var qual = Context.GetWineQualityLevel(kmw).GetAwaiter().GetResult();
-            SetOriginalValue(WineQualityLevelInput, qual);
+            SetDefaultValue(WineQualityLevelInput, qual);
             if (WineQualityLevelInput.SelectedItem == null || (WineQualityLevelInput.SelectedItem is WineQualLevel selected && !selected.IsPredicate)) {
                 WineQualityLevelInput.SelectedItem = qual;
             }
@@ -896,7 +1273,29 @@ namespace Elwig.Windows {
         }
 
         private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
+            if (!IsEditing && !IsCreating) return;
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
+            if (App.Client.IsMatzen) {
+                var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
+                if (kl.Count() > 1) {
+                    foreach (var r in kl.Take(kl.Count() - 1)) ModifiersInput.SelectedItems.Remove(r);
+                }
+            }
+        }
 
+        private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
+            if (!IsEditing && !IsCreating) return;
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
+            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
+            var lw = LesewagenInput.IsChecked == true;
+            if (App.Client.IsMatzen) {
+                var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
+                if (lw) kl++; else kl--;
+                var newKl = source.Where(m => m.ModId == kl.ToString()).FirstOrDefault();
+                if (newKl != null) ModifiersInput.SelectedItems.Add(newKl);
+            }
+            CheckBox_Changed(sender, evt);
         }
 
         private void UpdateWineOrigin() {
@@ -904,11 +1303,13 @@ namespace Elwig.Windows {
             var kg = (WineKgInput.SelectedItem as AT_Kg)?.WbKg;
             if (qual == null || kg == null) {
                 WineOriginInput.IsEnabled = (IsEditing || IsCreating);
+                UnsetDefaultValue(WineOriginInput);
                 return;
             }
             WineOriginInput.IsEnabled = false;
             var o = kg.Origin;
             while (o != null && o.Level > qual.OriginLevel) o = o.Parent;
+            SetDefaultValue(WineOriginInput, o);
             WineOriginInput.SelectedItem = o;
         }
 
@@ -950,5 +1351,18 @@ namespace Elwig.Windows {
         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender);
         }
+
+        private void TemperatureAcidInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal((TextBox)sender, false, 2, 1));
+        }
+
+        private void TemperatureAcidInput_LostFocus(object sender, RoutedEventArgs evt) {
+            if (sender is not TextBox tb) return;
+            if (tb.Text.Length > 0) {
+                if (!tb.Text.Contains(',')) tb.Text += ",0";
+                if (tb.Text.EndsWith(",")) tb.Text += "0";
+            }
+            InputLostFocus(tb, Validator.CheckDecimal(tb, false, 2, 1));
+        }
     }
 }

Elwig/Windows/MainWindow.xaml

@@ -23,7 +23,7 @@
                 <MenuItem Header="Über"/>
             </MenuItem>
         </Menu>
-        <Grid Height="100" VerticalAlignment="Top" Margin="0,25,0,0">
+        <Grid Height="100" VerticalAlignment="Top" Margin="25,25,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="*"/>
@@ -38,22 +38,20 @@
                    HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
         </Grid>
 
-        <Button x:Name="MemberAdminButton" Content="Mitgliederverwaltung" Click="MemberAdminButton_Click"
+        <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
                 Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="MemberListButton" Content="Mitgliederliste" Click="MemberListButton_Click"
-                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
         <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
+                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
                 Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="DeliveryAdminButton" Content="Lieferungsverwaltung" Click="DeliveryAdminButton_Click"
+        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
                 Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-        <Button x:Name="DeliveryListButton" Content="Lieferungungen" Click="DeliveryListButton_Click" IsEnabled="False"
+        <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
                 Margin="50,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
 
-        <Button x:Name="PdfButton" Content="PDF Erzeugen" Click="PdfButton_Click" Tag="Print"
-                Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
         <Button x:Name="TestWindowButton" Content="Test Fenster" Click="TestWindowButton_Click"
-                Margin="260,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
         <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
-                Margin="260,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
     </Grid>
 </Window>

Elwig/Windows/MainWindow.xaml.cs

@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Windows;
-using Elwig.Documents;
-using Elwig.Helpers;
 
 namespace Elwig.Windows {
     public partial class MainWindow : Window {
@@ -10,9 +7,7 @@ namespace Elwig.Windows {
             InitializeComponent();
         }
 
-        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+        private void Window_Loaded(object sender, RoutedEventArgs evt) { }
-            PdfButton.IsEnabled = App.IsPrintingReady;
-        }
 
         private void MemberAdminButton_Click(object sender, RoutedEventArgs evt) {
             var w = new MemberAdminWindow();
@@ -38,15 +33,6 @@ namespace Elwig.Windows {
             // TODO
         }
 
-        private void PdfButton_Click(object sender, RoutedEventArgs evt) {
-            Utils.RunBackground("PDF Generation", async () => {
-                using var ctx = new AppDbContext();
-                using var doc = new DeliveryNote(ctx.Deliveries.OrderBy(d => d.Parts.Count).ThenBy(d => d.Year).ThenBy(d => d.DId).Last());
-                await doc.Generate();
-                doc.Show();
-            });
-        }
-
         private void TestWindowButton_Click(object sender, RoutedEventArgs evt) {
             var w = new TestWindow();
             w.Show();
@@ -56,5 +42,15 @@ namespace Elwig.Windows {
             var w = new QueryWindow();
             w.Show();
         }
+
+        private void BaseDataButton_Click(object sender, RoutedEventArgs evt) {
+            var w = new BaseDataWindow();
+            w.Show();
+        }
+
+        private void PaymentWindowButton_Click(object sender, RoutedEventArgs e) {
+            var w = new ChartWindow();
+            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="Mitgliederverwaltung - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
+        Title="Mitglieder - Elwig" Height="670" Width="1250" MinHeight="600" MinWidth="1000"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -155,6 +155,10 @@
                 <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"/>
 
+                <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="Adresse:" Margin="10,130,0,0"/>
                 <TextBox x:Name="AddressInput" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"
                          TextChanged="TextBox_TextChanged"/>
@@ -175,8 +179,8 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Content="E-Mail-Adresse:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailInput" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                <TextBox x:Name="EmailAddressInput" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                         TextChanged="EmailInput_TextChanged" LostFocus="EmailInput_LostFocus"/>
+                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
 
                 <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"
@@ -258,10 +262,10 @@
                 </Grid.ColumnDefinitions>
 
                 <Label Content="UID:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="UstIdInput" Margin="0,10,10,0" Grid.Column="1" Width="120" HorizontalAlignment="Left"
+                <TextBox x:Name="UstIdNrInput" Margin="0,10,10,0" Grid.Column="1" Width="96" HorizontalAlignment="Left"
-                         TextChanged="UstIdInput_TextChanged" LostFocus="UstIdInput_LostFocus"/>
+                         TextChanged="UstIdNrInput_TextChanged" LostFocus="UstIdNrInput_LostFocus"/>
 
-                <Label Content="BetriebsNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+                <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"/>
 
@@ -328,7 +332,7 @@
                           Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                           Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="StammZwst.:" Margin="10,130,0,0" Grid.Column="0"/>
+                <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"/>
 

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -72,7 +72,7 @@ namespace Elwig.Windows {
             List<Member> members = await memberQuery.ToListAsync();
 
             if (TextFilter.Count > 0) {
-                var dict = members
+                var dict = members.AsParallel()
                     .ToDictionary(m => m, m => m.SearchScore(TextFilter))
                     .OrderByDescending(a => a.Value)
                     .ThenBy(a => a.Key.FamilyName)
@@ -106,6 +106,7 @@ namespace Elwig.Windows {
                 AreaCommitmentButton.IsEnabled = false;
                 DeliveryButton.IsEnabled = false;
                 ClearOriginalValues();
+                ClearDefaultValues();
                 ClearInputs(validate);
                 ClearInputStates();
             }
@@ -113,13 +114,19 @@ namespace Elwig.Windows {
         }
 
         private async void InitInputs() {
+            ClearOriginalValues();
+            ClearDefaultValues();
+
             MgNrInput.Text = (await Context.NextMgNr()).ToString();
             EntryDateInput.Text = DateTime.Now.ToString("dd.MM.yyyy");
             if (Context.Branches.Count() == 1)
                 BranchInput.SelectedItem = Context.Branches.First();
             ActiveInput.IsChecked = true;
             ContactPostalInput.IsChecked = true;
-            FillOriginalValues();
+
+            SetDefaultValue(MgNrInput);
+            SetDefaultValue(EntryDateInput);
+            SetDefaultValue(ActiveInput);
             ValidateRequiredInputs();
         }
 
@@ -213,7 +220,7 @@ namespace Elwig.Windows {
             LockInputs();
             UpdatePhoneNrInputVisibility();
             UnlockSearchInputs();
-            FillOriginalValues();
+            FinishInputFilling();
             await RefreshMemberList();
             RefreshInputs();
             SearchInput.Text = "";
@@ -237,7 +244,6 @@ namespace Elwig.Windows {
             HideSaveResetCancelButtons();
             ShowNewEditDeleteButtons();
             RefreshInputs();
-            ClearInputStates();
             LockInputs();
             UpdatePhoneNrInputVisibility();
             UnlockSearchInputs();
@@ -337,16 +343,17 @@ namespace Elwig.Windows {
             m.FamilyName = FamilyNameInput.Text;
             m.Suffix = (SuffixInput.Text == "") ? null : SuffixInput.Text;
             m.Birthday = (BirthdayInput.Text == "") ? null : string.Join("-", BirthdayInput.Text.Split(".").Reverse());
+            m.IsDeceased = DeceasedInput.IsChecked ?? false;
             m.CountryNum = 40;  // Austria AT AUT
             m.PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id;
             m.Address = AddressInput.Text;
 
-            m.Email = (EmailInput.Text == "") ? null : EmailInput.Text;
+            m.Email = (EmailAddressInput.Text == "") ? null : EmailAddressInput.Text;
 
             m.Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", "");
             m.Bic = (BicInput.Text == "") ? null : BicInput.Text;
 
-            m.UstId = (UstIdInput.Text == "") ? null : UstIdInput.Text;
+            m.UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text;
             m.LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text;
             m.IsBuchführend = BuchführendInput.IsChecked ?? false;
 
@@ -370,6 +377,8 @@ namespace Elwig.Windows {
                 } else if (IsCreating) {
                     m.MgNr = newMgNr;
                     tr = (await Context.AddAsync(m));
+                } else {
+                    throw new Exception();
                 }
 
                 if (BillingOrtInput.SelectedItem == null) {
@@ -418,13 +427,15 @@ namespace Elwig.Windows {
 
                 if (newMgNr != m.MgNr) {
                     await Context.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {m.MgNr}");
-                    await Context.Members.LoadAsync();
+                    tr.State = EntityState.Detached;
+                    await Context.SaveChangesAsync();
+                    await tr.ReloadAsync();
                     m = await Context.Members.FindAsync(newMgNr);
                 }
             } catch (Exception exc) {
                 if (tr != null) {
+                    tr.State = EntityState.Detached;
                     await tr.ReloadAsync();
-                    if (memberNew) tr.State = EntityState.Detached;
                 }
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                 if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -436,6 +447,7 @@ namespace Elwig.Windows {
 
         private void FillInputs(Member m) {
             ClearOriginalValues();
+            ClearDefaultValues();
 
             MgNrInput.Text = m.MgNr.ToString();
             PredecessorMgNrInput.Text = m.PredecessorMgNr.ToString();
@@ -451,6 +463,7 @@ namespace Elwig.Windows {
             } else {
                 Age.Text = "-";
             }
+            DeceasedInput.IsChecked = m.IsDeceased;
             AddressInput.Text = m.Address;
             AT_PlzDest? p = m.PostalDest.AtPlz;
             if (p != null) {
@@ -461,7 +474,7 @@ namespace Elwig.Windows {
                 OrtInput.SelectedItem = null;
             }
 
-            EmailInput.Text = m.Email;
+            EmailAddressInput.Text = m.Email;
             var phoneNrs = m.TelephoneNumbers.OrderBy(p => p.Nr).ToList();
             for (int i = 0; i < PhoneNrInputs.Length; i++) {
                 if (i < phoneNrs.Count) {
@@ -476,7 +489,7 @@ namespace Elwig.Windows {
             IbanInput.Text = m.Iban;
             BicInput.Text = m.Bic;
 
-            UstIdInput.Text = m.UstId;
+            UstIdNrInput.Text = m.UstIdNr;
             LfbisNrInput.Text = m.LfbisNr;
             BuchführendInput.IsChecked = m.IsBuchführend;
 
@@ -513,7 +526,7 @@ namespace Elwig.Windows {
 
             Menu_Member_SendEmail.IsEnabled = m.Email != null;
 
-            FillOriginalValues();
+            FinishInputFilling();
         }
 
         new protected void ClearInputs(bool validate = false) {

Elwig/Windows/QueryWindow.xaml.cs

@@ -1,8 +1,8 @@
 using Elwig.Helpers;
-using Microsoft.Data.Sqlite;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -13,25 +13,24 @@ namespace Elwig.Windows {
             InitializeComponent();
         }
 
-        private void QueryButton_Click(object sender, RoutedEventArgs evt) {
+        private async void QueryButton_Click(object sender, RoutedEventArgs evt) {
             try {
-                ExecuteQuery(QueryInput.Text);
+                await ExecuteQuery(QueryInput.Text);
             } catch (Exception e) {
                 MessageBox.Show(e.Message, "Fehler beim Ausführen", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
 
-        private void ExecuteQuery(string sqlQuery) {
+        private async Task ExecuteQuery(string sqlQuery) {
             var rows = new List<object[]>();
             IList<DbColumn> header;
 
-            using (var cnx = new SqliteConnection(AppDbContext.ConnectionString)) {
+            using (var cnx = await AppDbContext.ConnectAsync()) {
-                cnx.Open();
                 var cmd = cnx.CreateCommand();
                 cmd.CommandText = sqlQuery;
-                using var reader = cmd.ExecuteReader();
+                using var reader = await cmd.ExecuteReaderAsync();
-                header = reader.GetColumnSchema();
+                header = await reader.GetColumnSchemaAsync();
-                while (reader.Read()) {
+                while (await reader.ReadAsync()) {
                     var values = new object[reader.FieldCount];
                     reader.GetValues(values);
                     rows.Add(values);

Elwig/Windows/TestWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Test Fenster - Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize">
+        Title="Test Fenster - Elwig" MinHeight="400" MinWidth="325" Height="450" Width="800" ResizeMode="CanResize" Loaded="Window_Loaded">
     <Grid>
         <xctk:CheckComboBox x:Name="MyComboBox" HorizontalAlignment="Left" Margin="216,186,0,0" VerticalAlignment="Top" Delimiter=", "
                             SelectedValue="{Binding SelectedValue}"
@@ -16,5 +16,12 @@
         <Button x:Name="WeighingButton1" Click="WeighingButton1_Click" Height="30" Content="Aktuelles Gewicht" Width="110" Margin="515,246,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
         <Button x:Name="WeighingButton2" Click="WeighingButton2_Click" Height="30" Content="Wiegen" Width="110" Margin="515,285,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
         <TextBlock x:Name="Output" Height="20" Width="200" Margin="470,329,0,0"  HorizontalAlignment="Left" VerticalAlignment="Top"/>
+        <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"
+                Margin="260,190,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <Button x:Name="PdfCreditButton" Content="Gutschrift Erzeugen" Click="PdfCreditButton_Click" Tag="Print"
+                Margin="260,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
     </Grid>
 </Window>

Elwig/Windows/TestWindow.xaml.cs

@@ -1,16 +1,26 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;
 using System.Windows;
+using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Elwig.Windows {
     public partial class TestWindow : Window {
+
         public TestWindow() {
             InitializeComponent();
             MyComboBox.ItemsSource = new string[] { "Klasse A" , "Klasse B", "Klasse C", "Klasse D", "Klasse E", "Klasse F" };
             MyListBox.ItemsSource = new string[] { "Test 1", "Test 2", "Test 3", "Test 4" };
         }
 
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            PdfDeliveryButton.IsEnabled = App.IsPrintingReady;
+            PdfCreditButton.IsEnabled = App.IsPrintingReady;
+        }
+
         private void OnItemSelectionChanged(object sender, ItemSelectionChangedEventArgs e) {
             MyText.Text = string.Join(", ", MyComboBox.SelectedItems.Cast<string>());
         }
@@ -34,5 +44,28 @@ namespace Elwig.Windows {
                     MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
+
+        private void ChartButton_Click(object sender, RoutedEventArgs evt) {
+            var w = new ChartWindow();
+            w.Show();
+        }
+
+        private async void PdfDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            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();
+            doc.Show();
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void PdfCreditButton_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            using var ctx = new AppDbContext();
+            using var doc = new CreditNote(await ctx.Credits.FirstAsync(), ctx);
+            await doc.Generate();
+            doc.Show();
+            Mouse.OverrideCursor = null;
+        }
     }
 }

Elwig/fetch-resources.bat

@@ -1,6 +1,5 @@
 ::mkdir "C:\Program Files\Elwig"
 ::curl -s "http://www.columbia.edu/~em36/PDFtoPrinter.exe" -z "C:\Program Files\Elwig\PDFtoPrinter.exe" -o "C:\Program Files\Elwig\PDFtoPrinter.exe"
 mkdir "C:\ProgramData\Elwig\resources"
-curl -s -L "https://unpkg.com/pagedjs/dist/paged.polyfill.js" -o "C:\ProgramData\Elwig\resources\paged.polyfill.js"
+copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
-copy /b /y "Documents\style.css" "C:\ProgramData\Elwig\resources\style.css"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"

Installer/DocumentTransform.xslt

@@ -23,10 +23,10 @@
     -->
 	<xsl:key
         name="FileToRemove"
-        match="wix:Component[ substring( wix:File/@Source, string-length( wix:File/@Source ) - 6 ) != '.cshtml' ]"
+        match="wix:Component[ substring( wix:File/@Source, string-length( wix:File/@Source ) - 2 ) = '.cs' ]"
         use="@Id"
     />
-	<!-- Get the last 4 characters of a string using `substring( s, len(s) - 3 )`, it uses -3 and not -4 because XSLT uses 1-based indexes, not 0-based indexes. -->
+	<!-- Get the last 3 characters of a string using `substring( s, len(s) - 2 )`, it uses -2 and not -3 because XSLT uses 1-based indexes, not 0-based indexes. -->
 
 	<!-- By default, copy all elements and nodes into the output... -->
 	<xsl:template match="@*|node()">

Installer/Installer.wixproj

@@ -0,0 +1,65 @@
+<Project Sdk="WixToolset.Sdk/4.0.1">
+  <PropertyGroup>
+    <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
+    <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
+    <HarvestDirectorySuppressRegistry>false</HarvestDirectorySuppressRegistry>
+    <HarvestDirectoryVerboseOutput>true</HarvestDirectoryVerboseOutput>
+    <HarvestProjectsDirectoryIds>InstallFolder</HarvestProjectsDirectoryIds>
+    <CabinetCachePath>$(OutputPath)bin\cabcache\</CabinetCachePath>
+    <ReuseCabinetCache>True</ReuseCabinetCache>
+    <SuppressValidation>True</SuppressValidation>
+    <BuildProjectReferences>False</BuildProjectReferences>
+    <OutputName>Elwig</OutputName>
+    <Cultures>de-AT</Cultures>
+  </PropertyGroup>
+  <UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <AssemblyPath ParameterType="System.String" Required="true" />
+      <Version ParameterType="System.String" Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.Diagnostics" />
+      <Code Type="Fragment" Language="cs"><![CDATA[
+          this.Version = FileVersionInfo.GetVersionInfo(this.AssemblyPath).ProductVersion;  
+        ]]></Code>
+    </Task>
+  </UsingTask>
+  <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
+    <Exec Command="curl -s &quot;http://www.columbia.edu/~em36/PDFtoPrinter.exe&quot; -z &quot;$(TargetDir)PDFtoPrinter.exe&quot; -o &quot;$(TargetDir)PDFtoPrinter.exe&quot;" />
+    <Exec Command="dotnet publish &quot;$(SolutionDir)Elwig\Elwig.csproj&quot; &quot;/p:PublishProfile=$(SolutionDir)\Elwig\Properties\PublishProfiles\FolderProfile.pubxml&quot;" />
+    <GetFileVersion AssemblyPath="..\Elwig\bin\Publish\Elwig.exe">
+      <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />
+    </GetFileVersion>
+    <PropertyGroup>
+      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;DocumentPath=..\Elwig\Documents;ElwigProjectDir=..\Elwig</DefineConstants>
+    </PropertyGroup>
+  </Target>
+  <ItemGroup>
+    <HarvestDirectory Include="../Elwig/bin/Publish">
+      <ComponentGroupName>BuildFiles</ComponentGroupName>
+      <DirectoryRefId>InstallFolder</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+      <PreprocessorVariable>BuildPath</PreprocessorVariable>
+      <Transforms>BuildFilesTransform.xslt</Transforms>
+    </HarvestDirectory>
+    <BindPath BindName="BuildBindPath" Include="../Elwig/bin/Publish" />
+  </ItemGroup>
+  <ItemGroup>
+    <HarvestDirectory Include="../Elwig/Documents">
+      <ComponentGroupName>DocumentTemplates</ComponentGroupName>
+      <DirectoryRefId>ConfigFolderResources</DirectoryRefId>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+      <PreprocessorVariable>DocumentPath</PreprocessorVariable>
+      <Transforms>DocumentTransform.xslt</Transforms>
+    </HarvestDirectory>
+    <BindPath BindName="DocumentTemplateBindPath" Include="../Elwig/Documents" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="DocumentTransform.xslt" />
+    <None Include="BuildFilesTransform.xslt" />
+    <None Include="Files\config.ini" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
+  </ItemGroup>
+</Project>

Installer/MainComponents.wxs

@@ -2,7 +2,7 @@
   <Fragment>
     <ComponentGroup Id="MainComponents">
       <Component Directory="InstallFolder">
-        <File Source="$(var.Elwig.ProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"/>
+        <File Source="$(var.ElwigProjectDir)\bin\Publish\Elwig.exe" Id="Elwig.exe"/>
       </Component>
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
         <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>

Installer/Package.wxs

@@ -1,9 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name="Elwig" Manufacturer="Elwig" Version="!(bind.FileVersion.Elwig.exe)" Language="3079" UpgradeCode="a459416a-756a-4be6-b6f4-40872c8425a7" Compressed="true">
+  <Package Name="Elwig" Manufacturer="Elwig" Version="$(var.ProductVersion)" Language="3079" UpgradeCode="a459416a-756a-4be6-b6f4-40872c8425a7" Compressed="true">
-    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
+    <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
-	<MediaTemplate EmbedCab="true"/>
+	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.Elwig.ProjectDir)\elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">
@@ -11,7 +11,6 @@
       <ComponentGroupRef Id="MainComponents"/>
       <ComponentGroupRef Id="BuildFiles"/>
       <ComponentGroupRef Id="DocumentTemplates"/>
-      <ComponentGroupRef Id="DocumentTemplateComponents"/>
     </Feature>
   </Package>
 </Wix>

Setup/Bundle.wxs

@@ -0,0 +1,25 @@
+<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" >
+	<BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\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" />
+    <util:RegistrySearch Id="Webview2Machine" Variable="Webview2Machine" Result="exists" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
+    <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" />
+
+    <Chain>
+      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe" Cache="remove" Compressed="yes" PerMachine="yes" 
+				  Permanent="yes" Vital="yes" SourceFile="$(TargetDir)VC_redist.x86.exe" InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86">
+      </ExePackage>
+
+      <ExePackage Id="MicrosoftEdgeWebview2" DisplayName="Microsoft Edge Webview2 Runtime" Name="MicrosoftEdgeWebview2Setup.exe" Cache="remove"
+				  Compressed="yes" PerMachine="yes" Permanent ="yes" Vital ="no" SourceFile="$(TargetDir)MicrosoftEdgeWebview2Setup.exe" InstallArguments="/silent /install"
+				  UninstallArguments="/silent /uninstall" DetectCondition="Webview2Machine OR Webview2User" >
+      </ExePackage>
+
+      <MsiPackage Id="ElwigMsi" SourceFile="$(var.Installer.TargetDir)\Elwig.msi" Permanent="no" Compressed="yes" Vital="yes"/>
+    </Chain>
+	  
+  </Bundle>
+</Wix>

Setup/DocumentTemplateComponents.wxs

@@ -1,12 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Fragment>
-		<ComponentGroup Id="DocumentTemplateComponents" Directory="ConfigFolderResources">
-			<Component>
-				<File Source="$(TargetDir)\paged.polyfill.js" />
-			</Component>
-			<Component>
-				<File Source="$(var.Elwig.ProjectDir)\Documents\style.css" />
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>

Setup/Setup.wixproj

@@ -1,47 +1,19 @@
-<Project Sdk="WixToolset.Sdk/4.0.1">
+<Project Sdk="WixToolset.Sdk/4.0.1">
   <PropertyGroup>
-    <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
+    <OutputType>Bundle</OutputType>
-    <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
-    <HarvestDirectorySuppressRegistry>false</HarvestDirectorySuppressRegistry>
-    <HarvestDirectoryVerboseOutput>true</HarvestDirectoryVerboseOutput>
-    <HarvestProjectsDirectoryIds>InstallFolder</HarvestProjectsDirectoryIds>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DefineConstants>BuildPath=../Elwig/bin/Publish;DocumentTemplatesPath=../Elwig/Documents</DefineConstants>
-    <PreBuildEvent>curl -s -L "https://unpkg.com/pagedjs/dist/paged.polyfill.js" -o "$(TargetDir)paged.polyfill.js" &amp; curl -s "http://www.columbia.edu/~em36/PDFtoPrinter.exe" -z "$(TargetDir)PDFtoPrinter.exe" -o "$(TargetDir)PDFtoPrinter.exe" &amp; dotnet publish "$(SolutionDir)Elwig\Elwig.csproj" "/p:PublishProfile=$(SolutionDir)\Elwig\Properties\PublishProfiles\FolderProfile.pubxml"</PreBuildEvent>
     <OutputName>Elwig</OutputName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Cultures>de-AT</Cultures>
-    <OutputPath>bin\</OutputPath>
   </PropertyGroup>
+  <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
+    <Exec Command='curl -L -s "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -z "$(TargetDir)MicrosoftEdgeWebview2Setup.exe" -o "$(TargetDir)MicrosoftEdgeWebview2Setup.exe"' />
+    <Exec Command='curl -L -s "https://aka.ms/vs/17/release/vc_redist.x86.exe" -z "$(TargetDir)VC_redist.x86.exe" -o "$(TargetDir)VC_redist.x86.exe"' />
+    <PropertyGroup>
+      <DefineConstants>ElwigProjectDir=..\Elwig</DefineConstants>
+    </PropertyGroup>
+  </Target>
   <ItemGroup>
-    <HarvestDirectory Include="../Elwig/bin/Publish">
+    <ProjectReference Include="..\Installer\Installer.wixproj" />
-      <ComponentGroupName>BuildFiles</ComponentGroupName>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.1" />
-      <DirectoryRefId>InstallFolder</DirectoryRefId>
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.1" />
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-      <PreprocessorVariable>BuildPath</PreprocessorVariable>
-      <Transforms>BuildFilesTransform.xslt</Transforms>
-    </HarvestDirectory>
-    <BindPath BindName="BuildBindPath" Include="../Elwig/bin/Publish" />
-  </ItemGroup>
-  <ItemGroup>
-    <HarvestDirectory Include="../Elwig/Documents">
-      <ComponentGroupName>DocumentTemplates</ComponentGroupName>
-      <DirectoryRefId>ConfigFolderResources</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-      <PreprocessorVariable>DocumentTemplatesPath</PreprocessorVariable>
-      <Transforms>DocumentTemplatesTransform.xslt</Transforms>
-    </HarvestDirectory>
-    <BindPath BindName="DocumentTemplateBindPath" Include="../Elwig/Documents" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="DocumentTemplatesTransform.xslt" />
-    <None Include="BuildFilesTransform.xslt" />
-    <None Include="Files\config.ini" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Elwig\Elwig.csproj" PublishProfile="..\Elwig\Properties\PublishProfiles\FolderProfile.pubxml" Publish="true" />
-    <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
   </ItemGroup>
 </Project>

Tests/HelpersUtilsTest.cs

@@ -68,5 +68,37 @@ namespace Tests {
                 Assert.Throws<ArgumentException>(() => Utils.Modulo("789", -1));
             });
         }
+
+        [Test]
+        public void Test_SplitAddress() {
+            Assert.Multiple(() => {
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 1"), Is.EqualTo(("Winzerstra<72>e", "1")));
+                Assert.That(Utils.SplitAddress("Auf dem Feld 12"), Is.EqualTo(("Auf dem Feld", "12")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 5a"), Is.EqualTo(("Winzerstra<72>e", "5a")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 1-3/2"), Is.EqualTo(("Winzerstra<72>e", "1-3/2")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 3/4/5"), Is.EqualTo(("Winzerstra<72>e", "3/4/5")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 7/2/4/77"), Is.EqualTo(("Winzerstra<72>e", "7/2/4/77")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 95b"), Is.EqualTo(("Winzerstra<72>e", "95b")));
+                Assert.That(Utils.SplitAddress("Winzerstra<72>e 1, TOP 3"), Is.EqualTo(("Winzerstra<72>e", "1, TOP 3")));
+            });
+        }
+
+        [Test]
+        public void Test_SplitName() {
+            Assert.Multiple(() => {
+                Assert.That(Utils.SplitName("Max Bauer", "Bauer"), Is.EqualTo(("Bauer", "Max")));
+                Assert.That(Utils.SplitName("Bauer Max", "Bauer"), Is.EqualTo(("Bauer", "Max")));
+                Assert.That(Utils.SplitName("Max und Moritz Bauer", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz")));
+                Assert.That(Utils.SplitName("Bauer Max und Moritz", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz")));
+                Assert.That(Utils.SplitName("Bauer GesbR", "Bauer"), Is.EqualTo(("Bauer", "GesbR")));
+                Assert.That(Utils.SplitName("Max und Moritz Bauer GesbR", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz GesbR")));
+                Assert.That(Utils.SplitName("Bauer Max und Moritz GesbR", "Bauer"), Is.EqualTo(("Bauer", "Max und Moritz GesbR")));
+                Assert.That(Utils.SplitName("Weingut Bauer", "Bauer"), Is.EqualTo(("Bauer", "Weingut")));
+                Assert.That(Utils.SplitName("Bauer Weingut", "Bauer"), Is.EqualTo(("Bauer", "Weingut")));
+                Assert.That(Utils.SplitName("Max und Moritz Bauer und Mustermann", "Bauer"), Is.EqualTo(("Bauer und Mustermann", "Max und Moritz")));
+                Assert.That(Utils.SplitName("Bauer und Mustermann Max und Moritz", "Bauer"), Is.EqualTo(("Bauer und Mustermann", "Max und Moritz")));
+                Assert.That(Utils.SplitName("ABC GesbR", "Bauer"), Is.EqualTo(((string, string?))("ABC GesbR", null)));
+            });
+        }
     }
 }