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

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

@@ -2,26 +2,23 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Elwig"
-             xmlns:controls="clr-namespace:Elwig.Controls"
+             xmlns:ctrl="clr-namespace:Elwig.Controls"
              StartupUri="Windows\MainWindow.xaml"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
-        <controls:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
                 <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 +52,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

@@ -11,31 +11,57 @@ using System.Windows.Threading;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Markup;
+using System.Reflection;
+using Elwig.Helpers.Printing;
 
 namespace Elwig {
     public partial class App : Application {
 
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
         public static readonly Config Config = new(DataPath + "config.ini");
 
-        public static string ZwstId { get; private set; }
+        public static int VersionMajor { get; private set; }
-        public static IEnumerable<IScale> Scales { get; private set; }
+        public static int VersionMinor { get; private set; }
-        public static ClientParameters Client { get; private set;  }
+        public static int VersionPatch { get; private set; }
+        public static string Version {
+            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
+            private set {
+                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
+                VersionMajor = p.ElementAtOrDefault(0);
+                VersionMinor = p.ElementAtOrDefault(1);
+                VersionPatch = p.ElementAtOrDefault(2);
+            }
+        }
 
-        public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
+        public static string ZwstId { get; private set; }
+        public static string BranchName { get; private set; }
+        public static int? BranchPlz { get; private set; }
+        public static string? BranchLocation { get; private set; }
+        public static string? BranchAddress { get; private set; }
+        public static string? BranchPhoneNr { get; private set; }
+        public static string? BranchFaxNr { get; private set; }
+        public static string? BranchMobileNr { get; private set; }
+        public static IList<IScale> Scales { get; private set; }
+        public static ClientParameters Client { get; private set; }
+
+        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
 
         public App() : base() {
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-            Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "Elwig"));
+            Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
         }
 
         protected override void OnStartup(StartupEventArgs evt) {
-            var locale = new CultureInfo("de-DE");  // de-AT uses ' ' as thousands separator :(
+            var locale = new CultureInfo("de-AT");
+            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
+            locale.NumberFormat.NumberGroupSeparator = "\u202f";
+            locale.NumberFormat.PercentGroupSeparator = "\u202f";
             Thread.CurrentThread.CurrentCulture = locale;
             Thread.CurrentThread.CurrentUICulture = locale;
             CultureInfo.DefaultThreadCurrentCulture = locale;
@@ -45,36 +71,49 @@ namespace Elwig {
                 new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
             );
 
-            Dictionary<string, string> branches = new();
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+
+            try {
+                AppDbUpdater.CheckDb();
+            } catch (Exception e) {
+                MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                Shutdown();
+                return;
+            }
+
+            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
             using (var ctx = new AppDbContext()) {
-                if (!ctx.Database.CanConnect()) {
+                branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
-                    MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                try {
+                    Client = new(ctx);
+                } catch (Exception e) {
+                    MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
-                } else {
+                    return;
-                    branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => b.ZwstId);
                 }
             }
-            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
-            Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
 
-            Client = new();
+            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
 
-            var list = new LinkedList<IScale>();
+            var list = new List<IScale>();
             foreach (var s in Config.Scales) {
+                var id = s[0];
                 try {
-                    var scaleNr = int.Parse(s[0]);
+                    var type = s[1]?.ToLower();
-                    var type = s[1].ToLower();
                     var model = s[2];
                     var cnx = s[3];
                     var empty = s[4];
                     var filling = s[5];
                     int? limit = s[6] == null ? null : int.Parse(s[6]);
+                    var log = s[7];
                     if (type == "systec") {
-                        list.AddLast(new SystecScale(scaleNr, model, cnx, empty, filling, limit));
+                        list.Add(new SystecScale(id, model, cnx, empty, filling, limit, log));
                     } else {
                         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);
                 }
             }
@@ -85,10 +124,26 @@ namespace Elwig {
                     MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                 } else {
-                    ZwstId = branches[Config.Branch.ToLower()];
+                    var entry = branches[Config.Branch.ToLower()];
+                    ZwstId = entry.Item1;
+                    BranchName = entry.Item2;
+                    BranchPlz = entry.Item3;
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+                    BranchAddress = entry.Item5;
+                    BranchPhoneNr = entry.Item6;
+                    BranchFaxNr = entry.Item7;
+                    BranchMobileNr = entry.Item8;
                 }
             } else if (branches.Count == 1) {
-                ZwstId = branches.First().Value;
+                var entry = branches.First().Value;
+                ZwstId = entry.Item1;
+                BranchName = entry.Item2;
+                BranchPlz = entry.Item3;
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+                BranchAddress = entry.Item5;
+                BranchPhoneNr = entry.Item6;
+                BranchFaxNr = entry.Item7;
+                BranchMobileNr = entry.Item8;
             } else {
                 MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
@@ -97,20 +152,18 @@ 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());
         }
 
         protected void OnPrintingReadyChanged(EventArgs evt) {
             foreach (Window w in Windows) {
-                foreach (var b in Utils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) {
+                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
                     b.IsEnabled = IsPrintingReady;
                 }
+                foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
+                    i.IsEnabled = IsPrintingReady;
+                }
             }
         }
     }

Elwig/Controls/BoolToValueConverter.cs

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

Elwig/Controls/UnitTextBox.xaml

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

Elwig/Controls/UnitTextBox.xaml.cs

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

Elwig/Controls/WidthToPaddingConverter.cs

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

Elwig/Dialogs/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

@@ -0,0 +1,57 @@
+<Window x:Class="Elwig.Dialogs.ManualWeighingDialog"
+        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="Handwiegung" Height="170" 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>
+
+        <Label Content="Gewicht:" Margin="10,20,10,10"/>
+        <Grid Grid.Column="1" Width="70" Height="25" Margin="0,20,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>
+
+        <Label Content="Grund:" Margin="10,50,10,10"/>
+        <TextBox x:Name="ReasonInput" Grid.Column="1" Margin="0,50,10,10"
+                 TextChanged="ReasonInput_TextChanged"/>
+
+        <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/ManualWeighingDialog.xaml.cs

@@ -0,0 +1,38 @@
+using Elwig.Helpers;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class ManualWeighingDialog : Window {
+
+        public int Weight = 0;
+        public string? Reason = null;
+
+        public ManualWeighingDialog(string? reason = null) {
+            InitializeComponent();
+            ReasonInput.Text = reason;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Weight = int.Parse(WeightInput.Text);
+            Reason = Regex.Replace(ReasonInput.Text, @"\s+", " ").Trim();
+            if (Reason == "") Reason = null;
+            Close();
+        }
+
+        private void UpdateButtons() {
+            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0;
+        }
+
+        private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Validator.CheckInteger(WeightInput, true, 5);
+            UpdateButtons();
+        }
+
+        private void ReasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpdateButtons();
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cs

@@ -0,0 +1,36 @@
+using Elwig.Helpers;
+using Elwig.Models;
+
+namespace Elwig.Documents {
+    public abstract class BusinessDocument : Document {
+
+        public bool ShowDateAndLocation = false;
+
+        public Member Member;
+        public bool IncludeSender = false;
+        public bool UseBillingAddress = false;
+        public string Aside;
+        public string? Location;
+
+        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
+            Member = m;
+            Location = App.BranchLocation;
+            IncludeSender = includeSender;
+            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
+            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
+                $"<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>" +
+                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"</tbody></table>";
+        }
+
+        public string Address {
+            get {
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
+                var plz = addr.PostalDest.AtPlz;
+                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
+            }
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cshtml

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

Elwig/Documents/BusinessDocument.cshtml.cs

@@ -1,26 +0,0 @@
-using Elwig.Models;
-
-namespace Elwig.Documents {
-    public abstract class BusinessDocument : Document {
-
-        public Member Member;
-        public bool IncludeSender = false;
-
-        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
-            Member = m;
-            IncludeSender = includeSender;
-        }
-
-        public string Address {
-            get {
-                var b = Member.BillingAddress;
-                var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz;
-                if (b != null) {
-                    return $"{b.Name}\n{b.Address}\n{plz.Plz} {plz.Dest}";
-                } else {
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}";
-                }
-            }
-        }
-    }
-}

Elwig/Documents/BusinessDocument.css

@@ -0,0 +1,142 @@
+
+.address-wrapper, aside, main {
+    overflow: hidden;
+}
+
+.spacing {
+    height: 20mm;
+}
+
+.info-wrapper {
+    width: 100%;
+    height: 45mm;
+    margin: 0 0 2mm 0;
+    position: relative;
+}
+
+.info-wrapper .date {
+    text-align: right;
+    position: absolute;
+    right: 0;
+    bottom: -1.5em;
+}
+
+.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 {
+    padding: 0.25mm 0.5mm 0.25mm 1mm;
+}
+
+aside table tbody td {
+    padding: 0.25mm 0;
+}
+
+aside table tbody th {
+    font-weight: normal;
+}
+
+main {
+    margin: 2em 0 1em 0;
+}
+
+main > *:first-child {
+    margin-top: 0;
+}
+
+main h1, .main-wrapper p {
+    font-size: 12pt;
+    margin: 1em 0;
+    text-align: justify;
+}
+
+.main-wrapper p {
+    widows: 3;
+    orphans: 3;
+    hyphens: manual;
+}
+
+main h1 {
+    margin-top: 0;
+    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/BusinessLetter.cs

@@ -2,8 +2,6 @@ using Elwig.Models;
 
 namespace Elwig.Documents {
     public class BusinessLetter : BusinessDocument {
-        public BusinessLetter(string title, Member m) : base(title, m) {
+        public BusinessLetter(string title, Member m) : base(title, m) { }
-
-        }
     }
 }

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.cs

@@ -0,0 +1,40 @@
+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;
+            ShowDateAndLocation = 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 = new string[0]; // FIXME
+            Precision = c.Payment.Variant.Season.Precision;
+            Parts = ctx.DeliveryParts.FromSql($"""
+                SELECT p.*
+                FROM v_delivery v
+                JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                WHERE (v.year, v.mgnr) = ({c.Year}, {c.Member.MgNr})
+                ORDER BY sortid, attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, date, time, dpnr
+                """).ToList();
+        }
+    }}

Elwig/Documents/CreditNote.cshtml

@@ -0,0 +1,87 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.CreditNote>
+@model Elwig.Documents.CreditNote
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+@{
+    var bucketNum = Model.BucketNames.Length;
+}
+<main>
+    <h1>@Model.Title</h1>
+    <table class="credit">
+        <colgroup>
+            <col style="width: 24mm;"/>
+            <col style="width: 6mm;"/>
+            <col style="width: 31mm;"/>
+            <col style="width: 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</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">@part.Attribute?.Name</td>
+                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
+                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                    <td rowspan="@bucketNum" class="abs">@abs</td>
+                    <td rowspan="@bucketNum" class="rel">@rel</td>
+                    <!--FIXME price-->
+                    @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(0)?.Value, 0))
+                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                </tr>
+                @for (int i = 1; i < bucketNum; i++) {
+                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
+                        <!--FIXME price-->
+                        @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(i)?.Value, 0))
+                    </tr>
+                }
+                last = part.SortId;
+            }
+        </tbody>
+    </table>
+</main>

Elwig/Documents/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/DeliveryConfirmation.cs

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

Elwig/Documents/DeliveryConfirmation.cshtml

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

Elwig/Documents/DeliveryConfirmation.css

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

Elwig/Documents/DeliveryJournal.cs

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

Elwig/Documents/DeliveryJournal.cshtml

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

Elwig/Documents/DeliveryJournal.css

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

Elwig/Documents/DeliveryNote.cs

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

Elwig/Documents/DeliveryNote.cshtml

@@ -2,31 +2,147 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
-<h1>Traubenübernahmeschein Nr. @Model.Delivery.LsNr</h1>
+<main>
-<table>
+<h1>@Model.Title</h1>
-<thead>
+<table class="delivery">
-<tr>
+    <colgroup>
-    <th rowspan="2">Sorte</th>
+        <col style="width: 10.00mm;"/>
-    <th rowspan="2">Qualitätsstufe</th>
+        <col style="width: 21.25mm;"/>
-    <th colspan="2">Gradation</th>
+        <col style="width: 21.25mm;"/>
-    <th>Gewicht</th>
+        <col style="width: 21.25mm;"/>
-</tr>
+        <col style="width: 21.25mm;"/>
-<tr>
+        <col style="width: 30.00mm;"/>
-    <th>°KMW</th>
+        <col style="width: 12.50mm;"/>
-    <th>°Oe</th>
+        <col style="width: 12.50mm;"/>
-    <th>kg</th>
+        <col style="width: 15.00mm;"/>
-</tr>
+    </colgroup>
-</thead>
+    <thead>
-<tbody>
-    @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
         <tr>
-            <td>@part.Variant.Name</td>
+            <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
-            <td>@part.Quality.Name</td>
+            <th class="main" rowspan="2" colspan="2">Sorte</th>
-            <td>@part.Kmw</td>
+            <th class="main" rowspan="2" colspan="2">Attribut</th>
-            <td>@part.Oe</td>
+            <th class="main" rowspan="2">Qualitätsstufe</th>
-            <td>@part.Weight</td>
+            <th colspan="2">Gradation</th>
+            <th>Gewicht</th>
         </tr>
-    }
+        <tr>
-</tbody>
+            <th style="font-size: 8pt;">[°Oe]</th>
+            <th style="font-size: 8pt;">[°KMW]</th>
+            <th style="font-size: 8pt;">[kg]</th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
+            <tr class="main">
+                <td style="text-align: center;">@part.DPNr</td>
+                <td colspan="2">@part.Variant.Name</td>
+                <td colspan="2">@part.Attribute?.Name</td>
+                <td>@part.Quality.Name</td>
+                <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
+                <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
+                <td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
+            </tr>
+            <tr><td></td><td colspan="5" style="white-space: pre;"><i>Herkunft:</i> @part.OriginString</td></tr>
+            @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"><b>@mod.Name</b></td><td style="white-space: pre;">@mod.ValueStr</td></tr>
+                    first = false;
+                }
+            }
+            <tr><td></td><td colspan="5">
+                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
+            </td></tr>
+            @if (part.Comment != null) {
+                <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
+            }
+            @if (part.Temperature != null || part.Acid != null) {
+                <tr><td></td><td colspan="5">@Raw(part.Temperature != null ? $"<i>Temperatur:</i> {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@Raw(part.Acid != null ? $"<i>Säure:</i> {part.Acid:N1} g/l" : "")</td></tr>
+            }
+        }
+        @if (Model.Delivery.Parts.Count() > 1) {
+            <tr class="main sum">
+                <td colspan="6">Gesamt:</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>
+            </tr>
+        }
+    </tbody>
 </table>
+@if (Model.Delivery.Comment != null) {
+    <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
+}
+@if (Model.DisplayStats > 0) {
+    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int obligation, int right, int sum) {
+                    return $"<td>{obligation:N0}</td>" +
+                        $"<td>{right:N0}</td>" +
+                        $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
+                        $"<td>{sum:N0}</td>";
+                }
+                var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
+                var buckets = Model.MemberBuckets.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(
+                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
+                ))
+            </tr>
+            @if (Model.DisplayStats > 1) {
+                <tr class="subheading">
+                    <th>Flächenbindungen:</th>
+                </tr>
+                    @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBuckets.OrderBy(b => b.Key)) {
+                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
+                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
+                            <th>@name</th>
+                            @Raw(FormatRow(obligation, right, sum))
+                        </tr>
+                    }
+                }
+            }
+        </tbody>
+    </table>
+}
+</main>
+@for (int i = 0; i < 2; i++) {
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
+        @if (Model.Text != null) {
+            <p class="comment">@Model.Text</p>
+        }
+        <div class="signatures">
+            <div>Genossenschaft</div>
+            <div>Mitglied</div>
+        </div>
+    </div>
+}

Elwig/Documents/DeliveryNote.cshtml.cs

@@ -1,12 +0,0 @@
-using Elwig.Models;
-
-namespace Elwig.Documents {
-    public class DeliveryNote : BusinessDocument {
-
-        public Delivery Delivery;
-
-        public DeliveryNote(Delivery d) : base($"Lieferschein {d.LsNr}", d.Member) {
-            Delivery = d;
-        }
-    }
-}

Elwig/Documents/DeliveryNote.css

@@ -0,0 +1,97 @@
+
+main h1 {
+    margin-bottom: 1.5em !important;
+}
+
+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;
+}
+
+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-note-stats {
+    font-size: 8pt;
+    break-inside: avoid;
+    break-after: avoid;
+}
+
+table.delivery-note-stats th,
+table.delivery-note-stats td {
+    padding: 0.125mm 0;
+}
+
+table.delivery-note-stats:not(.expanded) tr.optional {
+    display: none;
+}
+
+table.delivery-note-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
+table.delivery-note-stats thead th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: right;
+}
+
+table.delivery-note-stats thead th:first-child {
+    text-align: left;
+}
+
+table.delivery-note-stats td {
+    text-align: right;
+}
+
+table.delivery-note-stats tbody th {
+    font-weight: normal;
+    font-style: italic;
+    text-align: left;
+}

Elwig/Documents/Document.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/Document.cs

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

Elwig/Documents/Document.cshtml

@@ -1,34 +1,53 @@
 @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>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
-        window.PagedConfig = { auto: false };
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
-        if (!navigator.webdriver) {
+    @if (Model.DoubleSided) {
-            window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); });
+        <style>
-            window.addEventListener("afterprint", () => { location.reload(); });
+            @@page :left {
-        }
+                margin: 25mm 25mm 35mm 20mm;
-    </script>
+                @@bottom-center {
-    <script src="@Raw(Model.DataPath)\resources\paged.polyfill.js"></script>
+                    content: element(page-footer-left);
-    <link rel="stylesheet" href="@Raw(Model.DataPath)\resources\style.css" />
+                }
+            }
+        </style>
+    }
 </head>
 <body>
-    <div class="m1"></div>
+    @if (Model.ShowFoldMarks) {
-    <div class="m2"></div>
+        <div class="m1"></div>
-    <div class="m3"></div>
+        <div class="m2"></div>
-    <header>@Raw(Model.Header)</header>
+        <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.FullDateString</span>
+            <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
+            <span class="doc-id">@Model.DocumentId</span>
             <span class="page"></span>
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
+    @if (Model.DoubleSided) {
+        <div class="footer-wrapper left">
+            <div class="pre-footer">
+                <span class="page"></span>
+                <span class="doc-id">@Model.DocumentId</span>
+                <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
+            </div>
+            <footer>@Raw(Model.Footer)</footer>
+        </div>
+    }
+    <header>@Raw(Model.Header)</header>
     <div class="spacing"></div>
     <div class="main-wrapper">
         @RenderBody()

Elwig/Documents/Document.cshtml.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
-using Elwig.Helpers;
-
-namespace Elwig.Documents {
-    public abstract class Document : IDisposable {
-
-        private TempFile? PdfFile = null;
-
-        public Document(string title) {
-            DataPath = App.DataPath;
-            Title = title;
-            Header = $"<h1>{App.Client.Name}</h1>";
-            Footer = App.Client.NameFull;
-            Date = DateTime.Today;
-        }
-
-        ~Document() {
-            Dispose();
-        }
-
-        public void Dispose() {
-            PdfFile?.Dispose();
-            PdfFile = null;
-        }
-
-        public string DataPath { get; set; }
-
-        public string Title { get; set; }
-
-        public string Header { get; set; }
-
-        public string Footer { get; set; }
-
-        public string FullDateString {
-            get => Date.ToString("dddd, d. MMMM yyyy");
-        }
-
-        public DateTime Date { get; set; }
-
-        private async Task<string> Render() {
-            string name;
-            if (this is BusinessLetter) {
-                name = "BusinessLetter";
-            } else if (this is DeliveryNote) {
-                name = "DeliveryNote";
-            } else {
-                throw new InvalidOperationException("Invalid document object");
-            }
-            return await 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 Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
-            }
-            Pdf.UpdateMetadata(pdf.FilePath, Title, "Winzergenossenschaft für Matzen und Umgebung reg. Gen.m.b.H.");
-            PdfFile = pdf;
-        }
-
-        public void SaveTo(string pdfPath) {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(PdfFile.FilePath, pdfPath);
-        }
-
-        public async Task Print() {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Print(PdfFile.FilePath);
-        }
-
-        public void Show() {
-            if (PdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(PdfFile.NewReference(), Title);
-        }
-    }
-}

Elwig/Documents/Document.css

@@ -0,0 +1,112 @@
+
+:root {
+    font-family: "Times New Roman", serif;
+    line-height: 1;
+}
+
+* {
+    box-sizing: border-box;
+}
+
+body {
+    margin: 0;
+}
+
+table {
+    width: 100%;
+    border-collapse: collapse;
+    table-layout: fixed;
+}
+
+table td,
+table th {
+    padding: 0.5mm 1mm;
+}
+
+table th {
+    text-align: center;
+}
+
+header {
+    height: 45mm;
+    padding: 10mm 0 0 0;
+    position: absolute;
+    top: -25mm;
+    left: 0;
+    right: 0;
+    text-align: center;
+    overflow: hidden;
+}
+
+header .name {
+    font-size: 18pt;
+    margin-top: 8mm;
+    font-weight: bold;
+}
+
+header .suffix {
+    font-size: 14pt;
+    font-weight: bold;
+}
+
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
+}
+
+.footer-wrapper {
+    position: running(page-footer);
+    width: 165mm;
+    /* for some reason the position without the following statement changes on the second page */
+    border: 0.5pt solid #00000000;
+}
+
+.footer-wrapper.left {
+    position: running(page-footer-left);
+}
+
+.pre-footer {
+    margin: 1em 0;
+    font-size: 10pt;
+}
+
+.pre-footer > * {
+    display: inline-block;
+    width: 33%;
+}
+
+.pre-footer > *:first-child {
+    text-align: left;
+}
+
+.pre-footer > *:nth-child(2) {
+    text-align: center;
+    font-style: italic;
+}
+
+.pre-footer > *:last-child {
+    text-align: right;
+    float: right;
+}
+
+.pre-footer .page::after {
+    content: "Seite 1 von 1";
+}
+
+footer {
+    font-size: 10pt;
+    border-top: 0.5pt solid black;
+    height: 25mm;
+    padding-top: 1mm;
+    text-align: center;
+}
+
+.hidden {
+    visibility: hidden;
+}
+
+hr {
+    border: none;
+    border-top: 0.5pt solid black;
+    margin: 5mm 0;
+}

Elwig/Documents/Letterhead.cs

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

Elwig/Documents/Letterhead.cshtml

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

Elwig/Documents/Pdf.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using PdfSharp.Pdf.IO;
-using PuppeteerSharp;
-using Elwig.Helpers;
-using Elwig.Windows;
-
-namespace Elwig.Documents {
-    public static class Pdf {
-
-        private static readonly string Chromium = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe";
-        private static IBrowser? Browser = null;
-        public static bool IsReady => Browser != null;
-
-        public static async Task Init(Action evtHandler) {
-            Browser = await Puppeteer.LaunchAsync(new LaunchOptions {
-                Headless = true,
-                ExecutablePath = Chromium,
-                // paged.js uses XHRs to load styles, so this is needed
-                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");
-            using var page = await Browser.NewPageAsync();
-            page.Console += OnConsole;
-            await page.GoToAsync($"file://{htmlPath}");
-            await page.EvaluateFunctionAsync("async () => { await window.PagedPolyfill.preview(); }");
-            await page.PdfAsync(pdfPath, new() {
-                PreferCSSPageSize = true,
-                //Format = PaperFormat.A4,
-                DisplayHeaderFooter = false,
-                MarginOptions = new() {
-                    Top = "0mm",
-                    Right = "0mm",
-                    Bottom = "0mm",
-                    Left = "0mm",
-                },
-            });
-        }
-
-        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) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, file);
-                w.Show();
-            });
-        }
-
-        public static void Show(string path, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, path);
-                w.Show();
-            });
-        }
-
-        public static void Print(string path) {
-            // TODO print pdf
-        }
-    }
-}

Elwig/Documents/style.css

@@ -1,181 +0,0 @@
-
-:root {
-    font-family: "Times New Roman", serif;
-    line-height: 1;
-}
-
-* {
-    box-sizing: border-box;
-}
-
-body {
-    margin: 0;
-}
-
-.m1, .m2, .m3 {
-    height: 0;
-    width: 1cm;
-    position: fixed;
-    left: 0;
-    border-top: 1pt solid black;
-}
-
-.m1 {top: 105mm;}
-.m2 {top: 148.5mm;}
-.m3 {top: 210mm;}
-
-header {
-    height: 45mm;
-    padding: 5mm;
-    position: absolute;
-    top: -25mm;
-    left: 0;
-    right: 0;
-    text-align: center;
-}
-.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;
-}
-
-aside {
-    height: 40mm;
-    width: 75mm;
-    margin: 0;
-    position: absolute;
-    left: 125mm;
-    top: 5mm;
-}
-
-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;
-    widows: 3;
-    orphans: 3;
-}
-
-main .date {
-    margin-bottom: 2em;
-    text-align: right;
-}
-
-main h1 {
-    margin-bottom: 2em;
-}
-
-.footer-wrapper {
-    padding: 0 20mm 0 25mm;
-    position: running(page-footer);
-    bottom: 0;
-    left: 0;
-    right: 0;
-}
-
-.pre-footer {
-    margin: 4.23mm 0;
-    font-size: 10pt;
-    display: flex;
-}
-
-.pre-footer .date, .pre-footer .page {
-    flex: 100px 1 1;
-}
-
-.pre-footer .date {text-align: left;}
-.pre-footer .page {text-align: right;}
-.page::after {
-    content: "Seite 1 von 1";
-}
-
-footer {
-    font-size: 10pt;
-    border-top: 1pt solid black;
-    height: 25mm;
-    padding-top: 1mm;
-    text-align: center;
-}
-
-table {
-    width: 100%;
-    border-collapse: collapse;
-}
-
-@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: 1px 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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
@@ -6,33 +6,32 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <ApplicationIcon>elwig.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
+    <Version>0.5.0</Version>
+    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
+    <Resource Include="Resources\Images\Elwig.png" />
-  </ItemGroup>
+    <Content Include="Resources\Images\Elwig.ico" />
-
-  <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1774.30" />
-    <PackageReference Include="PdfSharp" Version="1.50.5147" />
-    <PackageReference Include="PuppeteerSharp" Version="10.0.0" />
-    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="elwig.png" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="call fetch-resources.bat" />
   </Target>
 
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.2.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.24" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="RazorLight" Version="2.3.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="4.1.68" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -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,19 @@ 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);
@@ -47,6 +52,10 @@ namespace Elwig.Helpers {
 
         public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
 
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = new();
+
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
                 try {
@@ -60,7 +69,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 +125,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,7 +140,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 + 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 + 100) c = a; });
             return c + 1;
         }
 
@@ -128,5 +164,124 @@ namespace Elwig.Helpers {
                 .OrderBy(q => q.MinKmw)
                 .LastOrDefaultAsync();
         }
+
+        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);
+                    }
+                }
+            }
+        }
+
+        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, (int, int)>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var vtrgid = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberRightsAndObligations[year] = buckets;
+        }
+
+        private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBuckets[year] = buckets;
+        }
+
+        private async Task FetchMemberPaymentBuckets(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_payment_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberPaymentBuckets[year] = buckets;
+        }
+
+        public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberRightsAndObligations.ContainsKey(year))
+                await FetchMemberRightsAndObligations(year, cnx);
+            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBuckets.ContainsKey(year))
+                await FetchMemberDeliveryBuckets(year, cnx);
+            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberPaymentBuckets.ContainsKey(year))
+                await FetchMemberPaymentBuckets(year, cnx);
+            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx);
+            var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
+            if (ownCnx) await cnx.DisposeAsync();
+
+            var buckets = new Dictionary<string, (string, int, int, int, int)>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
+                var variety = await WineVarieties.FindAsync(id[..2]);
+                var attrIds = id[2..];
+                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
+                buckets[id] = (
+                    name,
+                    rightsAndObligations.GetValueOrDefault(id).Item1,
+                    rightsAndObligations.GetValueOrDefault(id).Item2,
+                    deliveryBuckets.GetValueOrDefault(id),
+                    paymentBuckets.GetValueOrDefault(id)
+                );
+            }
+            return buckets;
+        }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

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

Elwig/Helpers/Billing/Billing.cs

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

Elwig/Helpers/Billing/BillingVariant.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingVariant : Billing {
+
+        private readonly int AvNr;
+
+        public BillingVariant(int year, int avnr) : base(year) {
+            AvNr = avnr;
+        }
+
+        protected async Task DeleteInDb() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        public async Task CalculatePrices() {
+            await DeleteInDb();
+            var tasks = new List<Task>();
+            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
+                tasks.Add(Task.Run(() => CalculateMemberPrices(mgnr)));
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        protected async Task CalculateMemberPrices(int mgnr) {
+
+        }
+    }
+}

Elwig/Helpers/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,47 +1,158 @@
 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 class ClientParameters {
 
-		public string NameToken;
+        public enum Type { Matzen, Winzerkeller };
-		public string NameShort;
-		public string NameShortened;
-		public string Name;
-		public string NameSuffix;
-		public string NameFull => $"{Name} {NameSuffix}";
 
-		public PostalDest PostalDest {
+        public bool IsMatzen => Client == Type.Matzen;
-			set {
+        public bool IsWinzerkeller => Client == Type.Winzerkeller;
-				Plz = value.AtPlz.Plz;
+        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
-				Ort = value.AtPlz.Ort.Name;
+        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
-			}
+        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
-		}
-		public int Plz { get; private set; }
-		public string Ort { get; private set; }
-		public string Address;
-		public string Sender1 => $"{NameShort} | {Address} | {Plz} {Ort}";
-		public string Sender2;
 
-		public string? Iban;
+        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
-		public string? Bic;
+        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
-		public string? UstId;
+        public bool HasRebler() => HasRebler(App.ZwstId);
-		public string? LfbisNr;
+        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
+        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
+        public bool HasKisten() => HasKisten(App.ZwstId);
 
-		public string? PhoneNr;
+        public string NameToken;
-		public string? FaxNr;
+        public string NameShort;
-		public string? EmailAddress;
+        public string Name;
-		public string? Website;
+        public string? NameSuffix;
+        public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
+        public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
+        public Type? Client;
 
-		public ClientParameters() {
+        public PostalDest PostalDest {
-			NameToken = "WGM";
+            set {
-			NameShort = "WG Matzen";
+                Plz = value.AtPlz.Plz;
-			NameShortened = "Winzergenossenschaft f. Matzen u. Umgebung";
+                Ort = value.AtPlz.Ort.Name;
-			Name = "Winzergenossenschaft für Matzen und Umgebung";
+            }
-			NameSuffix = "reg. Gen.m.b.H.";
+        }
-			Plz = 2243;
+        public int Plz;
-			Ort = "Matzen";
+        public string Ort;
-			Address = "Schloßstraße 6";
+        public string Address;
-			Sender2 = "E Österreichische Post AG Eco Brief";
+        public string Sender1 => $"{NameShort} | {Address} | {Plz} {Ort}";
-		}
+        public string Sender2;
-	}
+
+        public string? Iban;
+        public string? Bic;
+        public string? UstIdNr;
+        public string? LfbisNr;
+
+        public string? PhoneNr;
+        public string? FaxNr;
+        public string? EmailAddress;
+        public string? Website;
+
+        public int ModeDeliveryNoteStats;
+
+        public string? TextDeliveryNote;
+        public string? TextDeliveryConfirmation;
+
+        public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
+
+        public ClientParameters(Dictionary<string, string?> parameters) {
+            try {
+                NameToken = parameters["CLIENT_NAME_TOKEN"] ?? throw new KeyNotFoundException();
+                NameShort = parameters["CLIENT_NAME_SHORT"] ?? throw new KeyNotFoundException();
+                Name = parameters["CLIENT_NAME"] ?? throw new KeyNotFoundException();
+                NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX");
+                NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
+                switch (Name) {
+                    case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break;
+                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
+                };
+
+                Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
+                Ort = parameters["CLIENT_ORT"] ?? throw new KeyNotFoundException();
+                Address = parameters["CLIENT_ADDRESS"] ?? throw new KeyNotFoundException();
+                PhoneNr = parameters.GetValueOrDefault("CLIENT_PHONE");
+                FaxNr = parameters.GetValueOrDefault("CLIENT_FAX");
+                EmailAddress = parameters.GetValueOrDefault("CLIENT_EMAIL");
+                Website = parameters.GetValueOrDefault("CLIENT_WEBSITE");
+                LfbisNr = parameters.GetValueOrDefault("CLIENT_LFBISNR");
+                UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
+                Bic = parameters.GetValueOrDefault("CLIENT_BIC");
+                Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
+
+                switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
+                    case "NONE": ModeDeliveryNoteStats = 0; break;
+                    case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
+                    case "SHORT": ModeDeliveryNoteStats = 2; break;
+                    case "FULL": ModeDeliveryNoteStats = 3; break;
+                }
+
+                Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
+                TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+                if (TextDeliveryNote == "") TextDeliveryNote = null;
+                TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
+                if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
+            } catch {
+                throw new KeyNotFoundException();
+            }
+        }
+
+        private IEnumerable<(string, string?)> GetParamValues() {
+            string deliveryNoteStats = "SHORT";
+            switch (ModeDeliveryNoteStats) {
+                case 0: deliveryNoteStats = "NONE"; break;
+                case 1: deliveryNoteStats = "GA_ONLY"; break;
+                case 2: deliveryNoteStats = "SHORT"; break;
+                case 3: deliveryNoteStats = "FULL"; break;
+            }
+            return new (string, string?)[] {
+                ("CLIENT_NAME_TOKEN", NameToken),
+                ("CLIENT_NAME_SHORT", NameShort),
+                ("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),
+                ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
+                ("DOCUMENT_SENDER", Sender2),
+                ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+                ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
+            };
+        }
+
+        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;
 
@@ -9,11 +8,12 @@ namespace Elwig.Helpers {
     public class Config {
 
         private readonly string FileName;
+        public bool Debug;
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
-        public IEnumerable<string[]> Scales;
+        public IList<string?[]> Scales;
-        private readonly LinkedList<string[]> ScaleList = new();
+        private readonly List<string?[]> ScaleList = new();
 
         public Config(string filename) {
             FileName = filename;
@@ -25,7 +25,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)) {
@@ -50,20 +50,37 @@ namespace Elwig.Helpers {
                 Branch = branch;
             }
 
+            if (ini == null || !ini.TryGetKey("general.debug", out string debug)) {
+                Debug = false;
+            } else {
+                debug = debug.ToLower();
+                Debug = debug == "1" || debug == "true" || debug == "yes" || debug == "on";
+            }
+
             ScaleList.Clear();
             Scales = ScaleList;
             if (ini != null) {
                 foreach (var s in ini.Sections.Where(s => s.SectionName.StartsWith("scale."))) {
-                    ScaleList.AddLast(new string[] {
+                    string? scaleLog = null;
+                    if (s.Keys["log"] != null) {
+                        scaleLog = s.Keys["log"];
+                        if (scaleLog.Length <= 1 || (scaleLog[1] != ':' && scaleLog[0] != '/' && scaleLog[0] != '\\')) {
+                            scaleLog = App.DataPath + scaleLog;
+                        }
+                    }
+                    ScaleList.Add(new string?[] {
                         s.SectionName[6..], s.Keys["type"], s.Keys["model"], s.Keys["connection"],
-                        s.Keys["empty"], s.Keys["filling"], s.Keys["limit"]
+                        s.Keys["empty"], s.Keys["filling"], s.Keys["limit"], scaleLog
                     });
                 }
             }
         }
 
         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");
+            if (Debug) file.Write("debug = true\r\n");
             file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n");
             if (DatabaseLog != null) file.Write($"log = {DatabaseLog}\r\n");
             foreach (var s in ScaleList) {
@@ -71,6 +88,7 @@ namespace Elwig.Helpers {
                 if (s[4] != null) file.Write($"empty = {s[4]}\r\n");
                 if (s[5] != null) file.Write($"filling = {s[5]}\r\n");
                 if (s[6] != null) file.Write($"limit = {s[6]}\r\n");
+                if (s[7] != null) file.Write($"log = {s[7]}\r\n");
             }
         }
     }

Elwig/Helpers/ControlUtils.cs

@@ -0,0 +1,224 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+
+namespace Elwig.Helpers {
+    public class ControlUtils {
+
+        public enum RenewSourceDefault {
+            None,
+            IfOnly,
+            First
+        }
+
+        private static void SetControlBrush(Control input, Brush brush) {
+            if (input is ComboBox cb) {
+                var border = GetComboBoxBorder(cb);
+                if (border != null) border.BorderBrush = brush;
+            } else {
+                input.BorderBrush = brush;
+            }
+        }
+
+        public static void SetInputNotDefault(Control input) {
+            SetControlBrush(input, Brushes.Gold);
+        }
+
+        public static void SetInputChanged(Control input) {
+            SetControlBrush(input, Brushes.Orange);
+        }
+
+        public static void SetInputInvalid(Control input) {
+            SetControlBrush(input, Brushes.Red);
+        }
+
+        public static void ClearInputState(Control input) {
+            if (input is ComboBox cb) {
+                GetComboBoxBorder(cb)?.ClearValue(Border.BorderBrushProperty);
+            } else {
+                input.ClearValue(Control.BorderBrushProperty);
+            }
+        }
+
+        private static Border? GetComboBoxBorder(ComboBox cb) {
+            var toggleButton = cb.Template.FindName("toggleButton", cb) as ToggleButton;
+            return toggleButton?.Template.FindName("templateRoot", toggleButton) as Border;
+        }
+
+        public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj) where T : DependencyObject {
+            if (depObj == null)
+                yield return (T)Enumerable.Empty<T>();
+            foreach (var child in LogicalTreeHelper.GetChildren(depObj)) {
+                if (child == null) {
+                    continue;
+                } else if (child is T t) {
+                    yield return t;
+                }
+                if (child is DependencyObject childDepOpj) {
+                    foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+
+        public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj, IEnumerable<DependencyObject> exempt) where T : DependencyObject {
+            return FindAllChildren<T>(depObj).Where(c => !exempt.Contains(c));
+        }
+
+        public static T? FindNextSibling<T>(Control me) where T : DependencyObject {
+            var found = false;
+            foreach (var child in LogicalTreeHelper.GetChildren(me.Parent)) {
+                if (found && child is T c) {
+                    return c;
+                } else if (child == me) {
+                    found = true;
+                }
+            }
+            return null;
+        }
+
+        public static void RenewItemsSource(Selector selector, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
+            if (selector.ItemsSource == source)
+                return;
+            var selectedId = getId(selector.SelectedItem);
+            object? selItem = null;
+            if (selectedId != null && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (source != null && selItem == null) {
+                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                    selItem = source.Cast<object>().First();
+                }
+            }
+            if (handler != null && selItem != null) selector.SelectionChanged -= handler;
+            selector.ItemsSource = source;
+            if (handler != null && selItem != null) selector.SelectionChanged += handler;
+            selector.SelectedItem = selItem;
+        }
+
+        public static void RenewItemsSource(Xceed.Wpf.Toolkit.Primitives.Selector selector, IEnumerable? source, Func<object?, object?> getId) {
+            if (selector.ItemsSource == source)
+                return;
+            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);
+            }
+        }
+
+        public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
+            if (dataGrid.ItemsSource == source)
+                return;
+            var column = dataGrid.CurrentCell.Column;
+            var sortColumns = dataGrid.Columns.Select(c => c.SortDirection).ToList();
+            var sort = dataGrid.Items.SortDescriptions.ToList();
+            var selectedId = getId(dataGrid.SelectedItem);
+            object? selItem = null;
+            if (selectedId != null && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (source != null && selItem == null) {
+                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                    selItem = source.Cast<object>().First();
+                }
+            }
+            if (handler != null && selItem != null) dataGrid.SelectionChanged -= handler;
+            dataGrid.ItemsSource = source;
+            if (handler != null && selItem != null) dataGrid.SelectionChanged += handler;
+            dataGrid.SelectedItem = selItem;
+            if (keepSort) {
+                for (int i = 0; i < dataGrid.Columns.Count; i++)
+                    dataGrid.Columns[i].SortDirection = sortColumns[i];
+                foreach (var s in sort)
+                    dataGrid.Items.SortDescriptions.Add(s);
+            }
+            if (dataGrid.SelectedItem != null && column != null)
+                dataGrid.CurrentCell = new(dataGrid.SelectedItem, column);
+        }
+
+        public static void RenewItemsSource(ListBox listBox, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None) {
+            if (listBox.ItemsSource == source)
+                return;
+            var selectedId = getId(listBox.SelectedItem);
+            object? selItem = null;
+            if (selectedId != null && source != null)
+                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+            if (source != null && selItem == null) {
+                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                    selItem = source.Cast<object>().FirstOrDefault();
+                }
+            }
+            if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
+            listBox.ItemsSource = source;
+            if (handler != null && selItem != null) listBox.SelectionChanged += handler;
+            listBox.SelectedItem = selItem;
+        }
+
+        public static object? GetItemFromSource(IEnumerable source, Func<object?, object?> getId, object? id) {
+            if (source == null)
+                return null;
+            var items = source.Cast<object>();
+            var item = items.Where(i => getId(i)?.Equals(id) ?? false).FirstOrDefault();
+            if (item == null && items.Any(i => i is NullItem))
+                return items.Where(i => i is NullItem).First();
+            return item;
+        }
+
+        public static object? GetItemFromSource(IEnumerable source, object? item, Func<object?, object?> getId) {
+            return GetItemFromSource(source, getId, getId(item));
+        }
+
+        public static void SelectComboBoxItem(ComboBox cb, Func<object?, object?> getId, object? id) {
+            cb.SelectedItem = GetItemFromSource(cb.ItemsSource, getId, id);
+        }
+
+        public static void SelectComboBoxItem(ComboBox cb, object? item, Func<object?, object?> getId) {
+            SelectComboBoxItem(cb, getId, getId(item));
+        }
+
+        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, Func<object?, object?> getId, IEnumerable<object?> ids) {
+            if (source == null)
+                return Array.Empty<object>();
+            return source.Cast<object>().Where(i => ids.Any(c => c?.Equals(getId(i)) ?? false));
+        }
+
+        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<object?>? items, Func<object?, object?> getId) {
+            if (items == null)
+                return Array.Empty<object>();
+            return GetItemsFromSource(source, getId, items.Select(i => getId(i)));
+        }
+
+        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, Func<object?, object?> getId, IEnumerable<object?>? ids) {
+            ccb.SelectedItems.Clear();
+            if (ids == null) return;
+            foreach (var id in ids)
+                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, getId, id));
+        }
+
+        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items, Func<object?, object?> getId) {
+            SelectCheckComboBoxItems(ccb, getId, items?.Select(i => getId(i)));
+        }
+
+        public static 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/NullItem.cs

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

Elwig/Helpers/Printing/Html.cs

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

Elwig/Helpers/Printing/Pdf.cs

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

Elwig/Helpers/TempFile.cs

@@ -5,10 +5,11 @@ namespace Elwig.Helpers {
     public sealed class TempFile : IDisposable {
         private int Usages = 0;
         public string FilePath { get; private set; }
+        public string FileName => Path.GetFileName(FilePath);
 
         public TempFile() : this(null) { }
 
-        public TempFile(string? ext) : this(Path.Combine(Path.GetTempPath(), "Elwig"), ext) { }
+        public TempFile(string? ext) : this(App.TempPath, ext) { }
 
         public TempFile(string dir, string? ext) {
             FilePath = Path.Combine(dir, Path.GetRandomFileName().Replace(".", "") + (ext != null ? $".{ext}" : ""));

Elwig/Helpers/Utils.cs

@@ -2,34 +2,88 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Windows.Media;
 using System.Windows;
-using System.Windows.Controls;
 using System.Diagnostics;
-using System.Windows.Controls.Primitives;
 using System.Text.RegularExpressions;
 using System.IO.Ports;
 using System.Net.Sockets;
-using System.Collections;
+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);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
         public static readonly Regex SerialRegex = GeneratedSerialRegex();
         public static readonly Regex TcpRegex = GeneratedTcpRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
+        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();
 
-        [GeneratedRegex("^tcp://[A-Za-z0-9:._-]+(:[0-9]+)?$", RegexOptions.Compiled)]
+        [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])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToDateRegex();
+
+        [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedFromToRegex();
+
+        [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,
+            0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+            0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+            0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+            0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+            0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+            0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+            0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+            0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+            0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+            0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+            0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+            0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+            0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+            0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+            0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+            0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+            0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+            0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+            0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+            0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+            0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+            0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+            0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+            0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+            0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+            0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+            0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+            0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+            0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+            0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,
+        };
+
         public static SerialPort OpenSerialConnection(string connection) {
-            var m = Utils.SerialRegex.Match(connection);
+            var m = SerialRegex.Match(connection);
             if (!m.Success)
                 throw new ArgumentException("Invalid connection string for scheme \"serial\"");
 
@@ -47,132 +101,26 @@ namespace Elwig.Helpers {
                 DataBits = data == "" ? 8 : int.Parse(data),
                 StopBits = (StopBits)(stop == "" ? 1 : stop == "1.5" ? 3 : stop[0] - '0'),
                 Handshake = Handshake.None,
+                WriteTimeout = 250,
+                ReadTimeout = 11000,
             };
             port.Open();
             return port;
         }
 
         public static TcpClient OpenTcpConnection(string connection) {
-            var m = Utils.TcpRegex.Match(connection);
+            var m = TcpRegex.Match(connection);
             if (!m.Success)
                 throw new ArgumentException("Invalid connection string for scheme \"tcp\"");
 
             var client = new TcpClient() {
                 SendTimeout = 250,
-                ReceiveTimeout = 250,
+                ReceiveTimeout = 11000,
             };
             client.Connect(m.Groups[1].Value, int.Parse(m.Groups[2].Value));
             return client;
         }
 
-        public static void SetInputChanged(Control input) {
-            var brush = Brushes.Orange;
-            if (input is ComboBox cb) {
-                var border = GetComboBoxBorder(cb);
-                if (border != null)
-                    border.BorderBrush = brush;
-            } else {
-                input.BorderBrush = brush;
-            }
-        }
-
-        public static void SetInputInvalid(Control input) {
-            var brush = Brushes.Red;
-            if (input is ComboBox cb) {
-                var border = GetComboBoxBorder(cb);
-                if (border != null)
-                    border.BorderBrush = brush;
-            } else {
-                input.BorderBrush = brush;
-            }
-        }
-
-        public static void ClearInputState(Control input) {
-            if (input is ComboBox cb) {
-                GetComboBoxBorder(cb)?.ClearValue(Border.BorderBrushProperty);
-            } else {
-                input.ClearValue(Control.BorderBrushProperty);
-            }
-        }
-
-        private static Border? GetComboBoxBorder(ComboBox cb) {
-            var toggleButton = cb.Template.FindName("toggleButton", cb) as ToggleButton;
-            return toggleButton?.Template.FindName("templateRoot", toggleButton) as Border;
-        }
-
-        public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj) where T : DependencyObject {
-            if (depObj == null)
-                yield return (T)Enumerable.Empty<T>();
-            foreach (var child in LogicalTreeHelper.GetChildren(depObj)) {
-                if (child == null) {
-                    continue;
-                } else if (child is T t) {
-                    yield return t;
-                } else if (child is DependencyObject childDepOpj) {
-                    foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) {
-                        yield return childOfChild;
-                    }
-                }
-            }
-        }
-
-        public static IEnumerable<T> FindAllChildren<T>(DependencyObject depObj, IEnumerable<DependencyObject> exempt) where T : DependencyObject {
-            return FindAllChildren<T>(depObj).Where(c => !exempt.Contains(c));
-        }
-
-        public static T? FindNextSibling<T>(Control me) where T : DependencyObject {
-            var found = false;
-            foreach (var child in LogicalTreeHelper.GetChildren(me.Parent)) {
-                if (found && child is T c) {
-                    return c;
-                } else if (child == me) {
-                    found = true;
-                }
-            }
-            return null;
-        }
-
-        public static void RenewItemsSource(Selector selector, IEnumerable? source, Func<object?, object?> getId) {
-            var selectedId = getId(selector.SelectedItem);
-            selector.ItemsSource = source;
-            if (selectedId != null && source != null)
-                selector.SelectedItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
-        }
-
-        public static void RenewItemsSource(Xceed.Wpf.Toolkit.Primitives.Selector selector, IEnumerable? source, Func<object?, object?> getId) {
-            var selectedIds = selector.SelectedItems.Cast<object>().Select(i => getId(i)).ToList();
-            selector.ItemsSource = source;
-            if (source != null) {
-                foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(getId(i))))
-                    selector.SelectedItems.Add(i);
-            }
-        }
-
-        public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, Func<object?, object?> getId, bool keepSort = true) {
-            var column = dataGrid.CurrentCell.Column;
-            var sortColumns = dataGrid.Columns.Select(c => c.SortDirection).ToList();
-            var sort = dataGrid.Items.SortDescriptions.ToList();
-            var selectedId = getId(dataGrid.SelectedItem);
-            dataGrid.ItemsSource = source;
-            if (keepSort) {
-                for (int i = 0; i < dataGrid.Columns.Count; i++)
-                    dataGrid.Columns[i].SortDirection = sortColumns[i];
-                foreach (var s in sort)
-                    dataGrid.Items.SortDescriptions.Add(s);
-            }
-            if (selectedId != null && source != null)
-                dataGrid.SelectedItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
-            if (dataGrid.SelectedItem != null && column != null)
-                dataGrid.CurrentCell = new(dataGrid.SelectedItem, column);
-        }
-
-        public static void RenewItemsSource(ListBox listBox, IEnumerable? source, Func<object?, object?> getId) {
-            var selectedId = getId(listBox.SelectedItem);
-            listBox.ItemsSource = source;
-            if (selectedId != null && source != null)
-                listBox.SelectedItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
-        }
-
         public static int Modulo(string a, int b) {
             if (a.Length == 0 || !a.All(char.IsAsciiDigit)) {
                 throw new ArgumentException("First argument has to be a decimal string");
@@ -182,6 +130,22 @@ namespace Elwig.Helpers {
             return a.Select(ch => ch - '0').Aggregate((sum, n) => (sum * 10 + n) % b);
         }
 
+        public static ushort CalcCrc16Modbus(byte[] data) {
+            // https://www.modbustools.com/modbus_crc16.htm
+            byte temp;
+            ushort crc = 0xFFFF;
+            foreach (byte b in data) {
+                temp = (byte)(b ^ crc);
+                crc >>= 8;
+                crc ^= Crc16ModbusTable[temp];
+            }
+            return crc;
+        }
+
+        public static ushort CalcCrc16Modbus(string data) {
+            return CalcCrc16Modbus(Encoding.ASCII.GetBytes(data));
+        }
+
         public static void RunBackground(string title, Func<Task> a) {
             Task.Run(async () => {
                 try {
@@ -193,8 +157,12 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
+            MailTo(new string[] { emailAddress });
+        }
+
+        public static void MailTo(IEnumerable<string> emailAddresses) {
             Process.Start(new ProcessStartInfo() {
-                FileName = $"mailto:{emailAddress}",
+                FileName = $"mailto:{string.Join(",%20", emailAddresses)}",
                 UseShellExecute = true,
             });
         }
@@ -229,67 +197,149 @@ namespace Elwig.Helpers {
             if (!searchKeywords.Any())
                 return 0;
 
-            words = words.Select(w => w?.ToLower());
+            return searchKeywords
-            int i = 0;
+                .Select(k => {
-            foreach (string? c in words) {
+                    k = k.ToLower();
-                if (c == null) continue;
+                    var scores = words.Select(w => {
-                var parts = c.Split(" ");
+                        w = w?.ToLower();
-                if (searchKeywords.Any(f => c == f)) {
+                        var p = w?.ToLower()?.Split(" ");
-                    i += 100;
+                        if (w == null || p == null) {
-                } else if (searchKeywords.Any(f => parts.Any(a => a == f))) {
+                            return 0;
-                    i += 90;
+                        } else if (k == w) {
-                } else if (searchKeywords.Any(f => parts.Any(a => a.StartsWith(f)))) {
+                            return 4 + k.Length;
-                    i += 50;
+                        } else if (p.Any(a => a == k)) {
-                } else if (searchKeywords.Any(f => f != null && c.Contains(f))) {
+                            return 3 + k.Length;
-                    i += 1;
+                        } else if (p.Any(a => a.StartsWith(k))) {
-                }
+                            return 2 + k.Length;
+                        } else if (w.Contains(k)) {
+                            return 1 + k.Length;
+                        } else {
+                            return 0;
+                        }
+                    });
+                    return scores.Max() + scores.Count(s => s > 0);
+                })
+                .Sum();
+        }
+
+        public static (int, string?)? ShowManualWeighingDialog(string? reason = null) {
+            var d = new ManualWeighingDialog(reason);
+            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;
             }
-            return i;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, Func<object?, object?> getId, object? id) {
+        public static string GetSign<T>(T number) where T : INumber<T>
-            if (source == null)
+            => T.Sign(number) switch {
-                return null;
+                < 0 => "\u2212",  // minus
-            var items = source.Cast<object>();
+                  0 => "\u00b1",  // plus minus
-            var item = items.Where(i => getId(i)?.Equals(id) ?? false).FirstOrDefault();
+                > 0 => "+",
-            if (item == null && items.Any(i => i is NullItem))
+            };
-                return items.Where(i => i is NullItem).First();
+
-            return item;
+        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 object? GetItemFromSource(IEnumerable source, object? item, Func<object?, object?> getId) {
+        public static (string, string?) SplitName(string fullName, string? familyName) {
-            return GetItemFromSource(source, getId, getId(item));
+            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());
+            }
         }
 
-        public static void SelectComboBoxItem(ComboBox cb, Func<object?, object?> getId, object? id) {
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
-            cb.SelectedItem = GetItemFromSource(cb.ItemsSource, getId, id);
+            HashSet<IEnumerable<T>> output = new();
-        }
+            for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
-
+                List<T> t = new();
-        public static void SelectComboBoxItem(ComboBox cb, object? item, Func<object?, object?> getId) {
+                for (int j = 0; j < 30; j++) {
-            SelectComboBoxItem(cb, getId, getId(item));
+                    var e = input.ElementAtOrDefault(j);
-        }
+                    if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
-
+                        t.Add(e);
-        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, Func<object?, object?> getId, IEnumerable<object?> ids) {
+                    }
-            if (source == null)
+                }
-                return Array.Empty<object>();
+                output.Add(t);
-            return source.Cast<object>().Where(i => ids.Any(c => c?.Equals(getId(i)) ?? false));
+            }
-        }
+            return output.OrderByDescending(l => l.Count());
-
-        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<object?>? items, Func<object?, object?> getId) {
-            if (items == null)
-                return Array.Empty<object>();
-            return GetItemsFromSource(source, getId, items.Select(i => getId(i)));
-        }
-
-        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, Func<object?, object?> getId, IEnumerable<object?>? ids) {
-            ccb.SelectedItems.Clear();
-            if (ids == null) return;
-            foreach (var id in ids)
-                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, getId, id));
-        }
-
-        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items, Func<object?, object?> getId) {
-            SelectCheckComboBoxItems(ccb, getId, items?.Select(i => getId(i)));
         }
     }
 }

Elwig/Helpers/Validator.cs

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

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -14,13 +14,14 @@ namespace Elwig.Helpers.Weighing {
         public string Manufacturer => "Gassner";
         public int InternalScaleNr => 1;
         public string Model { get; private set; }
-        public int ScaleNr { get; private set; }
+        public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
         public int? WeightLimit { get; private set; }
+        public string? LogPath { get; private set; }
 
-        public GassnerScale(int scaleNr, string model, string connection) {
+        public GassnerScale(string id, string model, string connection) {
-            ScaleNr = scaleNr;
+            ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;

Elwig/Helpers/Weighing/IScale.cs

@@ -17,9 +17,9 @@ namespace Elwig.Helpers.Weighing {
         string Model { get; }
 
         /// <summary>
-        /// Unique number of the scale
+        /// Unique identificator of the scale
         /// </summary>
-        int ScaleNr { get; }
+        string ScaleId { get; }
 
         /// <summary>
         /// Internal identifying number of the scale in its system
@@ -41,6 +41,11 @@ namespace Elwig.Helpers.Weighing {
         /// </summary>
         int? WeightLimit { get; }
 
+        /// <summary>
+        /// Where to log the requests and responses from the scale to
+        /// </summary>
+        string? LogPath { get; }
+
         /// <summary>
         /// Get the current weight on the scale without performing a weighing process
         /// </summary>

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/Helpers/Weighing/SchemberScale.cs

@@ -7,11 +7,12 @@ namespace Elwig.Helpers.Weighing {
 
         public string Manufacturer => "Schember";
         public string Model => throw new NotImplementedException();
-        public int ScaleNr => throw new NotImplementedException();
+        public string ScaleId => throw new NotImplementedException();
         public int InternalScaleNr => throw new NotImplementedException();
         public bool IsReady => throw new NotImplementedException();
         public bool HasFillingClearance => throw new NotImplementedException();
         public int? WeightLimit => throw new NotImplementedException();
+        public string? LogPath => throw new NotImplementedException();
 
         public void Dispose() {
             throw new NotImplementedException();

Elwig/Helpers/Weighing/SystecScale.cs

@@ -11,9 +11,9 @@ namespace Elwig.Helpers.Weighing {
         protected enum Output { RTS, DTR, OUT1, OUT2 };
 
         protected SerialPort? Serial = null;
+        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
         protected TcpClient? Tcp = null;
-        protected StreamReader Reader;
+        protected Stream Stream;
-        protected StreamWriter Writer;
 
         protected readonly Output? EmptyMode = null;
         protected readonly Output? FillingClearanceMode = null;
@@ -22,71 +22,89 @@ namespace Elwig.Helpers.Weighing {
         public string Manufacturer => "SysTec";
         public int InternalScaleNr => 1;
         public string Model { get; private set; }
-        public int ScaleNr { get; private set; }
+        public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
         public int? WeightLimit { get; private set; }
+        public string? LogPath { get; private set; }
 
-        public SystecScale(int scaleNr, string model, string connection, string? empty = null, string? fill = null, int? limit = null) {
+        public SystecScale(string id, string model, string connection, string? empty = null, string? filling = null, int? limit = null, string? log = null) {
-            ScaleNr = scaleNr;
+            ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
+            LogPath = log;
 
-            Stream stream;
             if (connection.StartsWith("serial:")) {
                 Serial = Utils.OpenSerialConnection(connection);
-                stream = Serial.BaseStream;
+                Stream = Serial.BaseStream;
             } else if (connection.StartsWith("tcp:")) {
                 Tcp = Utils.OpenTcpConnection(connection);
-                stream = Tcp.GetStream();
+                Stream = Tcp.GetStream();
             } else {
                 throw new ArgumentException("Unsupported scheme");
             }
 
             if (empty != null) {
                 var parts = empty.Split(':');
-                EmptyMode = ConvertOutput(parts[0]);
+                if (parts.Length == 3) {
-                EmptyDelay = int.Parse(parts[1]);
+                    if (parts[0] != Serial?.PortName)
+                        ControlSerialEmpty = Utils.OpenSerialConnection($"serial://{parts[0]}:9600");
+                } else if (parts.Length != 2) {
+                    throw new ArgumentException("Invalid value for 'empty'");
+                }
+                EmptyMode = ConvertOutput(parts[^2]);
+                EmptyDelay = int.Parse(parts[^1]);
             }
-            FillingClearanceMode = ConvertOutput(fill);
-            WeightLimit = limit;
-            if (FillingClearanceMode != null && WeightLimit == null)
-                throw new ArgumentException("Weight limit has to be set, if filling clearance supervision is enalbed");
 
-            Writer = new(stream, Encoding.ASCII, -1, true);
+            WeightLimit = limit;
-            Reader = new(stream, Encoding.ASCII, false, -1, true);
+            if (filling != null) {
+                var parts = filling.Split(':');
+                if (parts.Length == 2) {
+                    if (parts[0] != Serial?.PortName)
+                        ControlSerialFilling = parts[0] != ControlSerialEmpty?.PortName ? Utils.OpenSerialConnection($"serial://{parts[0]}:9600") : ControlSerialEmpty;
+                } else if (parts.Length != 1) {
+                    throw new ArgumentException("Invalid value for 'filling'");
+                }
+                FillingClearanceMode = ConvertOutput(parts[^1]);
+            }
+
+            if (FillingClearanceMode != null && WeightLimit == null)
+                throw new ArgumentException("Weight limit has to be set, if filling clearance supervision is enabled");
         }
 
         public void Dispose() {
-            Writer.Close();
+            Stream.Close();
-            Reader.Close();
             Serial?.Close();
+            ControlSerialEmpty?.Close();
+            ControlSerialFilling?.Close();
             Tcp?.Close();
             GC.SuppressFinalize(this);
         }
 
         protected static Output? ConvertOutput(string? value) {
-            if (value == null) return null;
+            return value switch {
-            value = value.ToUpper();
+                null => null,
-            if (value == "RTS") {
+                "RTS" => Output.RTS,
-                return Output.RTS;
+                "DTR" => Output.DTR,
-            } else if (value == "DTR") {
+                "OUT1" => Output.OUT1,
-                return Output.DTR;
+                "OUT2" => Output.OUT2,
-            } else if (value == "OUT1") {
+                _ => throw new ArgumentException($"Invalid value for argument: '{value}'"),
-                return Output.OUT1;
+            };
-            } else if (value == "OUT2") {
+        }
-                return Output.OUT2;
+
+        protected async Task SendCommand(string command) {
+            byte[] bytes = Encoding.ASCII.GetBytes($"<{command}>");
+            await Stream.WriteAsync(bytes);
+            if (LogPath != null) await File.AppendAllTextAsync(LogPath, $"<{command}>");
+        }
+
+        protected async Task<string> ReceiveResponse() {
+            string? line = null;
+            using (var reader = new StreamReader(Stream, Encoding.ASCII, false, -1, true)) {
+                line = await reader.ReadLineAsync();
+                if (LogPath != null) await File.AppendAllTextAsync(LogPath, $"{line}\r\n");
             }
-            throw new ArgumentException("Invalid value for argument empty");
-        }
-
-        public async Task SendCommand(string command) {
-            await Writer.WriteAsync($"<{command}>");
-        }
-
-        public async Task<string> ReceiveResponse() {
-            var line = await Reader.ReadLineAsync();
             if (line == null || line.Length < 4 || !line.StartsWith("<") || !line.EndsWith(">")) {
                 throw new IOException("Invalid response from scale");
             }
@@ -94,7 +112,7 @@ namespace Elwig.Helpers.Weighing {
             var error = line[1..3];
             if (error[0] == '0') {
                 if (error[1] != '0') {
-                    throw new IOException($"Invalid response from scale (error code {error}");
+                    throw new IOException($"Invalid response from scale (error code {error})");
                 }
             } else if (error[0] == '1') {
                 string msg = $"Unbekannter Fehler (Fehler code {error})";
@@ -119,32 +137,44 @@ namespace Elwig.Helpers.Weighing {
                 throw new IOException($"Invalid response from scale (error code {error})");
             }
 
-            return line[3..(line.Length - 1)];
+            return line[1..^1];
         }
 
         protected async Task<WeighingResult> Weigh(bool incIdentNr) {
-            await SendCommand(incIdentNr ? $"RM{InternalScaleNr}" : $"RN{InternalScaleNr}");
+            await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
-            string line = await ReceiveResponse();
+            string record = await ReceiveResponse();
+            if (record.Length != 62)
+                throw new IOException("Invalid response from scale: Received record has invalid size");
+            var line = record[2..];
 
             var status     = line[ 0.. 2];
             var date       = line[ 2..10];
             var time       = line[10..15];
-            var identNr    = line[15..19];
+            var identNr    = line[15..19].Trim();
             var scaleNr    = line[19..20];
-            var brutto     = line[20..28];
+            var brutto     = line[20..28].Trim();
-            var tara       = line[28..36];
+            var tara       = line[28..36].Trim();
-            var netto      = line[36..44];
+            var netto      = line[36..44].Trim();
             var unit       = line[44..46];
             var taraCode   = line[46..48];
-            var zone       = line[48..49];
+            var zone       = line[48..49].Trim();
-            var terminalNr = line[49..52];
+            var terminalNr = line[49..52].Trim();
-            var crc16      = line[52..60];
+            var crc16      = line[52..60].Trim();
 
+            if (Utils.CalcCrc16Modbus(record[..54]) != ushort.Parse(crc16)) {
+                throw new IOException($"Invalid response from scale: Invalid CRC16 checksum ({crc16} != {Utils.CalcCrc16Modbus(record[..54]).ToString()})");
+            } else if (unit != "kg") {
+                throw new IOException($"Unsupported unit in weighing response: '{unit}'");
+            }
+
+            identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
+            var parsedDate = DateOnly.Parse(date);
             return new() {
-                Weight = int.TryParse(netto.Trim(), out int w) ? w : null,
+                Weight = int.Parse(netto),
-                WeighingId = identNr.Trim().Length > 0 ? identNr.Trim() : null,
+                WeighingId = identNr,
-                Date = date,
+                FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
-                Time = time,
+                Date = parsedDate,
+                Time = TimeOnly.Parse(time),
             };
         }
 
@@ -157,33 +187,35 @@ namespace Elwig.Helpers.Weighing {
         }
 
         public async Task Empty() {
-            if (EmptyMode == Output.RTS && Serial != null) {
+            SerialPort? p = ControlSerialEmpty ?? Serial;
-                Serial.RtsEnable = true;
+            if (EmptyMode == Output.RTS && p != null) {
+                p.RtsEnable = true;
                 await Task.Delay(EmptyDelay);
-                Serial.RtsEnable = false;
+                p.RtsEnable = false;
-            } else if (EmptyMode == Output.DTR && Serial != null) {
+            } else if (EmptyMode == Output.DTR && p != null) {
-                Serial.DtrEnable = true;
+                p.DtrEnable = true;
                 await Task.Delay(EmptyDelay);
-                Serial.DtrEnable = false;
+                p.DtrEnable = false;
             } else if (EmptyMode == Output.OUT1 || EmptyMode == Output.OUT2) {
                 int output = EmptyMode == Output.OUT1 ? 1 : 2;
-                await SendCommand($"OS{output:02i}");
+                await SendCommand($"OS{output:00}");
                 await ReceiveResponse();
                 await Task.Delay(EmptyDelay);
-                await SendCommand($"OC{output:02i}");
+                await SendCommand($"OC{output:00}");
                 await ReceiveResponse();
             }
         }
 
         protected async Task SetFillingClearance(bool status) {
-            if (FillingClearanceMode == Output.RTS && Serial != null) {
+            SerialPort? p = ControlSerialFilling ?? Serial;
-                Serial.RtsEnable = status;
+            if (FillingClearanceMode == Output.RTS && p != null) {
-            } else if (FillingClearanceMode == Output.DTR && Serial != null) {
+                p.RtsEnable = status;
-                Serial.DtrEnable = status;
+            } else if (FillingClearanceMode == Output.DTR && p != null) {
+                p.DtrEnable = status;
             } else if (FillingClearanceMode == Output.OUT1 || FillingClearanceMode == Output.OUT2) {
                 string cmd = status ? "OS" : "OC";
                 int output = FillingClearanceMode == Output.OUT1 ? 1 : 2;
-                await SendCommand($"{cmd}{output:02i}");
+                await SendCommand($"{cmd}{output:00}");
                 await ReceiveResponse();
             }
         }

Elwig/Helpers/Weighing/WeighingResult.cs

@@ -1,3 +1,5 @@
+using System;
+
 namespace Elwig.Helpers.Weighing {
     /// <summary>
     /// Result of a weighing process on an industrial scale
@@ -13,14 +15,25 @@ namespace Elwig.Helpers.Weighing {
         /// </summary>
         public string? WeighingId = null;
 
+        /// <summary>
+        /// Wheighing id (or IdentNr) provided by the scale optionally combined with the current date
+        /// </summary>
+        public string? FullWeighingId = null;
+
         /// <summary>
         /// Date string provided by the scale
         /// </summary>
-        public string? Date = null;
+        public DateOnly? Date = null;
 
         /// <summary>
         /// Time string provided by the scale
         /// </summary>
-        public string? Time = null;
+        public TimeOnly? Time = null;
+
+        /// <returns>&lt;Weight/WeighingId/Date/Time&gt;</returns>
+        override public string ToString() {
+            var w = Weight != null ? $"{Weight}kg" : "";
+            return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
+        }
     }
 }

Elwig/Models/AT_PlzDest.cs

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

Elwig/Models/AreaCom.cs

@@ -1,4 +1,6 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
@@ -12,8 +14,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 +44,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; }
@@ -54,10 +56,11 @@ namespace Elwig.Models {
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
 
-        [InverseProperty("AreaCom")]
+        public int SearchScore(IEnumerable<string> keywords) {
-        public virtual ISet<AreaComAttr> AttributeEntries { get; private set; }
+            var list = new string?[] {
-
+                WineCult.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
-        [NotMapped]
+            }.ToList();
-        public IEnumerable<WineAttr> Attributes => AttributeEntries.Select(e => e.WineAttr);
+            return Utils.GetSearchScore(list, keywords);
+        }
     }
 }

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,57 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
+
+namespace Elwig.Models {
+    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
+    public class AreaComType {
+        [Column("vtrgid")]
+        public string VtrgId { get; set; }
+
+        [Column("sortid")]
+        public string SortId { get; set; }
+
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [Column("disc")]
+        public string? Discriminator { get; set; }
+
+        [Column("min_kg_per_ha")]
+        public int? MinKgPerHa { get; set; }
+
+        [Column("penalty_per_kg")]
+        public long? PenaltyPerKgValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerKg {
+            get => PenaltyPerKgValue != null ? Utils.DecFromDb(PenaltyPerKgValue.Value, 4) : null;
+            set => PenaltyPerKgValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
+
+        [Column("penalty_amount")]
+        public long? PenaltyAmoutValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyAmount {
+            get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
+            set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
+
+        [Column("penalty_none")]
+        public long? PenaltyNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyNone {
+            get => PenaltyNoneValue != null ? Utils.DecFromDb(PenaltyNoneValue.Value, 4) : null;
+            set => PenaltyNoneValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
+
+        [ForeignKey("SortId")]
+        public virtual WineVar WineVar { get; private set; }
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? WineAttr { get; private set; }
+
+        [NotMapped]
+        public string DisplayName => WineVar.Name + (WineAttr != null ? $" {WineAttr.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/Branch.cs

@@ -1,9 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("branch"), PrimaryKey("ZwstId")]
+    [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]
         public string ZwstId { get; set; }
@@ -11,6 +12,30 @@ namespace Elwig.Models {
         [Column("name")]
         public string Name { get; set; }
 
+        [Column("country")]
+        public int? CountryNum { get; set; }
+
+        [Column("postal_dest")]
+        public string? PostalDestId { get; set; }
+
+        [Column("address")]
+        public string? Address { get; set; }
+
+        [ForeignKey("CountryNum")]
+        public virtual Country? Country { get; private set; }
+
+        [ForeignKey("CountryNum, PostalDestId")]
+        public virtual PostalDest? PostalDest { get; private set; }
+
+        [Column("phone_nr")]
+        public string? PhoneNr { get; set; }
+
+        [Column("fax_nr")]
+        public string? FaxNr { get; set; }
+
+        [Column("mobile_nr")]
+        public string? MobileNr { get; set; }
+
         [InverseProperty("Branch")]
         public virtual ISet<Member> Members { get; private set; }
     }

Elwig/Models/Country.cs

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

Elwig/Models/Credit.cs

@@ -0,0 +1,105 @@
+using Elwig.Helpers;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
+
+namespace Elwig.Models {
+    [Table("credit"), PrimaryKey("Year", "TgNr"), Index("Year", "AvNr", "MgNr", IsUnique = true)]
+    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

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]
@@ -19,12 +20,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 +29,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 +63,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,13 +78,16 @@ namespace Elwig.Models {
 
         public string SortIdString => string.Join(", ", SortIds);
 
+        public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
+
+        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:ss"),
+                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

@@ -25,20 +25,21 @@ namespace Elwig.Models {
         [ForeignKey("SortId")]
         public virtual WineVar Variant { get; private set; }
 
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
         [Column("weight")]
         public int Weight { get; set; }
 
         [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")]
@@ -80,6 +81,9 @@ namespace Elwig.Models {
         [Column("lesewagen")]
         public bool? IsLesewagen { get; set; }
 
+        [Column("gebunden")]
+        public bool? IsGebunden { get; set; }
+
         [Column("temperature")]
         public double? Temperature { get; set; }
 
@@ -92,19 +96,25 @@ namespace Elwig.Models {
         [Column("weighing_id")]
         public string? WeighingId { get; set; }
 
+        [Column("weighing_reason")]
+        public string? WeighingReason { get; set; }
+
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartAttr> PartAttributes { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
-
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
         [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}" : "");
+
+        [InverseProperty("Part")]
+        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
     }
 }

Elwig/Models/DeliveryPartBucket.cs

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

Elwig/Models/Member.cs

@@ -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; }
@@ -104,12 +104,18 @@ namespace Elwig.Models {
         [Column("buchführend")]
         public bool IsBuchführend { get; set; }
 
+        [Column("organic")]
+        public bool IsOrganic { get; set; }
+
         [Column("funktionär")]
         public bool IsFunktionär { get; set; }
 
         [Column("active")]
         public bool IsActive { get; set; }
 
+        [Column("deceased")]
+        public bool IsDeceased { get; set; }
+
         [Column("iban")]
         public string? Iban { get; set; }
 
@@ -125,9 +131,6 @@ namespace Elwig.Models {
         [Column("address")]
         public string Address { get; set; }
 
-        [Column("email")]
-        public string? Email { get; set; }
-
         [Column("default_kgnr")]
         public int? DefaultKgNr { get; set; }
 
@@ -171,6 +174,9 @@ namespace Elwig.Models {
         [InverseProperty("Member")]
         public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; }
 
+        [InverseProperty("member")]
+        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; }
+
         public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
 
         public int SearchScore(IEnumerable<string> keywords) {

Elwig/Models/MemberEmailAddr.cs

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

Elwig/Models/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,49 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+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("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;
+        }
+
+        [ForeignKey("Year, AvNr")]
+        public virtual PaymentVar Variant { get; private set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart DeliveryPart { get; private set; }
+    }
+}

Elwig/Models/PaymentDeliveryPartBucket.cs

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

Elwig/Models/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,58 @@
+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("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

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

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

Elwig/Models/WineCult.cs

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

Elwig/Models/WineOrigin.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]
@@ -40,5 +41,7 @@ namespace Elwig.Models {
         public override string ToString() {
             return Name;
         }
+
+        public string OriginString => (Parent != null ? $"{Parent.OriginString} / " : "") + Name;
     }
 }

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

@@ -1,3 +1,4 @@
+using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Models;
 using System;
@@ -16,22 +17,23 @@ namespace Elwig.Windows {
         protected Control[] ExemptInputs { private get; set; }
         protected Control[] RequiredInputs { private get; set; }
 
-        private bool _IsEditing;
+        private bool _isEditing;
-        private bool _IsCreating;
+        private bool _isCreating;
         protected bool IsEditing {
-            get { return _IsEditing; }
+            get { return _isEditing; }
             set {
-                _IsEditing = value;
+                _isEditing = value;
-                LockContext = IsEditing;
+                LockContext = IsEditing || IsCreating;
             }
         }
         protected bool IsCreating {
-            get { return _IsCreating; }
+            get { return _isCreating; }
             set {
-                _IsCreating = value;
+                _isCreating = value;
-                LockContext = IsEditing;
+                LockContext = IsEditing || IsCreating;
             }
         }
+        protected bool DoShowWarningWindows = true;
         protected bool IsClosing { get; private set; }
 
         private TextBox[] TextBoxInputs;
@@ -43,6 +45,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,28 +61,38 @@ namespace Elwig.Windows {
             RadioButtonInputs = Array.Empty<RadioButton>();
             Valid = new();
             OriginalValues = new();
+            DefaultValues = new();
             Closing += OnClosing;
+            Loaded -= base.OnLoaded;
             Loaded += OnLoaded;
+            Loaded += base.OnLoaded;
         }
 
-        private void OnLoaded(object sender, RoutedEventArgs evt) {
+        private new void OnLoaded(object sender, RoutedEventArgs evt) {
-            TextBoxInputs = Utils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
+            TextBoxInputs = ControlUtils.FindAllChildren<TextBox>(this, ExemptInputs).ToArray();
-            ComboBoxInputs = Utils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
+            ComboBoxInputs = ControlUtils.FindAllChildren<ComboBox>(this, ExemptInputs).ToArray();
-            CheckBoxInputs = Utils.FindAllChildren<CheckBox>(this, ExemptInputs).ToArray();
+            CheckBoxInputs = ControlUtils.FindAllChildren<CheckBox>(this, ExemptInputs).ToArray();
-            CheckComboBoxInputs = Utils.FindAllChildren<CheckComboBox>(this, ExemptInputs).ToArray();
+            CheckComboBoxInputs = ControlUtils.FindAllChildren<CheckComboBox>(this, ExemptInputs).ToArray();
-            RadioButtonInputs = Utils.FindAllChildren<RadioButton>(this, ExemptInputs).ToArray();
+            RadioButtonInputs = ControlUtils.FindAllChildren<RadioButton>(this, ExemptInputs).ToArray();
-            PlzInputs = TextBoxInputs.Where(tb => "PLZ".Equals(tb.Tag)).ToArray();
+            PlzInputs = ControlUtils.FindAllChildren<TextBox>(this).Where(tb => "PLZ".Equals(tb.Tag)).ToArray();
-            PlzOrtInputs = PlzInputs.Select(tb => Utils.FindNextSibling<ComboBox>(tb) ?? throw new MissingMemberException()).ToArray();
+            PlzOrtInputs = PlzInputs.Select(tb => ControlUtils.FindNextSibling<ComboBox>(tb) ?? throw new MissingMemberException()).ToArray();
             foreach (var tb in TextBoxInputs)
                 Valid[tb] = true;
             foreach (var cb in ComboBoxInputs)
                 cb.SelectionChanged += ComboBox_SelectionChanged;
             foreach (var cb in CheckComboBoxInputs)
                 cb.ItemSelectionChanged += ComboBox_SelectionChanged;
-            ValidateRequiredInputs();
         }
 
         private void OnClosing(object? sender, CancelEventArgs evt) {
+            if ((IsCreating || IsEditing) && HasChanged) {
+                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schließen bestätigen",
+                    MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                if (r != MessageBoxResult.Yes) {
+                    evt.Cancel = true;
+                    return;
+                }
+            }
             IsClosing = true;
         }
 
@@ -89,12 +102,13 @@ namespace Elwig.Windows {
 
         abstract protected void UpdateButtons();
 
-        protected override async Task RenewContext() {
+        protected override async Task OnRenewContext() {
             for (int i = 0; i < PlzInputs.Length; i++)
                 UpdatePlz(PlzInputs[i], PlzOrtInputs[i]);
         }
 
         protected void ValidateInput(Control input, bool valid) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             Valid[input] = valid;
         }
 
@@ -102,29 +116,51 @@ 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)
-                Utils.ClearInputState(tb);
+                ControlUtils.ClearInputState(tb);
             foreach (var cb in ComboBoxInputs)
-                Utils.ClearInputState(cb);
+                ControlUtils.ClearInputState(cb);
-            // TODO ComboCheckBox
+            foreach (var ccb in CheckComboBoxInputs)
+                ControlUtils.ClearInputState(ccb);
             foreach (var cb in CheckBoxInputs)
-                Utils.ClearInputState(cb);
+                ControlUtils.ClearInputState(cb);
             foreach (var rb in RadioButtonInputs)
-                Utils.ClearInputState(rb);
+                ControlUtils.ClearInputState(rb);
         }
 
         protected void ValidateRequiredInputs() {
             foreach (var input in RequiredInputs) {
                 if (input is TextBox tb && tb.Text.Length == 0) {
-                    Utils.SetInputInvalid(input);
+                    ControlUtils.SetInputInvalid(input);
                     Valid[input] = false;
                 } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null) {
-                    Utils.SetInputInvalid(input);
+                    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 ValidateDefaultValues() {
+            foreach (var input in DefaultValues.Keys) {
+                if (InputIsNotDefault(input))
+                    ControlUtils.SetInputNotDefault(input);
+            }
+        }
+
         protected void LockInputs() {
             foreach (var tb in TextBoxInputs)
                 tb.IsReadOnly = true;
@@ -155,72 +191,149 @@ namespace Elwig.Windows {
             OriginalValues.Clear();
         }
 
+        protected void ClearDefaultValues() {
+            DefaultValues.Clear();
+        }
+
         protected void FillOriginalValues() {
             foreach (var tb in TextBoxInputs)
                 OriginalValues[tb] = tb.Text;
             foreach (var cb in ComboBoxInputs)
                 OriginalValues[cb] = cb.SelectedItem;
-            // TODO ComboCheckBox
+            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;
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
+            OriginalValues[input] = value is bool b ? b.ToString() : value;
+            if (InputHasChanged(input)) {
+                ControlUtils.SetInputChanged(input);
+            } else {
+                ControlUtils.ClearInputState(input);
+            }
+        }
+
+        protected void SetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
+            SetOriginalValue(input, ControlUtils.GetInputValue(input));
         }
 
         protected void UnsetOriginalValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             OriginalValues.Remove(input);
+            ControlUtils.ClearInputState(input);
         }
 
-        protected void ClearInputs() {
+        protected void SetDefaultValue(Control input, object? value) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
+            DefaultValues[input] = value is bool b ? b.ToString() : value;
+            if (!InputHasChanged(input)) {
+                if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
+                } else {
+                    ControlUtils.ClearInputState(input);
+                }
+            }
+        }
+
+        protected void SetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
+            SetDefaultValue(input, ControlUtils.GetInputValue(input));
+        }
+
+        protected void UnsetDefaultValue(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
+            DefaultValues.Remove(input);
+            if (!InputHasChanged(input)) {
+                ControlUtils.ClearInputState(input);
+            }
+        }
+
+        protected void ClearInputs(bool validate = true) {
             foreach (var tb in TextBoxInputs)
                 tb.Text = "";
             foreach (var cb in ComboBoxInputs)
                 cb.SelectedItem = null;
+            foreach (var ccb in CheckComboBoxInputs)
+                ccb.SelectedItems.Clear();
             foreach (var cb in CheckBoxInputs)
-                cb.IsChecked = false;
+                cb.IsChecked = cb.IsThreeState ? null : false;
             foreach (var rb in RadioButtonInputs)
-                rb.IsChecked = false;
+                rb.IsChecked = rb.IsThreeState ? null : false;
-            ValidateRequiredInputs();
+            if (validate) ValidateRequiredInputs();
         }
 
         protected bool IsValid => Valid.All(kv => kv.Value);
 
         protected bool GetInputValid(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             return Valid[input];
         }
 
         protected bool InputHasChanged(Control input) {
+            if (input is UnitTextBox utbx) input = utbx.TextBox;
             if (!OriginalValues.ContainsKey(input)) {
                 return false;
             } else if (input is TextBox tb) {
                 return OriginalValues[tb]?.ToString() != tb.Text;
             } else if (input is ComboBox sb) {
                 return OriginalValues[sb] != sb.SelectedItem;
+            } else if (input is CheckComboBox ccb) {
+                return !ccb.SelectedItems.Cast<object>().ToArray().SequenceEqual(((object[]?)OriginalValues[ccb]) ?? Array.Empty<object>());
             } else if (input is CheckBox cb) {
-                return (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 (input is UnitTextBox utbx) input = utbx.TextBox;
+            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) ||
-            CheckBoxInputs.Any(InputHasChanged) ||
+                ComboBoxInputs.Any(InputHasChanged) ||
-            RadioButtonInputs.Any(InputHasChanged);
+                CheckComboBoxInputs.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);
+            var plzInputValid = Validator.CheckPlz(plzInput, RequiredInputs.Contains(plzInput), Context).IsValid;
             var item = ortInput.SelectedItem;
             var list = plzInputValid && plzInput.Text.Length == 4 ? Context.Postleitzahlen.Find(int.Parse(plzInput.Text))?.Orte.ToList() : null;
-            Utils.RenewItemsSource(ortInput, list, i => (i as AT_PlzDest)?.Id);
+            ControlUtils.RenewItemsSource(ortInput, list, i => (i as AT_PlzDest)?.Id);
             if (list != null && ortInput.SelectedItem == null && list.Count == 1)
                 ortInput.SelectedItem = list[0];
             UpdateComboBox(ortInput);
@@ -242,6 +355,10 @@ namespace Elwig.Windows {
             };
         }
 
+        protected bool InputTextChanged(TextBox input) {
+            return InputTextChanged(input, new ValidationResult(true, null));
+        }
+
         protected bool InputTextChanged(TextBox input, Func<TextBox, bool, ValidationResult> checker) {
             return InputTextChanged(input, (tb, required, ctx) => checker(tb, required));
         }
@@ -254,12 +371,14 @@ namespace Elwig.Windows {
             ValidateInput(input, res.IsValid);
             if (res.IsValid) {
                 if (InputHasChanged(input)) {
-                    Utils.SetInputChanged(input);
+                    ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
-                    Utils.ClearInputState(input);
+                    ControlUtils.ClearInputState(input);
                 }
             } else {
-                Utils.SetInputInvalid(input);
+                ControlUtils.SetInputInvalid(input);
             }
             UpdateButtons();
             return res.IsValid;
@@ -274,7 +393,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;
         }
@@ -282,11 +401,13 @@ namespace Elwig.Windows {
         protected void CheckBox_Changed(object sender, RoutedEventArgs evt) {
             var input = (CheckBox)sender;
             if (SenderIsRequired(input) && input.IsChecked != true) {
-                Utils.SetInputInvalid(input);
+                ControlUtils.SetInputInvalid(input);
             } else if (InputHasChanged(input)) {
-                Utils.SetInputChanged(input);
+                ControlUtils.SetInputChanged(input);
+            } else if (InputIsNotDefault(input)) {
+                ControlUtils.SetInputNotDefault(input);
             } else {
-                Utils.ClearInputState(input);
+                ControlUtils.ClearInputState(input);
             }
             UpdateButtons();
         }
@@ -294,26 +415,30 @@ namespace Elwig.Windows {
         protected void RadioButton_Changed(object sender, RoutedEventArgs evt) {
             var input = (RadioButton)sender;
             if (SenderIsRequired(input) && input.IsChecked != true) {
-                Utils.SetInputInvalid(input);
+                ControlUtils.SetInputInvalid(input);
             } else if (InputHasChanged(input)) {
-                Utils.SetInputChanged(input);
+                ControlUtils.SetInputChanged(input);
+            } else if (InputIsNotDefault(input)) {
+                ControlUtils.SetInputNotDefault(input);
             } else {
-                Utils.ClearInputState(input);
+                ControlUtils.ClearInputState(input);
             }
             UpdateButtons();
         }
 
-        protected void TextBox_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TextBox_TextChanged(object sender, RoutedEventArgs? evt) {
             var input = (TextBox)sender;
             if (SenderIsRequired(input) && input.Text.Length == 0) {
                 ValidateInput(input, false);
-                Utils.SetInputInvalid(input);
+                ControlUtils.SetInputInvalid(input);
             } else {
                 ValidateInput(input, true);
                 if (InputHasChanged(input)) {
-                    Utils.SetInputChanged(input);
+                    ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
-                    Utils.ClearInputState(input);
+                    ControlUtils.ClearInputState(input);
                 }
             }
             UpdateButtons();
@@ -329,13 +454,15 @@ namespace Elwig.Windows {
             if (valid) {
                 ValidateInput(input, true);
                 if (InputHasChanged(input)) {
-                    Utils.SetInputChanged(input);
+                    ControlUtils.SetInputChanged(input);
+                } else if (InputIsNotDefault(input)) {
+                    ControlUtils.SetInputNotDefault(input);
                 } else {
-                    Utils.ClearInputState(input);
+                    ControlUtils.ClearInputState(input);
                 }
             } else {
                 ValidateInput(input, false);
-                Utils.SetInputInvalid(input);
+                ControlUtils.SetInputInvalid(input);
             }
             UpdateButtons();
         }
@@ -344,11 +471,15 @@ namespace Elwig.Windows {
             UpdateComboBox((Control)sender);
         }
 
-        protected void IntegerInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IntegerInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckInteger);
         }
 
-        protected void PartialDateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DecimalInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal);
+        }
+
+        protected void PartialDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPartialDate);
         }
 
@@ -356,7 +487,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPartialDate);
         }
 
-        protected void DateInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckDate);
         }
 
@@ -364,27 +495,37 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckDate);
         }
 
-        protected void PlzInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void TimeInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void TimeInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckTime);
+        }
+
+        protected void PlzInput_TextChanged(object sender, TextChangedEventArgs evt) {
             var plz = (TextBox)sender;
             InputTextChanged(plz, Validator.CheckPlz);
-            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, TextChangedEventArgs 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);
         }
 
-        protected void PhoneNrInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void PhoneNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
@@ -392,7 +533,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckPhoneNumber);
         }
 
-        protected void IbanInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void IbanInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckIban);
         }
 
@@ -400,7 +541,7 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckIban);
         }
 
-        protected void BicInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void BicInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckBic);
         }
 
@@ -408,20 +549,28 @@ namespace Elwig.Windows {
             InputLostFocus((TextBox)sender, Validator.CheckBic);
         }
 
-        protected void UstIdInput_TextChanged(object sender, RoutedEventArgs evt) {
+        protected void UstIdNrInput_TextChanged(object sender, TextChangedEventArgs 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) {
+        protected void LfbisNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
             InputTextChanged((TextBox)sender, Validator.CheckLfbisNr);
         }
 
         protected void LfbisNrInput_LostFocus(object sender, RoutedEventArgs evt) {
             InputLostFocus((TextBox)sender, Validator.CheckLfbisNr);
         }
+
+        protected void UpperCaseInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckUpperCase);
+        }
+
+        protected void UpperCaseInput_LostFocus(object sender, RoutedEventArgs evt) {
+            InputLostFocus((TextBox)sender, Validator.CheckUpperCase);
+        }
     }
 }

Elwig/Windows/AreaComAdminWindow.xaml

@@ -4,9 +4,10 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
         mc:Ignorable="d"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindugen - Elwig" Height="480" Width="745"
+        Title="Flächenbindungen - Elwig" Height="500" Width="920" MinWidth="860"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -46,128 +47,168 @@
     </Window.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="110"/>
+            <RowDefinition Height="24"/>
-            <RowDefinition Height="175"/>
-            <RowDefinition Height="1*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="415"/>
+            <ColumnDefinition Width="2*" MinWidth="555"/>
-            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition Width="*" MinWidth="280"/>
         </Grid.ColumnDefinitions>
 
-        <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
+        <Grid Grid.Row="0" Grid.Column="0">
-            <MenuItem Header="Flächenbindugen"/>
+            <Grid.RowDefinitions>
-        </Menu>
+                <RowDefinition Height="37"/>
-
+                <RowDefinition Height="*"/>
-        <Grid Grid.RowSpan="3" Grid.Row="1" Grid.Column="0">
+                <RowDefinition Height="42"/>
+            </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
 
+            <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,7,145,0" IsReadOnly="False"
+                     TextChanged="SearchInput_TextChanged"/>
+            <CheckBox x:Name="ActiveAreaCommitmentInput" Content="Nur aktive anzeigen"
+                      Checked="ActiveAreaCommitmentInput_Changed" Unchecked="ActiveAreaCommitmentInput_Changed"
+                      HorizontalAlignment="Right" Margin="0,12,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+
             <DataGrid x:Name="AreaCommitmentList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
-                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False" SelectionChanged="AreaCommitmentList_SelectionChanged" Grid.Column="0" Grid.Row="1"
+                      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,0,5,0" FontSize="14" Grid.ColumnSpan="3" Background="#e2e2e2">
                 <DataGrid.Columns>
-                    <DataGridTextColumn Header="FbNr"               Binding="{Binding FbNr}"        Width="2*"/>
+                    <DataGridTextColumn Header="FbNr."              Binding="{Binding FbNr}"          Width="50"/>
-                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="5*"/>
+                    <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="150"/>
-                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"     Width="4*"/>
+                    <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="130"/>
-                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"       Width="4*"/>
+                    <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="120"/>
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="80">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Right"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte"              Binding="{Binding AreaComType.WineVar.SortId}" Width="70"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr.Name}" Width="120"/>
                 </DataGrid.Columns>
             </DataGrid>
 
             <Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <Button x:Name="EditAreaCommitmentButton" Content="Bearbeiten" Click="EditAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <Button x:Name="DeleteAreaCommitmentButton" Content="Löschen" Click="DeleteAreaCommitmentButton_Click" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
 
             <Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
             <Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
             <Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2"/>
+                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
         </Grid>
 
-        <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,5">
+        <GridSplitter Grid.Column="1" Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="60"/>
-                    <ColumnDefinition Width="70"/>
-                    <ColumnDefinition Width="50"/>
-                    <ColumnDefinition Width="100"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+        <Grid Grid.Column="2" Grid.Row="0">
-                <TextBox x:Name="FbNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+            <Grid.RowDefinitions>
-                         TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
 
-                <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
+            <GroupBox Header="Vertrag" Grid.Column="2" Grid.Row="0" Grid.RowSpan="1" Margin="5,5,5,5">
-                <TextBox x:Name="MgNrInput" Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-                <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
+                    <Label Content="FbNr.:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="FbNrInput" Margin="0,10,10,0" Grid.Column="1" TextAlignment="Right"
-                         TextChanged="IntegerInput_TextChanged"/>
+                             TextChanged="FbNrInput_TextChanged" LostFocus="FbNrInput_LostFocus"/>
 
-                <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
+                    <Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
-                <TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="MgNrInput" IsEnabled="False"
-                         TextChanged="IntegerInput_TextChanged"/>
+                             Margin="0,40,10,0" Grid.Column="1" TextAlignment="Right"/>
-            </Grid>
-        </GroupBox>
 
-        <GroupBox Header="Lage" Grid.Column="2" Grid.Row="2" Grid.RowSpan="1" Margin="5,5,5,5">
+                    <Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
-            <Grid>
+                    <TextBox x:Name="YearFromInput" Margin="0,10,10,0" Grid.Column="3" TextAlignment="Right"
-                <Grid.ColumnDefinitions>
+                             TextChanged="IntegerInput_TextChanged"/>
-                    <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="Gemeinde:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
-                <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
+                    <TextBox x:Name="YearToInput" Margin="0,40,10,0" Grid.Column="3" TextAlignment="Right"
-                          Width="200" HorizontalAlignment="Left" SelectionChanged="KgInput_SelectionChanged"
+                             TextChanged="IntegerInput_TextChanged"/>
-                          Margin="0,10,10,0" Grid.Column="1"/>
 
-                <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <Label Content="Vertragsart:" Margin="10,70,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <ComboBox x:Name="RdInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                    <ComboBox x:Name="AreaComTypeInput" DisplayMemberPath="DisplayName" TextSearch.TextPath="DisplayName"
-                          Width="200" HorizontalAlignment="Left"
+                              HorizontalAlignment="Stretch" Margin="0,70,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-                          Margin="0,40,0,0" Grid.Column="1"/>
 
-                <Label Content="Parzelle:" Margin="10,70,0,0" Grid.Column="0"/>
+                    <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <TextBox x:Name="GstNrInput" Margin="0,70,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                    <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                         TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
+                              HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
 
-                <Label Content="Fläche (m²):" Margin="10,100,0,0" Grid.Column="0"/>
+                    <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
-                <TextBox x:Name="AreaInput" Margin="0,100,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
+                    <TextBox x:Name="CommentInput" TextChanged="TextBox_TextChanged"
-                         TextChanged="IntegerInput_TextChanged"/>
+                             HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
-            </Grid>
+                </Grid>
+            </GroupBox>
 
-        </GroupBox>
+            <GroupBox Header="Lage" Grid.Column="2" Grid.Row="1" Grid.RowSpan="1" Margin="5,5,5,10">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="80"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
 
-        <GroupBox Header="Eigenschaften" Grid.Column="2" Grid.Row="3" Grid.RowSpan="1" Margin="5,5,5,5">
+                    <Label Content="KG:" Margin="10,10,0,0" Grid.Column="0"/>
-            <Grid>
+                    <ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgNrTemplate}" TextSearch.TextPath="Name"
-                <Grid.ColumnDefinitions>
+                              HorizontalAlignment="Stretch" Margin="0,10,10,0" Grid.Column="1"
-                    <ColumnDefinition Width="80"/>
+                              SelectionChanged="KgInput_SelectionChanged"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
 
-                <Label Content="Sorte:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="WineVarietyInput" ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name"
+                    <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,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"/>
+                    <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
-                <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
+                    <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
-                          Width="200" HorizontalAlignment="Left" Margin="0,70,10,0" Grid.Column="1"/>
+                             TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
-            </Grid>
+
-        </GroupBox>
+                    <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
+                    <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" TextChanged="IntegerInput_TextChanged"
+                                      Grid.Column="1" Width="70" Margin="0,100,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                </Grid>
+            </GroupBox>
+        </Grid>
+
+        <StatusBar Grid.Row="5" Grid.ColumnSpan="3" BorderThickness="0,1,0,0" BorderBrush="Gray">
+            <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="160"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                    </Grid>
+                </ItemsPanelTemplate>
+            </StatusBar.ItemsPanel>
+            <StatusBarItem>
+                <TextBlock Name="StatusAreaCommitments" Text="Flächenbindungen: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock Name="StatusArea" Text="Fläche: -"/>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock Name="StatusContracts" Text="Vertragsarten: -"/>
+            </StatusBarItem>
+        </StatusBar>
     </Grid>
 </local:AdministrationWindow>