Bump version to 0.8.1

https://stackoverflow.com/questions/15666824/entity-framework-and-calling-context-dispose

https://blog.jongallant.com/2012/10/do-i-have-to-call-dispose-on-dbcontext/

.gitea/workflows/test.yaml

@@ -25,5 +25,5 @@ jobs:
       - name: Run Tests
         shell: powershell
         run: |
-          $env:PATH += ";$(pwd)\Installer\Files"
+          $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH
           $(& dotnet test Tests; $a=$lastexitcode) | findstr x*; exit $a

Elwig/App.xaml

@@ -1,13 +1,12 @@
-<Application x:Class="Elwig.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Elwig"
-             xmlns:ctrl="clr-namespace:Elwig.Controls"
-             StartupUri="Windows\MainWindow.xaml"
-             xmlns:ui="http://schemas.modernwpf.com/2019">
+<Application
+        x:Class="Elwig.App"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        Exit="Application_Exit">
     <Application.Resources>
         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
-        <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>
+        <ctrl:WidthToMarginConverter x:Key="WidthToMarginConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
@@ -29,25 +28,17 @@
             </StackPanel>
         </DataTemplate>
 
-        <ControlTemplate x:Key="WineVarietyTemplateSimple">
+        <DataTemplate x:Key="WineVarietyTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
-        <ControlTemplate x:Key="WineVarietyTemplateExtended">
+        </DataTemplate>
+        <DataTemplate x:Key="WineVarietyTemplateExpanded">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding Name}"/>
                 <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
             </StackPanel>
-        </ControlTemplate>
-        <DataTemplate x:Key="WineVarietyTemplate">
-            <Control x:Name="Control" Focusable="False" Template="{StaticResource WineVarietyTemplateExtended}"/>
-            <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
-                    <Setter TargetName="Control" Property="Template" Value="{StaticResource WineVarietyTemplateSimple}"/>
-                </DataTrigger>
-            </DataTemplate.Triggers>
         </DataTemplate>
 
         <DataTemplate x:Key="ModifierTemplate">
@@ -63,25 +54,17 @@
             </StackPanel>
         </DataTemplate>
 
-        <ControlTemplate x:Key="WineQualityLevelTemplateSimple">
+        <DataTemplate x:Key="WineQualityLevelTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
-        <ControlTemplate x:Key="WineQualityLevelTemplateExtended">
+        </DataTemplate>
+        <DataTemplate x:Key="WineQualityLevelTemplateExpanded">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding IsPredicate, Converter={StaticResource BoolToStarConverter}}" MinWidth="6"/>
                 <TextBlock Text="{Binding Name}" MinWidth="100" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding MinKmwStr}"/>
             </StackPanel>
-        </ControlTemplate>
-        <DataTemplate x:Key="WineQualityLevelTemplate">
-            <Control x:Name="Control" Focusable="False" Template="{StaticResource WineQualityLevelTemplateExtended}"/>
-            <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
-                    <Setter TargetName="Control" Property="Template" Value="{StaticResource WineQualityLevelTemplateSimple}"/>
-                </DataTrigger>
-            </DataTemplate.Triggers>
         </DataTemplate>
 
         <DataTemplate x:Key="WineOriginTemplate">
@@ -90,24 +73,16 @@
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
         </DataTemplate>
-        <ControlTemplate x:Key="WineOriginTemplateSimple">
+        <DataTemplate x:Key="WineOriginTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
-        <ControlTemplate x:Key="WineOriginTemplateExtended">
+        </DataTemplate>
+        <DataTemplate x:Key="WineOriginTemplateExpanded">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
-        <DataTemplate x:Key="WineOriginComboTemplate">
-            <Control x:Name="Control" Focusable="False" Template="{StaticResource WineOriginTemplateExtended}"/>
-            <DataTemplate.Triggers>
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
-                    <Setter TargetName="Control" Property="Template" Value="{StaticResource WineOriginTemplateSimple}"/>
-                </DataTrigger>
-            </DataTemplate.Triggers>
         </DataTemplate>
 
         <DataTemplate x:Key="GemTemplate">

Elwig/App.xaml.cs

@@ -2,7 +2,6 @@ using System;
 using System.Data;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.IO;
 using Elwig.Helpers;
 using Elwig.Helpers.Weighing;
@@ -18,12 +17,16 @@ using Elwig.Dialogs;
 using System.Threading.Tasks;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
+using System.Text;
 
 namespace Elwig {
     public partial class App : Application {
 
         protected static App CurrentApp;
         public static int NumWindows => CurrentApp.Windows.Count;
+        public static bool ForceShutdown { get; private set; } = false;
+
+        private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
@@ -53,19 +56,34 @@ namespace Elwig {
         public static string? BranchFaxNr { get; private set; }
         public static string? BranchMobileNr { get; private set; }
         public static IList<IScale> Scales { get; private set; }
+        public static IList<ICommandScale> CommandScales => Scales.Where(s => s is ICommandScale).Cast<ICommandScale>().ToList();
+        public static IList<IEventScale> EventScales => Scales.Where(s => s is IEventScale).Cast<IEventScale>().ToList();
         public static ClientParameters Client { get; set; }
 
-        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
+        private DateTime LastChanged;
+        private static DateTime CurrentLastWrite => File.GetLastWriteTime(Config.DatabaseFile);
+        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(2) };
 
         public App() : base() {
-            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
-            Scales = Array.Empty<IScale>();
+            Scales = [];
             CurrentApp = this;
             OverrideCulture();
+
+            ContextTimer.Tick += (object? sender, EventArgs evt) => {
+                if (CurrentLastWrite > LastChanged) {
+                    LastChanged = CurrentLastWrite;
+                    OnContextChanged();
+                }
+            };
+        }
+
+        private static void OnContextChanged() {
+            MainDispatcher.BeginInvoke(async () => await HintContextChange());
         }
 
         private static void OverrideCulture() {
@@ -86,17 +104,23 @@ namespace Elwig {
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0";
 
             try {
                 await AppDbUpdater.CheckDb();
             } catch (Exception e) {
+                if (Config.UpdateUrl != null && Utils.HasInternetConnectivity()) {
+                    await CheckForUpdates();
+                }
                 MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
                 return;
             }
 
-            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
+            LastChanged = CurrentLastWrite;
+            ContextTimer.Start();
+
+            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
                 branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
                 try {
@@ -109,29 +133,33 @@ namespace Elwig {
                 BranchNum = branches.Count;
             }
 
-            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
-            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("Temp File Cleanup", () => {
+                Utils.CleanupTempFiles();
+                return Task.CompletedTask;
+            });
+
+            Utils.RunBackground("HTML Initialization", () => Html.Init());
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init());
             Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 
+            if (Config.UpdateAuto && Config.UpdateUrl != null) {
+                if (Utils.HasInternetConnectivity()) {
+                    Utils.RunBackground("Auto Updater", async () => {
+                        await Task.Delay(500);
+                        await CheckForUpdates();
+                    });
+                }
+                _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
+                _autoUpdateTimer.Start();
+            }
+
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
-                var id = s[0];
                 try {
-                    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.Add(new SystecScale(id, model, cnx, empty, filling, limit, log));
-                    } else {
-                        throw new ArgumentException($"Invalid scale type: \"{type}\"");
-                    }
+                    list.Add(Scale.FromConfig(s));
                 } 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);
+                    list.Add(new InvalidScale(s.Id));
+                    MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             Scales = list;
@@ -151,6 +179,13 @@ namespace Elwig {
             }
 
             base.OnStartup(evt);
+
+            var window = new MainWindow();
+            window.Show();
+        }
+
+        private async void Application_Exit(object sender, ExitEventArgs evt) {
+            await Pdf.Cleanup();
         }
 
         public static void SetBranch(Branch b) {
@@ -168,28 +203,40 @@ namespace Elwig {
             BranchMobileNr = entry.Item8;
         }
 
-        private void PrintingReadyChanged() {
-            Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
-        }
-
-        protected void OnPrintingReadyChanged(EventArgs evt) {
-            foreach (Window w in Windows) {
-                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;
-                }
-            }
-        }
-
         public static async Task HintContextChange() {
+            CurrentApp.LastChanged = CurrentLastWrite;
             foreach (Window w in CurrentApp.Windows) {
                 if (w is not ContextWindow c) continue;
                 await c.HintContextChange();
             }
         }
 
+        private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is UpdateDialog) return;
+            }
+            if (Utils.HasInternetConnectivity()) {
+                Utils.RunBackground("Auto Updater", async () => await CheckForUpdates());
+            }
+        }
+
+        public static async Task CheckForUpdates(bool showSuccess = false) {
+            if (Config.UpdateUrl == null) return;
+            var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
+            if (latest != null && new Version(latest.Value.Version) > new Version(Version)) {
+                await MainDispatcher.BeginInvoke(() => {
+                    var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size);
+                    if (d.ShowDialog() == true) {
+                        ForceShutdown = true;
+                        Current.Shutdown();
+                    }
+                });
+            } else if (showSuccess) {
+                MessageBox.Show("Elwig ist auf dem aktuellsten Stand!", "Nach Updates suchen",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
         private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
             foreach (Window w in CurrentApp.Windows) {
                 if (w is T t && (selector == null || selector(t))) {
@@ -229,18 +276,10 @@ namespace Elwig {
         public static BaseDataWindow FocusBaseDataSeason(int year) {
             var w = FocusBaseData();
             w.Seasons.Focus();
-            ControlUtils.SelectListBoxItem(w.SeasonList, s => (s as Season)?.Year, year);
+            ControlUtils.SelectItemWithPk(w.SeasonList, year);
             return w;
         }
 
-        public static SeasonFinishWindow FocusSeasonFinish() {
-            return FocusWindow<SeasonFinishWindow>(() => new());
-        }
-
-        public static DeliveryConfirmationsWindow FocusDeliveryConfirmations(int year) {
-            return FocusWindow<DeliveryConfirmationsWindow>(() => new(year), w => w.Year == year);
-        }
-
         public static OriginHierarchyWindow FocusOriginHierarchy() {
             return FocusWindow<OriginHierarchyWindow>(() => new());
         }
@@ -251,12 +290,22 @@ namespace Elwig {
             return w;
         }
 
-        public static PaymentVariantsWindow FocusPaymentVariantsWindow(int year) {
+        public static PaymentVariantsWindow FocusPaymentVariants(int year) {
             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
         }
 
         public static ChartWindow FocusChartWindow(int year, int avnr) {
             return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
         }
+
+        public static MemberAdminWindow FocusMember(int mgnr) {
+            var w = FocusWindow<MemberAdminWindow>(() => new());
+            w.FocusMember(mgnr);
+            return w;
+        }
+
+        public static MailWindow FocusMailWindow(int? year = null) {
+            return FocusWindow<MailWindow>(() => new(year), w => year == null || w.Year == year);
+        }
     }
 }

Elwig/Controls/UnitTextBox.cs

@@ -0,0 +1,17 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Controls {
+    public class UnitTextBox : TextBox {
+
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register("Unit", typeof(string), typeof(UnitTextBox), new FrameworkPropertyMetadata(""));
+        public string Unit {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value);
+        }
+
+        static UnitTextBox() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(UnitTextBox), new FrameworkPropertyMetadata(typeof(UnitTextBox)));
+        }
+    }
+}

Elwig/Controls/UnitTextBox.xaml

@@ -1,11 +1,30 @@
-<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>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ctrl="clr-namespace:Elwig.Controls">
+    <Style TargetType="ctrl:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:UnitTextBox">
+                    <Border BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                            SnapsToDevicePixels="True">
+                        <Grid>
+                            <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Bottom">
+                                <ScrollViewer.Margin>
+                                    <Binding ElementName="UnitBlock" Path="ActualWidth">
+                                        <Binding.Converter>
+                                            <ctrl:WidthToMarginConverter/>
+                                        </Binding.Converter>
+                                    </Binding>
+                                </ScrollViewer.Margin>
+                            </ScrollViewer>
+                            <TextBlock x:Name="UnitBlock" Text="{Binding Path=Unit, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                                       FontSize="10" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="3"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextAlignment" Value="Right"/>
+    </Style>
+</ResourceDictionary>

Elwig/Controls/UnitTextBox.xaml.cs

@@ -1,37 +0,0 @@
-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/WidthToMarginConverter.cs

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

Elwig/Controls/WineOriginTemplateSelector.cs

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Elwig.Controls {
+    public class WineOriginTemplateSelector : DataTemplateSelector {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container) {
+            ContentPresenter presenter = (ContentPresenter)container;
+            if (presenter.TemplatedParent is ComboBox) {
+                return (DataTemplate)presenter.FindResource("WineOriginTemplateCollapsed");
+            } else {
+                return (DataTemplate)presenter.FindResource("WineOriginTemplateExpanded");
+            }
+        }
+    }
+}

Elwig/Controls/WineQualityLevelTemplateSelector.cs

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Elwig.Controls {
+    public class WineQualityLevelTemplateSelector : DataTemplateSelector {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container) {
+            ContentPresenter presenter = (ContentPresenter)container;
+            if (presenter.TemplatedParent is ComboBox) {
+                return (DataTemplate)presenter.FindResource("WineQualityLevelTemplateCollapsed");
+            } else {
+                return (DataTemplate)presenter.FindResource("WineQualityLevelTemplateExpanded");
+            }
+        }
+    }
+}

Elwig/Controls/WineVarietyTemplateSelector.cs

@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Elwig.Controls {
+    public class WineVarietyTemplateSelector : DataTemplateSelector {
+        public override DataTemplate SelectTemplate(object item, DependencyObject container) {
+            ContentPresenter presenter = (ContentPresenter)container;
+            if (presenter.TemplatedParent is ComboBox) {
+                return (DataTemplate)presenter.FindResource("WineVarietyTemplateCollapsed");
+            } else {
+                return (DataTemplate)presenter.FindResource("WineVarietyTemplateExpanded");
+            }
+        }
+    }
+}

Elwig/Dialogs/UpdateDialog.xaml

@@ -0,0 +1,33 @@
+<Window x:Class="Elwig.Dialogs.UpdateDialog"
+        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"
+        mc:Ignorable="d"
+        ResizeMode="NoResize"
+        ShowInTaskbar="False"
+        Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        Title="Neues Update verfügbar - Elwig" Height="180" Width="400">
+    <Grid>
+        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,30"
+                   HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center">
+            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!<LineBreak/>
+            Soll das Update heruntergeladen und<LineBreak/>
+            installiert werden? (ca. <Run x:Name="SizeText">100</Run> MB)<LineBreak/>
+            <Run FontWeight="Bold">Achtung</Run>: Elwig wird dabei geschlossen!
+        </TextBlock>
+
+        <ProgressBar x:Name="ProgressBar" Margin="0,0,0,27" Visibility="Hidden"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"
+                     Height="27" Width="300" SnapsToDevicePixels="True"/>
+
+        <Button x:Name="InstallButton" Content="Installieren" Margin="10,10,115,10"
+                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                Width="100" Height="27"
+                Click="InstallButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True" IsDefault="True"
+                FontSize="14" HorizontalAlignment="Right" VerticalAlignment="Bottom"
+                Width="100" Height="27"/>
+    </Grid>
+</Window>

Elwig/Dialogs/UpdateDialog.xaml.cs

@@ -0,0 +1,47 @@
+using Elwig.Helpers;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elwig.Dialogs {
+    public partial class UpdateDialog : Window {
+
+        public string Version { get; private set; }
+        public string Url { get; private set; }
+
+        public UpdateDialog(string version, string url, long size) {
+            Version = version;
+            Url = url;
+            InitializeComponent();
+            VersionText.Text = version;
+            SizeText.Text = $"{size / 1024 / 1024}";
+        }
+
+        private async void InstallButton_Click(object sender, RoutedEventArgs evt) {
+            Description.Visibility = Visibility.Hidden;
+            ProgressBar.Visibility = Visibility.Visible;
+            InstallButton.IsEnabled = false;
+            await Install();
+            DialogResult = true;
+            Close();
+        }
+
+        public async Task Install() {
+            var fileName = Path.Combine(App.TempPath, $"Elwig-{Version}.exe");
+            {
+                using var stream = new FileStream(fileName, FileMode.Create);
+                using var client = new HttpClient() {
+                    Timeout = TimeSpan.FromSeconds(5),
+                };
+                await client.DownloadAsync(Url, stream, new Progress<double>(p => {
+                    ProgressBar.Value = p * 100.0;
+                }));
+            }
+
+            Process.Start(fileName);
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cs

@@ -1,4 +1,5 @@
 using Elwig.Helpers;
+using Elwig.Models;
 using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Globalization;
@@ -7,13 +8,12 @@ using System.Linq;
 namespace Elwig.Documents {
     public abstract class BusinessDocument : Document {
 
-        public bool ShowDateAndLocation = false;
-
         public Member Member;
+        public string? Location;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
+        public bool ShowDateAndLocation = false;
         public string Aside;
-        public string? Location;
 
         public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
             Member = m;
@@ -40,19 +40,19 @@ namespace Elwig.Documents {
             return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n";
         }
 
-        public static string PrintSortenaufteilung(Dictionary<string, MemberBucket> buckets) {
-            List<string> attributes = ["_", ""];
-            List<string> names = ["kein Qual.Wein", "ohne Attribut"];
-            List<(string, string)> bucketAttrs = [
-                .. buckets
-                .Where(b => b.Key.Length > 2 && b.Key[2] != '_' && b.Value.DeliveryStrict > 0)
-                .Select(b => (b.Key[2..], b.Value.Name.Split("(")[1][..^1]))
+        public static string PrintSortenaufteilung(List<MemberStat> stats) {
+            List<string> discrs = [""];
+            List<string> names = ["ohne Attr./Bewirt."];
+            List<string> bucketAttrs = [
+                .. stats
+                .Select(s => s.Discr)
                 .Distinct()
-                .OrderBy(v => v.Item1)
+                .Where(s => s.Length > 0)
+                .Order()
             ];
-            names.AddRange(bucketAttrs.Select(b => b.Item2));
+            names.AddRange(bucketAttrs);
             names.Add("Gesamt");
-            attributes.AddRange(bucketAttrs.Select(b => b.Item1));
+            discrs.AddRange(bucketAttrs);
 
             List<double> cols = [40];
             cols.AddRange(names.Select(_ => 125.0 / names.Count));
@@ -62,19 +62,18 @@ namespace Elwig.Documents {
                 string.Join("", names.Select(c => $"<th>{c}</th>")) +
                 "</tr></thead>";
 
-            tbl += string.Join("\n", buckets
-                .GroupBy(b => (b.Key[..2], b.Value.Name.Split("(")[0].Trim()))
-                .Where(g => g.Sum(a => a.Value.DeliveryStrict) > 0)
-                .OrderBy(g => g.Key.Item1)
+            tbl += string.Join("\n", stats
+                .GroupBy(b => b.Variety)
+                .OrderBy(b => b.Key)
                 .Select(g => {
-                    var dict = g.ToDictionary(a => a.Key[2..], a => a.Value);
-                    var vals = attributes.Select(a => dict.TryGetValue(a, out MemberBucket value) ? value.DeliveryStrict : 0).ToList();
-                    return $"<tr><th>{g.Key.Item2}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
-                        $"<td class=\"number\">{dict.Values.Select(v => v.DeliveryStrict).Sum():N0}</td></tr>";
+                    var dict = g.ToDictionary(a => a.Discr, a => a.Weight);
+                    var vals = discrs.Select(a => dict.GetValueOrDefault(a, 0)).ToList();
+                    return $"<tr><th>{g.Key}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
+                        $"<td class=\"number\">{dict.Values.Sum():N0}</td></tr>";
                 })
             );
-            var totalDict = buckets.GroupBy(b => b.Key[2..]).ToDictionary(g => g.Key, g => g.Sum(a => a.Value.DeliveryStrict));
-            var totals = attributes.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
+            var totalDict = stats.GroupBy(s => s.Discr).ToDictionary(g => g.Key, g => g.Sum(a => a.Weight));
+            var totals = discrs.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
             tbl += "<tr class=\"sum bold\"><td></td>" + string.Join("", totals.Select(v => $"<td class=\"number\">{v:N0}</td>")) +
                 $"<td class=\"number\">{totalDict.Values.Sum():N0}</td></tr>";
 
@@ -158,7 +157,7 @@ namespace Elwig.Documents {
             tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow(
                     Member.BusinessShares * season.MinKgPerBusinessShare,
                     Member.BusinessShares * season.MaxKgPerBusinessShare,
-                    Member.Deliveries.Where(d => d.Year == season.Year).Sum(d => d.Weight),
+                    season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
                     isGa: true, showPayment: includePayment, showArea: !includeDelivery
                 )}</tr>";
             if (fbs.Any()) {

Elwig/Documents/BusinessDocument.css

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

Elwig/Documents/CreditNote.cshtml

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

Elwig/Documents/DeliveryConfirmation.cs

@@ -13,6 +13,7 @@ namespace Elwig.Documents {
         public DeliveryConfirmationDeliveryData Data;
         public string? Text = App.Client.TextDeliveryConfirmation;
         public Dictionary<string, MemberBucket> MemberBuckets;
+        public List<MemberStat> MemberStats;
 
         public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationDeliveryData data) :
             base($"{Name} {year}", m) {
@@ -23,6 +24,7 @@ namespace Elwig.Documents {
             DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
             Data = data;
             MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
+            MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -10,14 +10,15 @@
         <colgroup>
             <col style="width: 25mm;"/>
             <col style="width:  5mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 21mm;"/>
-            <col style="width: 19mm;"/>
+            <col style="width: 24mm;"/>
+            <col style="width: 16mm;"/>
+            <col style="width: 17mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
             <col style="width: 12mm;"/>
             <col style="width: 14mm;"/>
+            <col style="width:  3mm;"/>
             <col style="width: 14mm;"/>
         </colgroup>
         <thead>
@@ -25,11 +26,19 @@
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
                 <th rowspan="2" class="narrow">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;">Attr./Bewirt.</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 rowspan="3" style="padding: 0;">
+                    <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
+                        <text x="-40" y="5" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
+                              style="text-anchor: start; alignment-baseline: middle;">
+                            bto./nto.
+                        </text>
+                    </svg>
+                </th>
                 <th>Davon<br/>abzuwerten</th>
             </tr>
             <tr>
@@ -53,7 +62,7 @@
                             <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
-                            <td class="small">@p.Attribute</td>
+                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
                             <td class="small">@p.QualityLevel</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
@@ -72,8 +81,10 @@
                         }
                         @if (i == p.Buckets.Length - 1) {
                             <td class="number">@($"{p.Weight:N0}")</td>
+                            <td class="small">@(p.IsNetWeight ? "n" : "b")</td>
                         } else {
                             <td></td>
+                            <td></td>
                         }
                         @if (first) {
                             <td rowspan="@rows" class="number"></td>
@@ -87,10 +98,11 @@
                 <td colspan="8">Gesamt:</td>
                 <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
                 <td></td>
+                <td></td>
             </tr>
         </tbody>
     </table>
-    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberBuckets))
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
     <div style="margin-top: 2em;">
         @if (Model.Text != null) {

Elwig/Documents/DeliveryJournal.cs

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

Elwig/Documents/DeliveryJournal.cshtml

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

Elwig/Documents/DeliveryJournal.css

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

Elwig/Documents/DeliveryNote.cs

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

Elwig/Documents/DeliveryNote.cshtml

@@ -8,10 +8,10 @@
 <table class="delivery large">
     <colgroup>
         <col style="width: 10.00mm;"/>
-        <col style="width: 21.25mm;"/>
-        <col style="width: 21.25mm;"/>
-        <col style="width: 21.25mm;"/>
-        <col style="width: 21.25mm;"/>
+        <col style="width: 21.00mm;"/>
+        <col style="width: 25.00mm;"/>
+        <col style="width: 19.50mm;"/>
+        <col style="width: 19.50mm;"/>
         <col style="width: 30.00mm;"/>
         <col style="width: 12.50mm;"/>
         <col style="width: 12.50mm;"/>
@@ -43,6 +43,14 @@
                 <td class="center">@($"{part.Kmw:N1}")</td>
                 <td class="number">@($"{part.Weight:N0}")</td>
             </tr>
+            @if (part.Cultivation != null) {
+                <tr><td></td><td><i>Bewirtschaftung:</i></td><td colspan="4"><b>
+                    @part.Cultivation.Name
+                    @if(part.Cultivation.Description != null) {
+                        @("(")@part.Cultivation.Description@(")")
+                    }
+                    </b></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;
@@ -52,8 +60,8 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
-                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
+                @Raw(part.IsManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                (@(part.IsNetWeight ? "netto/gerebelt gewogen" : "brutto/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>

Elwig/Documents/Document.Page.css

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

Elwig/Documents/Document.Table.css

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

Elwig/Documents/Document.cs

@@ -5,18 +5,23 @@ using Elwig.Helpers;
 using System.Collections.Generic;
 using System.Linq;
 using Elwig.Helpers.Printing;
+using MimeKit;
 
 namespace Elwig.Documents {
     public abstract partial class Document : IDisposable {
 
         public static string Name => "Dokument";
 
-        private static readonly double GenerationProportion = 0.125;
+        protected static readonly double GenerationProportion = 0.125;
 
-        private TempFile? _pdfFile = null;
+        protected TempFile? _pdfFile = null;
+        protected string? _pdfPath;
+        protected string? PdfPath => _pdfPath ?? _pdfFile?.FilePath;
+        public int? TotalPages { get; private set; }
+        public int? Pages => TotalPages / (DoublePaged ? 2 : 1);
 
         public bool ShowFoldMarks = App.Config.Debug;
-        public bool DoubleSided = false;
+        public bool DoublePaged = false;
 
         public string DataPath;
         public int CurrentNextSeason;
@@ -59,6 +64,10 @@ namespace Elwig.Documents {
             return new MergedDocument(docs);
         }
 
+        public static Document FromPdf(string path) {
+            return new PdfDocument(path);
+        }
+
         private async Task<string> Render() {
             string name;
             if (this is BusinessLetter) {
@@ -75,6 +84,12 @@ namespace Elwig.Documents {
                 name = "DeliveryConfirmation";
             } else if (this is MemberDataSheet) {
                 name = "MemberDataSheet";
+            } else if (this is MemberList) {
+                name = "MemberList";
+            } else if (this is WineQualityStatistics) {
+                name = "WineQualityStatistics";
+            } else if (this is PaymentVariantSummary) {
+                name = "PaymentVariantSummary";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -86,21 +101,32 @@ namespace Elwig.Documents {
         }
 
         public async Task Generate(IProgress<double>? progress = null) {
+            if (_pdfFile != null)
+                return;
             progress?.Report(0.0);
-            if (this is MergedDocument m) {
+            if (this is PdfDocument) {
+                // nothing to do
+            } else if (this is MergedDocument m) {
                 var pdf = new TempFile("pdf");
                 var tmpHtmls = new List<TempFile>();
+                var tmpFiles = new List<string>();
                 var n = m.Documents.Count();
                 int i = 0;
                 foreach (var doc in m.Documents) {
+                    if (doc is PdfDocument) {
+                        tmpFiles.Add(doc.PdfPath!);
+                        continue;
+                    }
                     var tmpHtml = new TempFile("html");
                     await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
                     tmpHtmls.Add(tmpHtml);
+                    tmpFiles.Add((doc is Letterhead ? "#" : "") + tmpHtml.FileName);
                     i++;
                     progress?.Report(GenerationProportion * 100 * i / n);
                 }
                 progress?.Report(GenerationProportion * 100);
-                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(GenerationProportion * 100 + v * (1 - GenerationProportion))));
+                var pages = await Pdf.Convert(tmpFiles, pdf.FileName, DoublePaged, new Progress<double>(v => progress?.Report(GenerationProportion * 100 + v * (1 - GenerationProportion))));
+                TotalPages = pages.Pages;
                 foreach (var tmp in tmpHtmls) {
                     tmp.Dispose();
                 }
@@ -110,7 +136,8 @@ namespace Elwig.Documents {
                 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);
+                    var pages = await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, DoublePaged);
+                    TotalPages = pages.Pages;
                 }
                 _pdfFile = pdf;
             }
@@ -118,13 +145,13 @@ namespace Elwig.Documents {
         }
 
         public void SaveTo(string pdfPath) {
-            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(_pdfFile.FilePath, pdfPath);
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            File.Copy(PdfPath, pdfPath, true);
         }
 
         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);
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            await Pdf.Print(PdfPath, copies);
         }
 
         public void Show() {
@@ -132,10 +159,24 @@ namespace Elwig.Documents {
             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;
+        public MimePart AsEmailAttachment(string filename) {
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            return new("application", "pdf") {
+                Content = new MimeContent(File.OpenRead(PdfPath)),
+                ContentDisposition = new ContentDisposition(ContentDisposition.Attachment),
+                ContentTransferEncoding = ContentEncoding.Base64,
+                FileName = filename
+            };
+        }
+
+        private class MergedDocument(IEnumerable<Document> docs) : Document("Mehrere Dokumente") {
+            public IEnumerable<Document> Documents = docs;
+        }
+
+        private class PdfDocument : Document {
+            public PdfDocument(string pdfPath) :
+                base(Path.GetFileNameWithoutExtension(pdfPath)) {
+                _pdfPath = pdfPath;
             }
         }
     }

Elwig/Documents/Document.cshtml

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
-    @if (Model.DoubleSided) {
+    @if (Model.DoublePaged) {
         <style>
             @@page :left {
                 margin: 25mm 25mm 35mm 20mm;
@@ -38,7 +38,7 @@
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
-    @if (Model.DoubleSided) {
+    @if (Model.DoublePaged) {
         <div class="footer-wrapper left">
             <div class="pre-footer">
                 <span class="page"></span>

Elwig/Documents/Document.css

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

Elwig/Documents/MemberDataSheet.cs

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

Elwig/Documents/MemberDataSheet.cshtml

@@ -2,9 +2,7 @@
 @using Elwig.Helpers
 @inherits TemplatePage<Elwig.Documents.MemberDataSheet>
 @model Elwig.Documents.MemberDataSheet
-@{
-    Layout = "BusinessDocument";
-}
+@{ Layout = "BusinessDocument"; }
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\MemberDataSheet.css" />
 <main>
     <h1>@Model.Title</h1>
@@ -149,7 +147,7 @@
     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false))
 
     @{
-        var areaComs = Model.Member.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
+        var areaComs = Model.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
             AreaComType = group.Key,
             AreaComs = group.OrderBy(c => c.Kg.AtKg.Name),
             Size = group.Sum(c => c.Area)
@@ -158,6 +156,7 @@
     }
 
     @if (areaComs.Count != 0) {
+        <br class="area-commitements"/>
         <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2>
         <table class="area-commitements">
             <colgroup>
@@ -196,7 +195,7 @@
                             <td>@areaCom.Rd?.Name</td>
                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                             <td class="number">@($"{areaCom.Area:N0}")</td>
-                            <td class="center">@areaCom.WineCult.Name</td>
+                            <td class="center">@areaCom.WineCult?.Name</td>
                             <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;
@@ -204,7 +203,7 @@
                 }
                 <tr class="sum bold">
                     <td colspan="3">Gesamt:</td>
-                    <td class="number">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</td>
+                    <td class="number">@($"{Model.ActiveAreaCommitments.Sum(a => a.Area):N0}")</td>
                     <td colspan="2"></td>
                 </tr>
             </tbody>

Elwig/Documents/MemberDataSheet.css

@@ -22,3 +22,9 @@ table.area-commitements td.text {
 table.area-commitements tr.sum {
     font-size: 12pt;
 }
+
+@page :not(:first) {
+    br.area-commitements {
+        display: none;
+    }
+}

Elwig/Documents/MemberList.cs

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

Elwig/Documents/MemberList.cshtml

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

Elwig/Documents/MemberList.css

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

Elwig/Documents/PaymentVariantSummary.cs

@@ -0,0 +1,30 @@
+using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class PaymentVariantSummary : Document {
+
+        public new static string Name => "Auszahlungsvariante";
+
+        public PaymentVariantSummaryData Data;
+        public PaymentVar Variant;
+        public BillingData BillingData;
+        public string CurrencySymbol;
+        public int MemberNum;
+        public int DeliveryNum;
+        public int DeliveryPartNum;
+
+        public PaymentVariantSummary(PaymentVar v, PaymentVariantSummaryData data) :
+            base($"{Name} {v.Year} - {v.Name}") {
+            Variant = v;
+            BillingData = BillingData.FromJson(v.Data);
+            Data = data;
+            CurrencySymbol = v.Season.Currency.Symbol ?? v.Season.Currency.Code;
+            MemberNum = v.Credits.Count;
+            DeliveryNum = v.DeliveryPartPayments.DistinctBy(p => p.DeliveryPart.Delivery).Count();
+            DeliveryPartNum = v.DeliveryPartPayments.Count;
+        }
+    }
+}

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -0,0 +1,217 @@
+@using RazorLight
+@using Elwig.Helpers
+@inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
+@model Elwig.Documents.PaymentVariantSummary
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\PaymentVariantSummary.css" />
+<main>
+    <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
+    <h2>@Model.Variant.Name</h2>
+    <table class="payment-variant border">
+        <colgroup>
+            <col style="width: 20.0mm;"/>
+            <col style="width: 30.0mm;"/>
+            <col style="width:  4.5mm;"/>
+            <col style="width: 28.0mm;"/>
+            <col style="width: 47.5mm;"/>
+            <col style="width: 15.0mm;"/>
+            <col style="width: 20.0mm;"/>
+        </colgroup>
+        @{
+            //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
+            //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount);
+            var modifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
+            var sum1 = sum2 - modifiers;
+            var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var vat = Model.Variant.Credits.Sum(p => p.VatAmount);
+            var grossSum = Model.Variant.Credits.Sum(p => p.GrossAmount);
+            var totalMods = Model.Variant.Credits.Sum(p => p.Modifiers ?? 0m);
+            var considered = -Model.Variant.Credits.Sum(p => p.PrevModifiers ?? 0m);
+            var totalSum = Model.Variant.Credits.Sum(p => p.Amount);
+        }
+        <tbody>
+            <tr class="sectionheading">
+                <th colspan="4">Allgemein</th>
+                <th colspan="3" class="lborder">Berücksichtigt</th>
+            </tr>
+            <tr>
+                <th>Name:</th>
+                <td colspan="3">@Model.Variant.Name</td>
+                <th colspan="2" class="lborder">Zu-/Abschläge bei Lieferungen:</th>
+                <td class="center">@(Model.BillingData.ConsiderDelieryModifiers ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Beschr.:</th>
+                <td colspan="3">@Model.Variant.Comment</td>
+                <th colspan="2" class="lborder">Pönalen bei Unterlieferungen (FB):</th>
+                <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Datum:</th>
+                <td colspan="3">@($"{Model.Variant.Date:dd.MM.yyyy}")</td>
+                <th colspan="2" class="lborder">Strafen bei Unterlieferungen (GA):</th>
+                <td class="center">@(Model.BillingData.ConsiderTotalPenalty ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Überw.:</th>
+                <td colspan="3">@($"{Model.Variant.TransferDate:dd.MM.yyyy}")</td>
+                <th colspan="2" class="lborder">Automatische Nachzeichnung der GA:</th>
+                <td class="center">@(Model.BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein")</td>
+            </tr>
+            <tr class="sectionheading">
+                <th colspan="4">Beträge</th>
+                <th colspan="3" class="lborder">Statistik</th>
+            </tr>
+            <tr>
+                <th colspan="2">Zwischensumme:</th>
+                <td></td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum1:N2}")</td>
+                <th class="lborder">Lieferanten:</th>
+                <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td>
+            </tr>
+            <tr>
+                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <td class="number">@Utils.GetSign(modifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(modifiers):N2}")</td>
+                <th class="lborder">Lieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
+            </tr>
+            <tr>
+                <th colspan="2">Gesamtsumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td>
+                <th class="lborder">Teillieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
+            </tr>
+            <tr>
+                <th colspan="2">Bisher ausgezahlt:</th>
+                <td class="number">@Utils.GetSign(payed)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></td>
+            </tr>
+            <tr>
+                <th colspan="2">Nettosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
+                @{
+                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
+                    var minWei = weiRows.Min(r => r.Ungeb.Price);
+                    var maxWei = weiRows.Max(r => r.Ungeb.Price);
+                }
+                <th class="lborder tborder">Preis (abgewertet):</th>
+                <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
+            </tr>
+            <tr>
+                <th colspan="2">Mehrwertsteuer:</th>
+                <td class="number">@Utils.GetSign(vat)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
+                @{
+                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
+                    var minPrice = quwRows.Min(r => r.Ungeb.Price);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.Price);
+                }
+                <th class="lborder">Preis (ungeb., nicht abgew.):</th>
+                <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
+            </tr>
+            <tr>
+                <th colspan="2">Bruttosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                @{
+                    var gebRows = Model.Data.Rows
+                    .Where(r => r.Geb.Price != null && r.Ungeb.Price != null)
+                    .Select(r => r.Geb.Price - r.Ungeb.Price);
+                    var minGeb = gebRows.Min();
+                    var maxGeb = gebRows.Max();
+                }
+                <th class="lborder">Gebunden-Zuschlag:</th>
+                <td colspan="2" class="center">
+                    @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg")
+                </td>
+            </tr>
+            <tr>
+                <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th>
+                <td class="number">@Utils.GetSign(totalMods)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(totalMods):N2}")</td>
+                <th class="lborder tborder">Menge (ungebunden):</th>
+                <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight):N0}") kg</td>
+            </tr>
+            <tr>
+                <th colspan="2">Bereits berücksichtigte Abzüge:</th>
+                <td class="number">@Utils.GetSign(considered)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(considered):N2}")</td>
+                <th class="lborder">Menge (gebunden):</th>
+                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(r => r.Geb.Weight):N0}") kg</td>
+            </tr>
+            <tr>
+                <th colspan="2">Auszahlungsbetrag:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{totalSum:N2}")</td>
+                <th class="lborder">Gesamtmenge:</th>
+                <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight + r.Geb.Weight):N0}") kg</td>
+            </tr>
+        </tbody>
+    </table>
+    <table class="payment-variant-data">
+        <colgroup>
+            <col style="width: 30mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 25mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th>Gradation</th>
+                <th colspan="2">ungebunden</th>
+                <th colspan="2">gebunden</th>
+                <th>Gesamt</th>
+            </tr>
+            <tr>
+                <th>[@(true ? "°Oe" : "°KMW")]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[kg]</th>
+                <th>[@(Model.CurrencySymbol)/kg]</th>
+                <th>[@(Model.CurrencySymbol)]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string? lastHdr = null;
+            }
+            @foreach (var row in Model.Data.Rows) {
+                var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
+                if (lastHdr != hdr) {
+                    var rows = Model.Data.Rows
+                        .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation)
+                        .ToList();
+                    <tr class="subheading @(lastHdr != null ? "new" : "")">
+                        <th colspan="2">@hdr</th>
+                        <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
+                        <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
+                        <td></td>
+                        <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
+                    </tr>
+                }
+                <tr>
+                    <td>@(row.QualityLevel)</td>
+                    <td class="center">@($"{row.Oe:N0}")</td>
+                    <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.Ungeb.Price != null ? $"{row.Ungeb.Price:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.Geb.Price != null ? $"{row.Geb.Price:N4}" : "-")</td>
+                    <td class="number">@($"{row.Amount:N2}")</td>
+                </tr>
+                lastHdr = hdr;
+            }
+        </tbody>
+    </table>
+</main>

Elwig/Documents/PaymentVariantSummary.css

@@ -0,0 +1,21 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-top: 10mm;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}
+
+table.payment-variant {
+    margin-top: 10mm;
+}
+
+table.payment-variant-data {
+    break-before: page;
+}

Elwig/Documents/WineQualityStatistics.cs

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

Elwig/Documents/WineQualityStatistics.cshtml

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

Elwig/Documents/WineQualityStatistics.css

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

Elwig/Elwig.csproj

@@ -7,8 +7,10 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.6.5</Version>
+    <Version>0.8.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,16 +25,17 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.6.0" />
     <PackageReference Include="LinqKit" Version="1.2.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    <PackageReference Include="MailKit" Version="4.5.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.29" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
     <PackageReference Include="NJsonSchema" Version="11.0.0" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.19" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.31" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>

Elwig/Helpers/ActionCommand.cs

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

Elwig/Helpers/AppDbContext.cs

@@ -11,12 +11,14 @@ using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using Elwig.Models.Dtos;
 using System.Reflection;
+using System.Data;
 
 namespace Elwig.Helpers {
 
     public record struct AreaComBucket(int Area, int Obligation, int Right);
     public record struct UnderDelivery(int Weight, int Diff);
     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
+    public record struct MemberStat(string Variety, string Discr, int Weight);
 
     public class AppDbContext : DbContext {
 
@@ -44,6 +46,7 @@ namespace Elwig.Helpers {
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
+        public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
         public DbSet<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
@@ -53,6 +56,7 @@ namespace Elwig.Helpers {
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
+        public DbSet<PaymentDeliveryPart> PaymentDeliveryParts { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
@@ -60,6 +64,8 @@ namespace Elwig.Helpers {
         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
+        public DbSet<WeightBreakdownRow> WeightBreakDownRows { get; private set; }
+        public DbSet<PaymentVariantSummaryRow> PaymentVariantSummaryRows { get; private set; }
 
         private readonly StreamWriter? LogFile = null;
         public static DateTime LastWriteTime => File.GetLastWriteTime(App.Config.DatabaseFile);
@@ -122,6 +128,21 @@ namespace Elwig.Helpers {
             return await cmd.ExecuteScalarAsync();
         }
 
+        public static async Task<(string Table, long RowId, string Parent, long FkId)[]> ForeignKeyCheck(SqliteConnection cnx) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = "PRAGMA foreign_key_check";
+            using var reader = await cmd.ExecuteReaderAsync();
+            var list = new List<(string, long, string, long)>();
+            while (await reader.ReadAsync()) {
+                var table = reader.GetString(0);
+                var rowid = reader.GetInt64(1);
+                var parent = reader.GetString(2);
+                var fkid = reader.GetInt64(3);
+                list.Add((table, rowid, parent, fkid));
+            }
+            return [.. list];
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
             optionsBuilder.UseLazyLoadingProxies();
@@ -159,17 +180,21 @@ namespace Elwig.Helpers {
             return await WineAttributes.FindAsync(attrId) != null;
         }
 
+        public async Task<bool> CultIdExists(string cultId) {
+            return await WineCultivations.FindAsync(cultId) != null;
+        }
+
         public async Task<int> NextMgNr() {
-            int c = await Members.Select(m => m.MgNr).MinAsync();
+            int c = 0;
             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 1000) c = a; });
+                .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
         public async Task<int> NextFbNr() {
-            int c = await AreaCommitments.Select(ac => ac.FbNr).MinAsync();
+            int c = 0;
             (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 1000) c = a; });
+                .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
@@ -213,20 +238,21 @@ namespace Elwig.Helpers {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
                 .OrderBy(q => q.MinKmw)
-                .LastOrDefaultAsync();
+                .LastAsync();
         }
 
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
                 if (modifiers.Contains(m)) {
-                    DeliveryPartModifier dpm = mod ?? this.CreateProxy<DeliveryPartModifier>();
-                    dpm.Year = part.Year;
-                    dpm.DId = part.DId;
-                    dpm.DPNr = part.DPNr;
-                    dpm.ModId = m.ModId;
+                    var dpm = new DeliveryPartModifier {
+                        Year = part.Year,
+                        DId = part.DId,
+                        DPNr = part.DPNr,
+                        ModId = m.ModId,
+                    };
                     if (mod == null) {
-                        await AddAsync(dpm);
+                        Add(dpm);
                     } else {
                         Update(dpm);
                     }
@@ -384,5 +410,31 @@ namespace Elwig.Helpers {
             }
             return buckets;
         }
+
+        public static async Task<List<MemberStat>> GetMemberStats(int year, int mgnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var list = new List<MemberStat>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT v.name AS variety,
+                           COALESCE(a.name, '') || IIF(a.name IS NOT NULL AND c.name IS NOT NULL, ' / ', '') || COALESCE(c.name, '') AS disc,
+                           SUM(weight) AS weight
+                    FROM v_delivery d
+                        LEFT JOIN wine_variety v ON v.sortid = d.sortid
+                        LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                        LEFT JOIN wine_cultivation c ON c.cultid = d.cultid
+                    WHERE d.year = {year} AND d.mgnr = {mgnr}
+                    GROUP BY d.sortid, d.attrid, d.cultid
+                    ORDER BY variety, disc;
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2)));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            return list;
+        }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 16;
+        public static readonly int RequiredSchemaVersion = 19;
 
         private static int VersionOffset = 0;
 
@@ -73,16 +73,19 @@ namespace Elwig.Helpers {
 
             await AppDbContext.ExecuteBatch(cnx, """
                 PRAGMA locking_mode = EXCLUSIVE;
-                PRAGMA foreign_keys = OFF;
                 BEGIN EXCLUSIVE;
                 """);
             foreach (var script in toExecute) {
                 await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script);
             }
+            var violations = await AppDbContext.ForeignKeyCheck(cnx);
+            if (violations.Length > 0) {
+                throw new Exception($"Foreign key violations ({violations.Length}):\n" + string.Join("\n", violations
+                    .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}")));
+            }
+
             await AppDbContext.ExecuteBatch(cnx, $"""
-                PRAGMA foreign_key_check;
                 COMMIT;
-                PRAGMA foreign_keys = ON;
                 VACUUM;
                 PRAGMA schema_version = {toVersion * 100 + VersionOffset};
                 """);

Elwig/Helpers/Billing/Billing.cs

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

Elwig/Helpers/Billing/BillingData.cs

@@ -42,6 +42,15 @@ namespace Elwig.Helpers.Billing {
             set => SetConsider(value, "consider_auto_business_shares");
         }
 
+        public double NetWeightModifier {
+            get => GetWeightModifier("net_weight_modifier", "Rebelzuschlag");
+            set => SetWeightModifier(value, "net_weight_modifier", "Rebelzuschlag");
+        }
+        public double GrossWeightModifier {
+            get => GetWeightModifier("gross_weight_modifier");
+            set => SetWeightModifier(value, "gross_weight_modifier");
+        }
+
         private bool GetConsider(string name, string? wgMasterName = null) {
             return ((Mode == CalculationMode.Elwig) ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<bool>() ?? false;
         }
@@ -56,6 +65,23 @@ namespace Elwig.Helpers.Billing {
             }
         }
 
+        private double GetWeightModifier(string name, string? wgMasterName = null) {
+            var isElwig = (Mode == CalculationMode.Elwig);
+            var val = (isElwig ? Data[name] : Data[wgMasterName ?? ""])?.AsValue().GetValue<double>() ?? 0;
+            return isElwig ? val : val / 100.0;
+        }
+
+        private void SetWeightModifier(double value, string name, string? wgMasterName = null) {
+            var isElwig = (Mode == CalculationMode.Elwig);
+            if (Mode == CalculationMode.WgMaster && wgMasterName == null) {
+                return;
+            } else if (value != 0) {
+                Data[isElwig ? name : wgMasterName ?? ""] = isElwig ? value : value * 100.0;
+            } else {
+                Data.Remove(isElwig ? name : wgMasterName ?? "");
+            }
+        }
+
         public BillingData(JsonObject data) {
             Data = data;
             var mode = Data["mode"]?.GetValue<string>();
@@ -150,38 +176,33 @@ namespace Elwig.Helpers.Billing {
             return dict;
         }
 
-        protected static Dictionary<string, JsonValue> GetSelection(JsonNode value, IEnumerable<string> vaributes) {
+        protected static Dictionary<RawVaribute, JsonValue> GetSelection(JsonNode value, IEnumerable<RawVaribute> vaributes) {
             if (value is JsonValue flatRate) {
                 return vaributes.ToDictionary(e => e, _ => flatRate);
             } if (value is not JsonObject data) {
                 throw new InvalidOperationException();
             }
-            Dictionary<string, JsonValue> dict;
+            Dictionary<RawVaribute, JsonValue> dict;
             if (data["default"] is JsonValue def) {
                 dict = vaributes.ToDictionary(e => e, _ => def);
             } else {
                 dict = [];
             }
 
-            var varieties = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length == 2);
-            var attributes = data.Where(p => p.Key.StartsWith('/'));
-            var others = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length > 2 && p.Key != "default");
-            foreach (var (idx, v) in varieties) {
+            var conv = data
+                .Where(p => p.Key != "default")
+                .Select(p => (new RawVaribute(p.Key), p.Value))
+                .OrderBy(p => (p.Item1.SortId != null ? 10 : 0) + (p.Item1.AttrId != null ? 12 : 0) + (p.Item1.CultId != null ? 11 : 0))
+                .ToList();
+            foreach (var (idx, v) in conv) {
                 var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                foreach (var i in vaributes.Where(e => e.StartsWith(idx[..^1]))) {
+                foreach (var i in vaributes.Where(e =>
+                        (idx.SortId == null || idx.SortId == e.SortId) &&
+                        (idx.AttrId == null || idx.AttrId == e.AttrId) &&
+                        (idx.CultId == null || idx.CultId == e.CultId))) {
                     dict[i] = curve;
                 }
             }
-            foreach (var (idx, v) in attributes) {
-                var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                foreach (var i in vaributes.Where(e => e[2..] == idx[1..])) {
-                    dict[i] = curve;
-                }
-            }
-            foreach (var (idx, v) in others) {
-                var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                dict[idx.Replace("/", "")] = curve;
-            }
 
             return dict;
         }
@@ -257,11 +278,11 @@ namespace Elwig.Helpers.Billing {
             return curve;
         }
 
-        protected static void CollapsePaymentData(JsonObject data, IEnumerable<string> vaributes, bool useDefault = true) {
+        protected static (Dictionary<string, List<string>>, Dictionary<decimal, List<string>>) GetReverseKeys(JsonObject data, bool strict = true) {
             Dictionary<string, List<string>> rev1 = [];
             Dictionary<decimal, List<string>> rev2 = [];
             foreach (var (k, v) in data) {
-                if (k == "default" || k.StartsWith('/') || !k.Contains('/') || v is not JsonValue val) {
+                if (k == "default" || (strict && (k.StartsWith('/') || !k.Contains('/'))) || v is not JsonValue val) {
                     continue;
                 } else if (val.TryGetValue<decimal>(out var dec)) {
                     rev2[dec] = rev2.GetValueOrDefault(dec) ?? [];
@@ -271,6 +292,11 @@ namespace Elwig.Helpers.Billing {
                     rev1[cur].Add(k);
                 }
             }
+            return (rev1, rev2);
+        }
+
+        protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
+            var (rev1, rev2) = GetReverseKeys(data);
             if (!data.ContainsKey("default")) {
                 foreach (var (v, ks) in rev1) {
                     if ((ks.Count >= vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
@@ -289,26 +315,67 @@ namespace Elwig.Helpers.Billing {
                     }
                 }
             }
+
             var attributes = data
                 .Select(e => e.Key)
                 .Where(k => k.Length > 3 && k.Contains('/'))
-                .Select(k => "/" + k.Split('/')[1])
+                .Select(k => k.Split('/')[1])
                 .Distinct()
                 .ToList();
             foreach (var idx in attributes) {
-                var len = vaributes.Count(e => e.EndsWith(idx));
+                var len = vaributes.Count(e => $"{e.AttrId}{(e.CultId != null && e.CultId != "" ? "-" : "")}{e.CultId}" == idx);
                 foreach (var (v, ks) in rev1) {
-                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[idx] = v;
+                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
                     }
                 }
                 foreach (var (v, ks) in rev2) {
-                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[idx] = v;
+                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
+                    }
+                }
+            }
+
+            if (!useDefault)
+                return;
+
+            var keys = data.Select(p => p.Key).ToList();
+            foreach (var k in keys) {
+                if (k.Length == 3 && k.EndsWith('/') && !keys.Contains(k[..2])) {
+                    data.Remove(k, out var val);
+                    data.Add(k[..2], val);
+                } else if (k.Contains("/-")) {
+                    data.Remove(k, out var val);
+                    data.Add(k.Replace("/-", "-"), val);
+                }
+            }
+
+            (rev1, rev2) = GetReverseKeys(data, false);
+            var keyVaributes = data
+                .Select(e => e.Key.Split('-')[0])
+                .Where(e => e.Length > 0 && e != "default")
+                .Distinct()
+                .ToList();
+            foreach (var idx in keyVaributes) {
+                var len = data.Count(e => e.Key == idx || (e.Key.Length > idx.Length && e.Key.StartsWith(idx) && e.Key[idx.Length] == '-'));
+                foreach (var (v, ks) in rev1) {
+                    var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
+                    if (myKs.Count == len) {
+                        foreach (var k in myKs) {
+                            if (k != idx) data.Remove(k);
+                        }
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    var myKs = ks.Where(k => k == idx || (k.Length > idx.Length && k.StartsWith(idx) && k[idx.Length] == '-' && !data.ContainsKey(k[idx.Length..]))).ToList();
+                    if (myKs.Count == len) {
+                        foreach (var k in myKs) {
+                            if (k != idx) data.Remove(k);
+                        }
                     }
                 }
             }
@@ -317,7 +384,7 @@ namespace Elwig.Helpers.Billing {
         public static JsonObject FromGraphEntries(
             IEnumerable<GraphEntry> graphEntries,
             BillingData? origData = null,
-            IEnumerable<string>? vaributes = null,
+            IEnumerable<RawVaribute>? vaributes = null,
             bool useDefaultPayment = true,
             bool useDefaultQuality = true
         ) {
@@ -338,16 +405,18 @@ namespace Elwig.Helpers.Billing {
                     continue;
                 }
                 foreach (var c in entry.Vaributes) {
-                    if (entry.Abgewertet) {
-                        qualityWei[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    var v = new RawVaribute(c.Variety!.SortId, c.Attribute?.AttrId ?? "", c.Cultivation?.CultId);
+                    if (v.CultId == "") v.CultId = null;
+                    if (entry.Abgewertet) {;
+                        qualityWei[v.ToString()] = node.DeepClone();
                     } else {
-                        payment[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                        payment[v.ToString()] = node.DeepClone();
                     }
                 }
             }
 
-            CollapsePaymentData(payment, vaributes ?? payment.Select(e => e.Key).ToList(), useDefaultPayment);
-            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => e.Key).ToList(), useDefaultQuality);
+            CollapsePaymentData(payment, vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
+            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
 
             var data = new JsonObject {
                 ["mode"] = "elwig",

Elwig/Helpers/Billing/BillingVariant.cs

@@ -1,5 +1,6 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,11 +15,12 @@ namespace Elwig.Helpers.Billing {
 
         public BillingVariant(int year, int avnr) : base(year) {
             AvNr = avnr;
-            PaymentVariant = Context.PaymentVariants.Find(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
-            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false));
+            using var ctx = new AppDbContext();
+            PaymentVariant = ctx.PaymentVariants.Include(v => v.Season).Where(v => v.Year == Year && v.AvNr == AvNr).Single() ?? throw new ArgumentException("PaymentVar not found");
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(ctx, Year, onlyDelivered: false));
         }
 
-        public async Task Calculate(bool? honorGebunden = null, bool ? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
+        public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
             await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
@@ -123,31 +125,36 @@ namespace Elwig.Helpers.Billing {
         }
 
         protected async Task CalculatePrices(SqliteConnection cnx) {
-            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string Discr, int Value, double Oe, double Kmw, string QualId)>();
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, b.discr, b.value, d.oe, d.kmw, d.qualid
+                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, d.cultid, b.discr, b.value, d.oe, d.kmw, d.qualid, COALESCE(a.area_com, TRUE)
                     FROM delivery_part_bucket b
                         JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr)
+                        LEFT JOIN v_wine_attribute a ON a.attrid = d.attrid
                     WHERE b.year = {Year}
                     """;
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     parts.Add((
                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3),
-                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5), reader.GetString(6),
-                        reader.GetInt32(7), reader.GetDouble(8), reader.GetDouble(9), reader.GetString(10)
+                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5),
+                        reader.IsDBNull(6) ? null : reader.GetString(6), reader.GetString(7),
+                        reader.GetInt32(8), reader.GetDouble(9), reader.GetDouble(10), reader.GetString(11),
+                        reader.GetBoolean(12)
                     ));
                 }
             }
 
             var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
             foreach (var part in parts) {
+                if (part.Value == 0)
+                    continue;
                 var ungeb = part.Discr == "_";
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
-                var attrId = part.AttrId == "B" ? "B" : payAttrId;  // FIXME
-                var geb = !ungeb;  // FIXME && payAttrId == part.AttrId;
-                var price = Data.CalculatePrice(part.SortId, attrId, part.QualId, geb, part.Oe, part.Kmw);
+                var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
+                var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
+                var price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
                 var priceL = PaymentVariant.Season.DecToDb(price);
                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }
@@ -159,7 +166,16 @@ namespace Elwig.Helpers.Billing {
         }
 
         protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {
+            var netMod = Data.NetWeightModifier.ToString().Replace(',', '.');
+            var grossMod = Data.GrossWeightModifier.ToString().Replace(',', '.');
             await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
+                SELECT d.year, d.did, d.dpnr, {AvNr}, 0, 0, IIF(d.net_weight, {netMod}, {grossMod})
+                FROM delivery_part d
+                WHERE d.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_rel = mod_rel + excluded.mod_rel;
+
                 INSERT INTO payment_delivery_part (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
                 SELECT d.year, d.did, d.dpnr, {AvNr}, 0, COALESCE(m.abs, 0), COALESCE(m.rel, 0)
                 FROM delivery_part d
@@ -168,7 +184,7 @@ namespace Elwig.Helpers.Billing {
                 WHERE d.year = {Year}
                 ON CONFLICT DO UPDATE
                 SET mod_abs = mod_abs + excluded.mod_abs,
-                    mod_rel = mod_rel + excluded.mod_rel
+                    mod_rel = mod_rel + excluded.mod_rel;
                 """);
         }
     }

Elwig/Helpers/Billing/EditBillingData.cs

@@ -7,18 +7,18 @@ using System.Text.Json.Nodes;
 namespace Elwig.Helpers.Billing {
     public class EditBillingData : BillingData {
 
-        protected readonly IEnumerable<string> Vaributes;
+        protected readonly IEnumerable<RawVaribute> Vaributes;
 
-        public EditBillingData(JsonObject data, IEnumerable<string> vaributes) :
+        public EditBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) :
             base(data) {
             Vaributes = vaributes;
         }
 
-        public static EditBillingData FromJson(string json, IEnumerable<string> vaributes) {
+        public static EditBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) {
             return new(ParseJson(json), vaributes);
         }
 
-        private (Dictionary<int, Curve>, Dictionary<int, List<string>>) GetGraphEntries(JsonNode root) {
+        private (Dictionary<int, Curve>, Dictionary<int, List<RawVaribute>>) GetGraphEntries(JsonNode root) {
             Dictionary<int, List<string>> dict1 = [];
             Dictionary<decimal, List<string>> dict2 = [];
             if (root is JsonObject paymentObj) {
@@ -55,7 +55,7 @@ namespace Elwig.Helpers.Billing {
                 curves[i + virtOffset] = new Curve(CurveMode.Oe, new() { { 73, idx } }, null);
             }
 
-            Dictionary<int, List<string>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<string>());
+            Dictionary<int, List<RawVaribute>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<RawVaribute>());
             foreach (var (selector, value) in GetSelection(root, Vaributes)) {
                 int? idx = null;
                 if (value.TryGetValue<decimal>(out var val)) {
@@ -73,13 +73,14 @@ namespace Elwig.Helpers.Billing {
         private static List<GraphEntry> CreateGraphEntries(
             AppDbContext ctx, int precision,
             Dictionary<int, Curve> curves,
-            Dictionary<int, List<string>> entries
+            Dictionary<int, List<RawVaribute>> entries
         ) {
             var vars = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
             var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+            var cults = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c);
             return entries
                 .Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value
-                    .Select(s => new Varibute(vars[s[..2]], s.Length > 2 ? attrs[s[2..]] : null))
+                    .Select(s => new Varibute(s, vars, attrs, cults))
                     .ToList()))
                 .ToList();
         }

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -7,48 +7,46 @@ namespace Elwig.Helpers.Billing {
     public class PaymentBillingData : BillingData {
 
         protected readonly Dictionary<int, Curve> Curves;
-        protected readonly Dictionary<string, Curve> PaymentData;
-        protected readonly Dictionary<string, Curve> QualityData;
-        protected readonly IEnumerable<string> Vaributes;
+        protected readonly Dictionary<RawVaribute, Curve> PaymentData;
+        protected readonly Dictionary<RawQualVaribute, Curve> QualityData;
+        protected readonly IEnumerable<RawVaribute> Vaributes;
 
-        public PaymentBillingData(JsonObject data, IEnumerable<string> vaributes) :
+        public PaymentBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) :
             base(data) {
-            if (vaributes.Any(e => e.Any(c => c < 'A' || c > 'Z')))
-                throw new ArgumentException("Invalid vaributes");
             Vaributes = vaributes;
             Curves = GetCurves();
             PaymentData = GetPaymentData();
             QualityData = GetQualityData();
         }
 
-        public static PaymentBillingData FromJson(string json, IEnumerable<string> vaributes) {
+        public static PaymentBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) {
             return new(ParseJson(json), vaributes);
         }
 
-        private Dictionary<string, Curve> GetData(JsonNode data) {
+        private Dictionary<RawVaribute, Curve> GetData(JsonNode data) {
             return GetSelection(data, Vaributes).ToDictionary(e => e.Key, e => LookupCurve(e.Value));
         }
 
-        protected Dictionary<string, Curve> GetPaymentData() {
+        protected Dictionary<RawVaribute, Curve> GetPaymentData() {
             return GetData(GetPaymentEntry());
         }
 
-        protected Dictionary<string, Curve> GetQualityData() {
-            Dictionary<string, Curve> dict = [];
+        protected Dictionary<RawQualVaribute, Curve> GetQualityData() {
+            Dictionary<RawQualVaribute, Curve> dict = [];
             var q = GetQualityEntry();
             if (q == null) return dict;
 
             foreach (var (qualid, data) in q) {
                 foreach (var (idx, d) in GetData(data ?? throw new InvalidOperationException())) {
-                    dict[$"{qualid}/{idx}"] = d;
+                    dict[new(qualid, idx.SortId, idx.AttrId, idx.CultId)] = d;
                 }
             }
 
             return dict;
         }
 
-        public decimal CalculatePrice(string sortid, string? attrid, string qualid, bool gebunden, double oe, double kmw) {
-            var curve = GetQualityCurve(qualid, sortid, attrid) ?? GetCurve(sortid, attrid);
+        public decimal CalculatePrice(string sortid, string? attrid, string? cultid, string qualid, bool gebunden, double oe, double kmw) {
+            var curve = GetQualityCurve(qualid, sortid, attrid, cultid) ?? GetCurve(sortid, attrid, cultid);
             return GetCurveValueAt((gebunden ? curve.Gebunden : null) ?? curve.Normal, curve.Mode == CurveMode.Oe ? oe : kmw);
         }
 
@@ -62,12 +60,12 @@ namespace Elwig.Helpers.Billing {
             throw new InvalidOperationException();
         }
 
-        protected Curve GetCurve(string sortid, string? attrid) {
-            return PaymentData[$"{sortid}{attrid}"];
+        protected Curve GetCurve(string sortid, string? attrid, string? cultid) {
+            return PaymentData[new(sortid, attrid ?? "", cultid ?? "")];
         }
 
-        protected Curve? GetQualityCurve(string qualid, string sortid, string? attrid) {
-            return QualityData.TryGetValue($"{qualid}/{sortid}{attrid}", out var curve) ? curve : null;
+        protected Curve? GetQualityCurve(string qualid, string sortid, string? attrid, string? cultid) {
+            return QualityData.TryGetValue(new(qualid, sortid, attrid ?? "", cultid ?? ""), out var curve) ? curve : null;
         }
     }
 }

Elwig/Helpers/Billing/Varibute.cs

@@ -1,20 +1,83 @@
 using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
 using System;
+using System.Collections.Generic;
 
 namespace Elwig.Helpers.Billing {
+
+    public record struct RawQualVaribute {
+        public string QualId;
+        public string? SortId;
+        public string? AttrId;
+        public string? CultId;
+
+        public RawQualVaribute(string qualid, string? sortid, string? attrid, string? cultid) {
+            QualId = qualid;
+            SortId = sortid;
+            AttrId = attrid;
+            CultId = cultid;
+        }
+    }
+
+    public record struct RawVaribute : IComparable<RawVaribute> {
+        public string? SortId;
+        public string? AttrId;
+        public string? CultId;
+
+        public RawVaribute(string? sortid, string? attrid, string? cultid) {
+            SortId = sortid;
+            AttrId = attrid;
+            CultId = cultid;
+        }
+
+        public RawVaribute(string id) {
+            var p1 = id.Split('/')[0].Split('-')[0];
+            SortId = p1 == "" ? null : p1;
+            AttrId = id.Contains('/') ? id.Split('/')[1].Split('-')[0] : null;
+            CultId = id.Contains('-') ? id.Split('-')[1] : null;
+        }
+
+        public readonly override string ToString() {
+            return $"{SortId}" + (AttrId != null ? $"/{AttrId}" : "") + (CultId != null ? $"-{CultId}" : "");
+        }
+
+        public readonly int CompareTo(RawVaribute other) {
+            return $"{SortId}/{AttrId}-{CultId}".CompareTo($"{other.SortId}/{other.AttrId}-{other.CultId}");
+        }
+    }
+
+    [PrimaryKey("Listing")]
     public class Varibute : IComparable<Varibute> {
 
         public WineVar? Variety { get; }
         public WineAttr? Attribute { get; }
+        public WineCult? Cultivation { get; }
         public int? AssignedGraphId { get; set; }
         public int? AssignedAbgewGraphId { get; set; }
 
-        public string Listing => $"{Variety?.SortId}{Attribute?.AttrId}";
-        public string FullName => $"{Variety?.Name}" + (Variety != null && Attribute != null ? " " : "") + $"{Attribute?.Name}";
+        public string Listing => $"{Variety?.SortId}" +
+            (Attribute != null ? $"/{Attribute.AttrId}" : "") +
+            (Cultivation != null ? $"-{Cultivation.CultId}" : "");
+        public string FullName => $"{Variety?.Name}" +
+            (Variety != null && Attribute != null ? " " : "") + $"{Attribute?.Name}" +
+            ((Variety != null || Attribute != null) && Cultivation != null ? " " : "") + $"{Cultivation?.Name}";
 
-        public Varibute(WineVar? var, WineAttr? attr) {
+        public Varibute(RawVaribute raw) :
+            this(raw.SortId != null ? new WineVar(raw.SortId, raw.SortId) : null,
+                 raw.AttrId != null ? new WineAttr() { AttrId = raw.AttrId, Name = raw.AttrId } : null,
+                 raw.CultId != null ? new WineCult() { CultId = raw.CultId, Name = raw.CultId } : null) {
+        }
+
+        public Varibute(RawVaribute raw, Dictionary<string, WineVar> vars, Dictionary<string, WineAttr> attrs, Dictionary<string, WineCult> cults) :
+            this(raw.SortId != null && raw.SortId != "" ? vars[raw.SortId] : null,
+                 raw.AttrId != null && raw.AttrId != "" ? attrs[raw.AttrId] : null,
+                 raw.CultId != null && raw.CultId != "" ? cults[raw.CultId] : null) {
+        }
+
+        public Varibute(WineVar? var, WineAttr? attr, WineCult? cult) {
             Variety = var;
             Attribute = attr;
+            Cultivation = cult;
         }
 
         public override string ToString() {
@@ -23,6 +86,6 @@ namespace Elwig.Helpers.Billing {
 
         public int CompareTo(Varibute? other) {
             return Listing.CompareTo(other?.Listing);
-        } 
+        }
     }
 }

Elwig/Helpers/ClientParameters.cs

@@ -7,20 +7,20 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
     public class ClientParameters {
 
-        public enum Type { Matzen, Winzerkeller };
+        public enum Type { Matzen, Winzerkeller, Weinland, Baden };
 
         public bool IsMatzen => Client == Type.Matzen;
         public bool IsWinzerkeller => Client == Type.Winzerkeller;
-        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
-        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
-        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
+        public bool IsWeinland => Client == Type.Weinland;
+        public bool IsBaden => Client == Type.Baden;
+        public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W";
+        public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H";
+        public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
+        public bool IsGrInzersdorf => IsWeinland;
 
-        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
-        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
-        public bool HasRebler() => HasRebler(App.ZwstId);
-        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
-        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
-        public bool HasKisten() => HasKisten(App.ZwstId);
+        public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
+        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
 
         public string NameToken;
         public string NameShort;
@@ -36,8 +36,8 @@ namespace Elwig.Helpers {
 
         public PostalDest PostalDest {
             set {
-                Plz = value.AtPlz.Plz;
-                Ort = value.AtPlz.Ort.Name;
+                Plz = value.AtPlz!.Plz;
+                Ort = value.AtPlz!.Ort.Name;
             }
         }
         public int Plz;
@@ -57,10 +57,14 @@ namespace Elwig.Helpers {
         public string? Website;
 
         public int ModeDeliveryNoteStats;
+        public int ModeWineQualityStatistics;
+        public int OrderingMemberList;
 
         public string? TextDeliveryNote;
         public string? TextDeliveryConfirmation;
         public string? TextCreditNote;
+        public string? TextEmailSubject;
+        public string? TextEmailBody;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -72,8 +76,14 @@ namespace Elwig.Helpers {
                 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;
+                    case "Winzergenossenschaft für Matzen und Umgebung":
+                        Client = Type.Matzen; break;
+                    case "Winzerkeller im Weinviertel":
+                        Client = Type.Winzerkeller; break;
+                    case "Winzergenossenschaft Weinland":
+                        Client = Type.Weinland; break;
+                    case "Winzergenossenschaft Baden - Bad Vöslau":
+                        Client = Type.Baden; break;
                 };
 
                 Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
@@ -94,6 +104,18 @@ namespace Elwig.Helpers {
                     case "SHORT": ModeDeliveryNoteStats = 2; break;
                     case "FULL": ModeDeliveryNoteStats = 3; break;
                 }
+                switch (parameters.GetValueOrDefault("MODE_WINEQUALITYSTATISTICS", "OE")?.ToUpper()) {
+                    case "OE": ModeWineQualityStatistics = 0; break;
+                    case "KMW/1": ModeWineQualityStatistics = 1; break;
+                    case "KMW/2": ModeWineQualityStatistics = 2; break;
+                    case "KMW/5": ModeWineQualityStatistics = 3; break;
+                    case "KMW/10": ModeWineQualityStatistics = 4; break;
+                }
+                switch (parameters.GetValueOrDefault("ORDERING_MEMBERLIST", "")?.ToUpper()) {
+                    case "MGNR": OrderingMemberList = 0; break;
+                    case "NAME": OrderingMemberList = 1; break;
+                    case "KG": OrderingMemberList = 2; break;
+                }
 
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
@@ -102,6 +124,10 @@ namespace Elwig.Helpers {
                 if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
                 TextCreditNote = parameters.GetValueOrDefault("TEXT_CREDITNOTE");
                 if (TextCreditNote == "") TextCreditNote = null;
+                TextEmailSubject = parameters.GetValueOrDefault("TEXT_EMAIL_SUBJECT");
+                if (TextEmailSubject == "") TextEmailSubject = null;
+                TextEmailBody = parameters.GetValueOrDefault("TEXT_EMAIL_BODY");
+                if (TextEmailBody == "") TextEmailBody = null;
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -115,7 +141,21 @@ namespace Elwig.Helpers {
                 case 2: deliveryNoteStats = "SHORT"; break;
                 case 3: deliveryNoteStats = "FULL"; break;
             }
-            return new (string, string?)[] {
+            string modeWineQualityStatistics = "OE";
+            switch (ModeWineQualityStatistics) {
+                case 0: modeWineQualityStatistics = "OE"; break;
+                case 1: modeWineQualityStatistics = "KMW/1"; break;
+                case 2: modeWineQualityStatistics = "KMW/2"; break;
+                case 3: modeWineQualityStatistics = "KMW/5"; break;
+                case 4: modeWineQualityStatistics = "KMW/10"; break;
+            }
+            string orderingMemberList = "MGNR";
+            switch (OrderingMemberList) {
+                case 0: orderingMemberList = "MGNR"; break;
+                case 1: orderingMemberList = "NAME"; break;
+                case 2: orderingMemberList = "KG"; break;
+            }
+            return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
                 ("CLIENT_NAME", Name),
@@ -133,11 +173,15 @@ namespace Elwig.Helpers {
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
                 ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
+                ("MODE_WINEQUALITYSTATISTICS", modeWineQualityStatistics),
+                ("ORDERING_MEMBERLIST", orderingMemberList),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
                 ("TEXT_CREDITNOTE", TextCreditNote),
-            };
+                ("TEXT_EMAIL_SUBJECT", TextEmailSubject),
+                ("TEXT_EMAIL_BODY", TextEmailBody)
+            ];
         }
 
         public async Task UpdateValues() {

Elwig/Helpers/Config.cs

@@ -4,16 +4,59 @@ using System.Linq;
 using Microsoft.Extensions.Configuration;
 
 namespace Elwig.Helpers {
+
+    public record struct ScaleConfig {
+        public string Id;
+        public string? Type;
+        public string? Model;
+        public string? Connection;
+        public string? Empty;
+        public string? Filling;
+        public string? Limit;
+        public string? Log;
+        public string? _Log;
+
+        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, string? log) {
+            Id = id;
+            Type = type;
+            Model = model;
+            Connection = cnx;
+            Empty = empty;
+            Filling = filling;
+            Limit = limit;
+            _Log = log;
+            Log = log != null ? Path.Combine(App.DataPath, log) : null;
+        }
+    }
+
     public class Config {
 
+        private static readonly string[] TrueValues = ["1", "true", "yes", "on"];
+
         private readonly string FileName;
+
         public bool Debug;
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
-        public IList<string?[]> Scales;
-        private readonly List<string?[]> ScaleList = [];
-        private static readonly string[] trueValues = ["1", "true", "yes", "on"];
+        public string? UpdateUrl = null;
+        public bool UpdateAuto = false;
+        public string? SyncUrl = null;
+        public string SyncUsername = "";
+        public string SyncPassword = "";
+
+        public string? SmtpHost = null;
+        public int? SmtpPort = null;
+        public string? SmtpMode = null;
+        public string? SmtpUsername = null;
+        public string? SmtpPassword = null;
+        public string? SmtpFrom = null;
+        public (string Host, int Port, string Mode, string Username, string Password, string From)? Smtp =>
+            SmtpHost == null || SmtpPort == null || SmtpMode == null || SmtpUsername == null || SmtpPassword == null || SmtpFrom == null ?
+            null : (SmtpHost, (int)SmtpPort, SmtpMode, SmtpUsername, SmtpPassword, SmtpFrom);
+
+        public IList<ScaleConfig> Scales;
+        private readonly List<ScaleConfig> ScaleList = [];
 
         public Config(string filename) {
             FileName = filename;
@@ -28,34 +71,28 @@ namespace Elwig.Helpers {
             var log = config["database:log"];
             DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
             Branch = config["general:branch"];
-            Debug = trueValues.Contains(config["general:debug"]?.ToLower());
+            Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
+            UpdateUrl = config["update:url"];
+            UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
+            SyncUrl = config["sync:url"];
+            SyncUsername = config["sync:username"] ?? "";
+            SyncPassword = config["sync:password"] ?? "";
+
+            SmtpHost = config["smtp:host"];
+            SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null;
+            SmtpMode = config["smtp:mode"];
+            SmtpUsername = config["smtp:username"];
+            SmtpPassword = config["smtp:password"];
+            SmtpFrom = config["smtp:from"];
 
             var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key);
             ScaleList.Clear();
             Scales = ScaleList;
             foreach (var s in scales) {
-                string? scaleLog = config[$"scale.{s}:log"];
-                if (scaleLog != null) scaleLog = Path.Combine(App.DataPath, scaleLog);
-                ScaleList.Add([
+                ScaleList.Add(new(
                     s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
-                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], scaleLog
-                ]);
-            }
-        }
-
-        public void Write() {
-            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) {
-                file.Write($"\r\n[scale.{s[0]}]\r\ntype = {s[1]}\r\nmodel = {s[2]}\r\nconnection = {s[3]}\r\n");
-                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");
+                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], config[$"scale.{s}:log"]
+                ));
             }
         }
     }

Elwig/Helpers/ControlUtils.cs

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

Elwig/Helpers/Export/Ebics.cs

@@ -1,8 +1,8 @@
+using Elwig.Models;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Security;

Elwig/Helpers/Export/ElwigData.cs

@@ -0,0 +1,251 @@
+using System.IO.Compression;
+using System.IO;
+using System.Threading.Tasks;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System;
+using System.Text.Json.Nodes;
+using System.Linq;
+using System.Windows;
+using Microsoft.EntityFrameworkCore;
+
+namespace Elwig.Helpers.Export {
+    public static class ElwigData {
+
+        public static readonly string ImportedTxt = Path.Combine(App.DataPath, "imported.txt");
+
+        public static async Task<string[]> GetImportedFiles() {
+            try {
+                return await File.ReadAllLinesAsync(ImportedTxt, Utils.UTF8);
+            } catch {
+                return [];
+            }
+        }
+
+        public static async Task AddImportedFiles(IEnumerable<string> filenames) {
+            await File.AppendAllLinesAsync(ImportedTxt, filenames, Utils.UTF8);
+        }
+
+        public static Task Import(string filename, bool interactive) => Import([filename], interactive);
+
+        public static async Task Import(IEnumerable<string> filenames, bool interactive) {
+            try {
+                using var ctx = new AppDbContext();
+                var currentDids = await ctx.Deliveries
+                    .GroupBy(d => d.Year)
+                    .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+
+                var deliveries = new List<Delivery>();
+                var deliveryParts = new List<DeliveryPart>();
+                var modifiers = new List<DeliveryPartModifier>();
+
+                var metaData = new List<(string Name, int DeliveryNum, string Filters)>();
+
+                foreach (var filename in filenames) {
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+
+                    var version = zip.GetEntry("version");
+                    using (var reader = new StreamReader(version!.Open(), Utils.UTF8)) {
+                        if (await reader.ReadToEndAsync() != "elwig:1")
+                            throw new FileFormatException("Ungültige Export-Datei");
+                    }
+
+                    var metaJson = zip.GetEntry("meta.json");
+                    var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                    var deliveryCount = meta!["deliveries"]?["count"]!.AsValue().GetValue<int>();
+                    var deliveryFilters = meta!["deliveries"]?["filters"]!.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                    if (deliveryCount != null && deliveryFilters != null)
+                        metaData.Add((Path.GetFileName(filename), (int)deliveryCount, string.Join(" / ", deliveryFilters)));
+
+                    var membersJson = zip.GetEntry("members.json");
+                    if (membersJson != null) {
+                        using var reader = new StreamReader(membersJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            // TODO import members.json
+                        }
+                    }
+
+                    var areaComsJson = zip.GetEntry("area_commitments.json");
+                    if (areaComsJson != null) {
+                        using var reader = new StreamReader(areaComsJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            // TODO import area_commitments.json
+                        }
+                    }
+
+                    var deliveriesJson = zip.GetEntry("deliveries.json");
+                    if (deliveriesJson != null) {
+                        using var reader = new StreamReader(deliveriesJson.Open(), Utils.UTF8);
+                        string? line;
+                        while ((line = await reader.ReadLineAsync()) != null) {
+                            var obj = JsonNode.Parse(line)!.AsObject();
+                            var (d, parts, mods) = JsonToDelivery(obj, currentDids);
+                            deliveries.Add(d);
+                            deliveryParts.AddRange(parts);
+                            modifiers.AddRange(mods);
+                        }
+                    }
+                }
+
+                var lsnrs = deliveries.Select(d => d.LsNr).ToList();
+                var duplicateLsNrs = await ctx.Deliveries
+                    .Where(d => lsnrs.Contains(d.LsNr))
+                    .Select(d => d.LsNr)
+                    .ToListAsync();
+                var duplicateDIds = deliveries
+                    .Where(d => duplicateLsNrs.Contains(d.LsNr))
+                    .Select(d => (d.Year, d.DId))
+                    .ToList();
+                bool overwriteDelivieries = false;
+                if (duplicateLsNrs.Count > 0) {
+                    var res = MessageBox.Show($"Sollen {duplicateLsNrs.Count} Lieferungen überschreiben werden?", "Lieferungen überschreiben",
+                        MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+                    overwriteDelivieries = res == MessageBoxResult.Yes;
+                }
+                if (overwriteDelivieries) {
+                    ctx.RemoveRange(ctx.Deliveries.Where(d => duplicateLsNrs.Contains(d.LsNr)));
+                    ctx.AddRange(deliveries);
+                    ctx.AddRange(deliveryParts);
+                    ctx.AddRange(modifiers);
+                } else {
+                    ctx.AddRange(deliveries.Where(d => !duplicateDIds.Contains((d.Year, d.DId))));
+                    ctx.AddRange(deliveryParts.Where(p => !duplicateDIds.Contains((p.Year, p.DId))));
+                    ctx.AddRange(modifiers.Where(m => !duplicateDIds.Contains((m.Year, m.DId))));
+                }
+                await ctx.SaveChangesAsync();
+                await AddImportedFiles(filenames.Select(f => Path.GetFileName(f)));
+                await App.HintContextChange();
+
+                MessageBox.Show(
+                    $"Das importieren der Daten war erfolgreich!\n" +
+                    $"Folgendes wurde importiert:\n" +
+                    $"  Lieferungen: {deliveries.Count}\n" +
+                    string.Join("\n", metaData.Select(d => $"    {d.Name} ({d.DeliveryNum})\n      {d.Filters}")) +
+                    "\n", "Importieren erfolgreich",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        public static async Task ExportDeliveries(string filename, IEnumerable<Delivery> deliveries, IEnumerable<string> filters) {
+            File.Delete(filename);
+            using var zip = ZipFile.Open(filename, ZipArchiveMode.Create);
+
+            var version = zip.CreateEntry("version", CompressionLevel.NoCompression);
+            using (var writer = new StreamWriter(version.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("elwig:1");
+            }
+
+            var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+            using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                await writer.WriteAsync(
+                    $"{{\"timestamp\": \"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}\", " +
+                    $"\"zwstid\": \"{App.ZwstId}\", \"device\": \"{Environment.MachineName}\", " +
+                    $"\"deliveries\": {{" +
+                    $"\"count\": {deliveries.Count()}, " +
+                    $"\"parts\": {deliveries.Sum(d => d.Parts.Count)}, " +
+                    $"\"filters\": [{string.Join(", ", filters.Select(f => '"' + f + '"'))}]" +
+                    $"}}}}");
+            }
+
+            var json = zip.CreateEntry("deliveries.json");
+            using (var writer = new StreamWriter(json.Open(), Utils.UTF8)) {
+                foreach (var d in deliveries) {
+                    await writer.WriteLineAsync(DeliveryToJson(d).ToJsonString());
+                }
+            }
+        }
+
+        public static JsonObject DeliveryToJson(Delivery d) {
+            return new JsonObject {
+                ["lsnr"] = d.LsNr,
+                ["year"] = d.Year,
+                ["date"] = $"{d.Date:yyyy-MM-dd}",
+                ["zwstid"] = d.ZwstId,
+                ["lnr"] = d.LNr,
+                ["time"] = d.Time != null ? $"{d.Time:HH:mm:ss}" : null,
+                ["mgnr"] = d.MgNr,
+                ["parts"] = new JsonArray(d.Parts.OrderBy(p => p.DPNr).Select(p => {
+                    var obj = new JsonObject {
+                        ["dpnr"] = p.DPNr,
+                        ["sortid"] = p.SortId,
+                        ["attrid"] = p.AttrId,
+                        ["cultid"] = p.CultId,
+                        ["weight"] = p.Weight,
+                        ["kmw"] = p.Kmw,
+                        ["qualid"] = p.QualId,
+                        ["hkid"] = p.HkId,
+                        ["kgnr"] = p.KgNr,
+                        ["rdnr"] = p.RdNr,
+                        ["net_weight"] = p.IsNetWeight,
+                        ["manual_weighing"] = p.IsManualWeighing,
+                        ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
+                        ["comment"] = p.Comment,
+                    };
+                    if (p.IsSplCheck) obj["spl_check"] = p.IsSplCheck;
+                    if (p.IsHandPicked != null) obj["hand_picked"] = p.IsHandPicked;
+                    if (p.IsLesewagen != null) obj["lesewagen"] = p.IsLesewagen;
+                    if (p.IsGebunden != null) obj["gebunden"] = p.IsGebunden;
+                    if (p.Temperature != null) obj["temperature"] = p.Temperature;
+                    if (p.Acid != null) obj["acid"] = p.Acid;
+                    if (p.ScaleId != null) obj["scale_id"] = p.ScaleId;
+                    if (p.WeighingId != null) obj["weighing_id"] = p.WeighingId;
+                    if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
+                    return obj;
+                }).ToArray()),
+                ["comment"] = d.Comment,
+            };
+        }
+
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>) JsonToDelivery(JsonNode json, Dictionary<int, int> currentDids) {
+            var year = json["year"]!.AsValue().GetValue<int>();
+            var did = ++currentDids[year];
+            return (new Delivery {
+                Year = year,
+                DId = did,
+                DateString = json["date"]!.AsValue().GetValue<string>(),
+                TimeString = json["time"]?.AsValue().GetValue<string>(),
+                ZwstId = json["zwstid"]!.AsValue().GetValue<string>(),
+                LNr = json["lnr"]!.AsValue().GetValue<int>(),
+                LsNr = json["lsnr"]!.AsValue().GetValue<string>(),
+                MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => new DeliveryPart {
+                Year = year,
+                DId = did,
+                DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
+                SortId = p["sortid"]!.AsValue().GetValue<string>(),
+                AttrId = p["attrid"]?.AsValue().GetValue<string>(),
+                CultId = p["cultid"]?.AsValue().GetValue<string>(),
+                Weight = p["weight"]!.AsValue().GetValue<int>(),
+                Kmw = p["kmw"]!.AsValue().GetValue<double>(),
+                QualId = p["qualid"]!.AsValue().GetValue<string>(),
+                HkId = p["hkid"]!.AsValue().GetValue<string>(),
+                KgNr = p["kgnr"]?.AsValue().GetValue<int>(),
+                RdNr = p["rdnr"]?.AsValue().GetValue<int>(),
+                IsNetWeight = p["net_weight"]!.AsValue().GetValue<bool>(),
+                IsManualWeighing = p["manual_weighing"]!.AsValue().GetValue<bool>(),
+                Comment = p["comment"]?.AsValue().GetValue<string>(),
+                IsSplCheck = p["spl_check"]?.AsValue().GetValue<bool>() ?? false,
+                IsHandPicked = p["hand_picked"]?.AsValue().GetValue<bool>(),
+                IsLesewagen = p["lesewagen"]?.AsValue().GetValue<bool>(),
+                IsGebunden = p["gebunden"]?.AsValue().GetValue<bool>(),
+                Temperature = p["temperature"]?.AsValue().GetValue<double>(),
+                Acid = p["acid"]?.AsValue().GetValue<double>(),
+                ScaleId = p["scale_id"]?.AsValue().GetValue<string>(),
+                WeighingId = p["weighing_id"]?.AsValue().GetValue<string>(),
+                WeighingReason = p["weighing_reason"]?.AsValue().GetValue<string>(),
+            }).ToList(), json["parts"]!.AsArray().SelectMany(p => p!["modids"]!.AsArray().Select(m => new DeliveryPartModifier {
+                Year = year,
+                DId = did,
+                DPNr = p["dpnr"]!.AsValue().GetValue<int>(),
+                ModId = m!.AsValue().GetValue<string>(),
+            })).ToList());
+        }
+    }
+}

Elwig/Helpers/Export/Ods.cs

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

Elwig/Helpers/ExportMode.cs

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

Elwig/Helpers/Extensions.cs

@@ -0,0 +1,99 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers {
+    static partial class Extensions {
+
+        [LibraryImport("msvcrt.dll")]
+        [UnmanagedCallConv(CallConvs = [typeof(System.Runtime.CompilerServices.CallConvCdecl)])]
+        private static unsafe partial int memcmp(void* b1, void* b2, long count);
+
+        public static unsafe int CompareBuffers(char[] buffer1, int offset1, char[] buffer2, int offset2, int count) {
+            fixed (char* b1 = buffer1, b2 = buffer2) {
+                return memcmp(b1 + offset1, b2 + offset2, count);
+            }
+        }
+
+        public static string? ReadUntil(this StreamReader reader, string delimiter) {
+            return ReadUntil(reader, delimiter.ToCharArray());
+        }
+
+        public static string? ReadUntil(this StreamReader reader, char delimiter) {
+            return ReadUntil(reader, new char[] { delimiter });
+        }
+
+        public static string? ReadUntil(this StreamReader reader, char[] delimiter) {
+            var buf = new char[512];
+            int bufSize = 0, ret;
+            while (!reader.EndOfStream && bufSize < buf.Length - 1) {
+                if ((ret = reader.Read()) == -1)
+                    return null;
+                buf[bufSize++] = (char)ret;
+
+                if (bufSize >= delimiter.Length && CompareBuffers(buf, bufSize - delimiter.Length, delimiter, 0, delimiter.Length) == 0)
+                    return new string(buf, 0, bufSize);
+            }
+            return null;
+        }
+
+        public static Task<string?> ReadUntilAsync(this StreamReader reader, string delimiter) {
+            return ReadUntilAsync(reader, delimiter.ToCharArray());
+        }
+
+        public static Task<string?> ReadUntilAsync(this StreamReader reader, char delimiter) {
+            return ReadUntilAsync(reader, new char[] { delimiter });
+        }
+
+        public static async Task<string?> ReadUntilAsync(this StreamReader reader, char[] delimiter) {
+            var buf = new char[512];
+            int bufSize = 0;
+            var tmpBuf = new char[1];
+            while (!reader.EndOfStream && bufSize < buf.Length - 1) {
+                if ((await reader.ReadAsync(tmpBuf, 0, 1)) != 1)
+                    return null;
+                buf[bufSize++] = tmpBuf[0];
+
+                if (bufSize >= delimiter.Length && CompareBuffers(buf, bufSize - delimiter.Length, delimiter, 0, delimiter.Length) == 0)
+                    return new string(buf, 0, bufSize);
+            }
+            return null;
+        }
+
+        public static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress<long>? progress = null, CancellationToken cancellationToken = default) {
+            ArgumentNullException.ThrowIfNull(source);
+            if (!source.CanRead) throw new ArgumentException("Has to be readable", nameof(source));
+            ArgumentNullException.ThrowIfNull(destination);
+            if (!destination.CanWrite) throw new ArgumentException("Has to be writable", nameof(destination));
+            ArgumentOutOfRangeException.ThrowIfNegative(bufferSize);
+
+            var buffer = new byte[bufferSize];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await source.ReadAsync(buffer, cancellationToken).ConfigureAwait(false)) != 0) {
+                await destination.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken).ConfigureAwait(false);
+                totalBytesRead += bytesRead;
+                progress?.Report(totalBytesRead);
+            }
+        }
+
+        public static async Task DownloadAsync(this HttpClient client, string requestUri, Stream destination, IProgress<double>? progress = null, CancellationToken cancellationToken = default) {
+            using var response = await client.GetAsync(requestUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+            response.EnsureSuccessStatusCode();
+            var contentLength = response.Content.Headers.ContentLength;
+
+            using var download = await response.Content.ReadAsStreamAsync(cancellationToken);
+            if (progress == null || !contentLength.HasValue) {
+                await download.CopyToAsync(destination, cancellationToken);
+                return;
+            }
+
+            var relativeProgress = new Progress<long>(totalBytes => progress.Report((double)totalBytes / contentLength.Value));
+            await download.CopyToAsync(destination, 81920, relativeProgress, cancellationToken);
+            progress.Report(100.0);
+        }
+    }
+}

Elwig/Helpers/Printing/Pdf.cs

@@ -7,6 +7,8 @@ using System.Collections.Generic;
 using System.Windows;
 using System.Text.RegularExpressions;
 using System.Linq;
+using System.Net.Sockets;
+using System.Text;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
@@ -14,54 +16,64 @@ namespace Elwig.Helpers.Printing {
         private static readonly string PdfToPrinter = new string[] { App.ExePath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "PDFtoPrinter.exe"))
-            .Where(x => File.Exists(x))
+            .Where(File.Exists)
             .FirstOrDefault() ?? throw new FileNotFoundException("PDFtoPrinter executable not found");
         private static readonly string WinziPrint = new string[] { App.ExePath }
             .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
             .Select(x => Path.Combine(x, "WinziPrint.exe"))
-            .Where(x => File.Exists(x))
+            .Where(File.Exists)
             .FirstOrDefault() ?? throw new FileNotFoundException("WiniPrint executable not found");
         private static Process? WinziPrintProc;
         public static bool IsReady => WinziPrintProc != null;
 
         public static async Task Init(Action? evtHandler = null) {
+            // NOTE: If the WinziPrint daemon is already running this will succeed, but the process will fail.
+            //       Should be no problem, as long as the daemon is not closed
             var p = new Process() { StartInfo = new() {
                 FileName = WinziPrint,
                 CreateNoWindow = true,
                 UseShellExecute = false,
-                RedirectStandardInput = true,
-                RedirectStandardOutput = 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("-d");
             p.StartInfo.ArgumentList.Add(App.TempPath);
-            p.StartInfo.ArgumentList.Add("-");
             p.Start();
+            await p.StandardOutput.ReadLineAsync();
             WinziPrintProc = p;
             evtHandler?.Invoke();
         }
 
-        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 Task Cleanup() {
+            WinziPrintProc?.Kill(true);
+            WinziPrintProc?.Close();
+            return Task.CompletedTask;
         }
 
-        public static async Task<IEnumerable<int>> Convert(IEnumerable<string> htmlPath, string pdfPath, bool doubleSided = false, IProgress<double>? progress = null) {
+        public static async Task<(int Pages, IEnumerable<int> PerDoc)> Convert(string htmlPath, string pdfPath, bool doublePaged = false, IProgress<double>? progress = null) {
+            return await Convert([htmlPath], pdfPath, doublePaged, progress);
+        }
+
+        public static async Task<(int Pages, IEnumerable<int> PerDoc)> Convert(IEnumerable<string> htmlPath, string pdfPath, bool doublePaged = 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}");
+            using var client = new TcpClient("127.0.0.1", 30983);
+            using var stream = client.GetStream();
+            await stream.WriteAsync(Utils.UTF8.GetBytes(
+                "-e utf-8;-p;" + (doublePaged ? "-2;" : "") +
+                $"{string.Join(';', htmlPath)};{pdfPath}" +
+                "\r\n"));
+            using var reader = new StreamReader(stream);
             while (true) {
-                var line = await WinziPrintProc.StandardOutput.ReadLineAsync() ?? throw new IOException("Invalid response from WinziPrint");
+                var line = await reader.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>();
+                    throw new IOException($"WinziPrint: {line[6..].Trim()}");
                 } 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);
+                    var m = Regex.Match(line, @"([0-9]+) pages \(([0-9, ]+)\)");
+                    return (int.Parse(m.Groups[1].Value), m.Groups[2].Value.Split(", ").Select(int.Parse).ToList());
                 }
             }
         }

Elwig/Helpers/Utils.cs

@@ -11,9 +11,23 @@ using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
 using Elwig.Models.Entities;
-using System.IO;
-using ScottPlot.TickGenerators.TimeUnits;
 using Elwig.Helpers.Billing;
+using System.Runtime.InteropServices;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.IO;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+using System.Collections;
+using Elwig.Documents;
+using MimeKit;
+using System.Windows.Input;
+using LinqKit;
+using System.Linq.Expressions;
+using Elwig.Models;
+using Microsoft.Win32;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -23,32 +37,36 @@ namespace Elwig.Helpers {
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
+        public static int FollowingSeason => DateTime.Now.Year + (DateTime.Now.Month >= 11 ? 1 : 0);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
-        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();
+        public static readonly Regex SerialRegex = GeneratedSerialRegex();
 
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
+        public static readonly Regex TcpRegex = 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();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();
+        public static readonly Regex FromToRegex = GeneratedFromToRegex();
 
         [GeneratedRegex(@"^([0-9]{1,2}:[0-9]{2})?-([0-9]{1,2}:[0-9]{2})?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToTimeRegex();
+        public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
 
         [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedAddressRegex();
+        public static readonly Regex AddressRegex = GeneratedAddressRegex();
+
+        [GeneratedRegex(@"[^A-Za-z0-9ÄÜÖẞäöüß-]+")]
+        private static partial Regex GeneratedInvalidFileNamePartsRegex();
+        public static readonly Regex InvalidFileNamePartsRegex = GeneratedInvalidFileNamePartsRegex();
 
         public static readonly string GroupSeparator = "\u202F";
         public static readonly string UnitSeparator = "\u00A0";
@@ -63,7 +81,9 @@ namespace Elwig.Helpers {
             return PhoneNrTypes.Where(t => t.Key == type).Select(t => t.Value).FirstOrDefault(type);
         }
 
-        private static readonly ushort[] Crc16ModbusTable = {
+        private static readonly string[] TempWildcards = ["*.html", "*.pdf", "*.exe", "*.zip"];
+
+        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,
@@ -96,7 +116,7 @@ namespace Elwig.Helpers {
             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 = SerialRegex.Match(connection);
@@ -308,7 +328,7 @@ namespace Elwig.Helpers {
                 > 0 => "+",
             };
 
-        public static double AggregateDeliveryPartsKmw(IEnumerable<DeliveryPart> parts)
+        public static double AggregateDeliveryPartsKmw(IEnumerable<IDelivery> parts)
             => parts.Aggregate(
                 (Weight: 0, Kmw: 0.0),
                 (sum, item) => (
@@ -329,7 +349,7 @@ namespace Elwig.Helpers {
 
         public static (string, string?) SplitName(string fullName, string? familyName) {
             if (familyName == null || familyName == "") return (fullName, null);
-            var p0 = fullName.ToLower().IndexOf(familyName.ToLower());
+            var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
             if (p0 == -1) return (fullName, null);
             var p1 = fullName.IndexOf(" und ");
             var p2 = fullName.ToLower().LastIndexOf(" und ");
@@ -348,9 +368,9 @@ namespace Elwig.Helpers {
         }
 
         public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
-            HashSet<IEnumerable<T>> output = new();
+            HashSet<IEnumerable<T>> output = [];
             for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
-                List<T> t = new();
+                List<T> t = [];
                 for (int j = 0; j < 30; j++) {
                     var e = input.ElementAtOrDefault(j);
                     if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
@@ -362,11 +382,11 @@ namespace Elwig.Helpers {
             return output.OrderByDescending(l => l.Count());
         }
 
-        public static List<string> GetVaributes(AppDbContext ctx, int year, bool withSlash = false, bool onlyDelivered = true) {
-            var varieties = ctx.WineVarieties.Select(v => v.SortId).ToList();
+        public static List<RawVaribute> GetVaributes(AppDbContext ctx, int year, bool onlyDelivered = true) {
+            var varieties = ctx.WineVarieties.Select(v => new RawVaribute(v.SortId, "", null)).ToList();
             var delivered = ctx.DeliveryParts
                .Where(d => d.Year == year)
-               .Select(d => $"{d.SortId}{(withSlash ? "/" : "")}{d.AttrId}")
+               .Select(d => new RawVaribute(d.SortId, d.AttrId ?? "", d.CultId ?? ""))
                .Distinct()
                .ToList();
             return [.. (onlyDelivered ? delivered : delivered.Union(varieties)).Order()];
@@ -375,9 +395,169 @@ namespace Elwig.Helpers {
         public static List<Varibute> GetVaributeList(AppDbContext ctx, int year, bool onlyDelivered = true) {
             var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
             var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-            return GetVaributes(ctx, year, false, onlyDelivered)
-                .Select(s => new Varibute(varieties[s[..2]], s.Length > 2 ? attributes[s[2..]] : null))
+            var cultivations = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c);
+            return GetVaributes(ctx, year, onlyDelivered)
+                .Select(s => new Varibute(s, varieties, attributes, cultivations))
                 .ToList();
         }
+
+        [LibraryImport("wininet.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool InternetGetConnectedState(out int description, int reservedValue);
+
+        public static bool HasInternetConnectivity() {
+            return InternetGetConnectedState(out var _, 0);
+        }
+
+        public static HttpClient GetHttpClient(string? username = null, string? password = null, string? accept = null) {
+            var client = new HttpClient() {
+                Timeout = TimeSpan.FromSeconds(5),
+            };
+            client.DefaultRequestHeaders.Accept.Clear();
+            if (accept != null)
+                client.DefaultRequestHeaders.Accept.Add(new(accept));
+            if (username != null || password != null)
+                client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
+                    Utils.UTF8.GetBytes($"{username}:{password}")));
+            return client;
+        }
+
+        public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string url) {
+            try {
+                using var client = GetHttpClient(accept: "application/json");
+                var resJson = JsonNode.Parse(await client.GetStringAsync(url));
+                var data = resJson!["data"]![0]!;
+                return ((string)data["version"]!, (string)data["url"]!, (long)data["size"]!);
+            } catch {
+                return null;
+            }
+        }
+
+        public static async Task UploadExportData(string zip, string url, string username, string password) {
+            if (!url.EndsWith('/')) url += "/";
+            using var client = GetHttpClient(username, password, accept: "application/json");
+            var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
+            content.Headers.ContentType = new("application/zip");
+            using var res = await client.PutAsync(url + Path.GetFileName(zip), content);
+            res.EnsureSuccessStatusCode();
+        }
+
+        public static async Task<JsonArray> GetExportMetaData(string url, string username, string password) {
+            using var client = GetHttpClient(username, password, accept: "application/json");
+            using var res = await client.GetAsync(url);
+            res.EnsureSuccessStatusCode();
+            var resJson = JsonNode.Parse(await res.Content.ReadAsStringAsync());
+            var data = resJson!["data"]!;
+            return data.AsArray();
+        }
+
+        public static void CleanupTempFiles() {
+            var dir = new DirectoryInfo(App.TempPath);
+            foreach (var file in TempWildcards.SelectMany(dir.EnumerateFiles)) {
+                file.Delete();
+            }
+        }
+
+        public static string NormalizeFileName(string filename) {
+            return InvalidFileNamePartsRegex.Replace(filename.Replace('/', '-'), "_");
+        }
+
+        public static async Task<SmtpClient?> GetSmtpClient() {
+            if (App.Config.Smtp == null)
+                return null;
+            var (host, port, mode, username, password, _) = App.Config.Smtp.Value;
+            var client = new SmtpClient();
+            await client.ConnectAsync(host, port, mode == "starttls" ? SecureSocketOptions.StartTls : SecureSocketOptions.None);
+            await client.AuthenticateAsync(username, password);
+            return client;
+        }
+
+        public static async Task<bool> SendEmail(Member member, string subject, string text, IEnumerable<Document> docs) {
+            if (App.Config.Smtp == null)
+                return false;
+
+            SmtpClient? client = null;
+            try {
+                Mouse.OverrideCursor = Cursors.AppStarting;
+                client = await GetSmtpClient();
+
+                using var msg = new MimeMessage();
+                msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                msg.To.AddRange(member.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(member.AdministrativeName, a.Address)));
+                msg.Subject = subject;
+                var body = new Multipart("mixed") {
+                    new TextPart("plain") { Text = text }
+                };
+                foreach (var doc in docs) {
+                    var name = NormalizeFileName(doc.Title);
+                    body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                }
+                msg.Body = body;
+                await client!.SendAsync(msg);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                return false;
+            } finally {
+                if (client != null)
+                    await client.DisconnectAsync(true);
+                client?.Dispose();
+                Mouse.OverrideCursor = null;
+            }
+            return true;
+        }
+
+        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
+            if (mode == ExportMode.Print && !App.Config.Debug) {
+                await doc.Generate();
+                await doc.Print();
+            } else if (mode == ExportMode.Email && emailData is (Member, string, string) e) {
+                await doc.Generate();
+                var success = await SendEmail(e.Item1, e.Item2, e.Item3, [doc]);
+                if (success)
+                    MessageBox.Show("Die E-Mail wurde erfolgreich verschickt!", "E-Mail verschickt",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
+            } else if (mode == ExportMode.SavePdf) {
+                var d = new SaveFileDialog() {
+                    FileName = $"{NormalizeFileName(filename ?? doc.Title)}.pdf",
+                    DefaultExt = "pdf",
+                    Filter = "PDF-Datei (*.pdf)|*.pdf",
+                    Title = $"{doc.Title} speichern unter - Elwig"
+                };
+                if (d.ShowDialog() == true) {
+                    await doc.Generate();
+                    doc.SaveTo(d.FileName);
+                    Process.Start("explorer.exe", d.FileName);
+                }
+            } else {
+                await doc.Generate();
+                doc.Show();
+            }
+        }
+
+        public static int? GetEntityIdentifier(object? obj) {
+            if (obj == null) {
+                return null;
+            } else if (obj is IEnumerable list && obj is not string) {
+                var arr = list.Cast<object>().Select(GetEntityIdentifier).ToArray();
+                return ((IStructuralEquatable)arr).GetHashCode(EqualityComparer<int?>.Default);
+            } else if (obj.GetType().GetCustomAttribute(typeof(PrimaryKeyAttribute), true) is PrimaryKeyAttribute pkAttr) {
+                var pk = pkAttr.PropertyNames.Select(name => obj.GetType().GetProperty(name)!.GetValue(obj)?.GetHashCode() ?? 0).ToArray();
+                return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
+            } else {
+                return obj.GetHashCode();
+            }
+        }
+
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
+        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int yearTo) =>
+            c => (c.YearFrom <= yearTo) && (c.YearTo == null || c.YearTo >= yearTo);
+
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int yearTo) =>
+            query.Where(ActiveAreaCommitments(yearTo));
+
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
+        public static IEnumerable<AreaCom> ActiveAreaCommitments(IEnumerable<AreaCom> query, int yearTo) =>
+            query.Where(c => ActiveAreaCommitments(yearTo).Invoke(c));
     }
 }

Elwig/Helpers/Validator.cs

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

Elwig/Helpers/Weighing/AveryEventScale.cs

@@ -0,0 +1,90 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elwig.Helpers.Weighing {
+    public class AveryEventScale : Scale, IEventScale, IDisposable {
+
+        public string Manufacturer => "Avery";
+        public int InternalScaleNr => 1;
+        public string Model { get; private set; }
+        public string ScaleId { get; private set; }
+        public bool IsReady { get; private set; }
+        public bool HasFillingClearance { get; private set; }
+
+        public event IEventScale.EventHandler<WeighingEventArgs> WeighingEvent;
+
+        private bool IsRunning = true;
+        private readonly Thread BackgroundThread;
+
+        public AveryEventScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+            base(cnx, empty, filling, limit, log) {
+            ScaleId = id;
+            Model = model;
+            IsReady = true;
+            HasFillingClearance = false;
+            Stream.WriteTimeout = -1;
+            Stream.ReadTimeout = -1;
+            BackgroundThread = new Thread(new ParameterizedThreadStart(BackgroundLoop));
+            BackgroundThread.Start();
+        }
+
+        protected virtual void RaiseWeighingEvent(WeighingEventArgs evt) {
+            WeighingEvent?.Invoke(this, evt);
+        }
+
+        public new void Dispose() {
+            IsRunning = false;
+            BackgroundThread.Interrupt();
+            BackgroundThread.Join();
+            base.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        protected async void BackgroundLoop(object? parameters) {
+            while (IsRunning) {
+                try {
+                    var data = await Receive();
+                    if (data != null)
+                        RaiseWeighingEvent(new WeighingEventArgs(data.Value));
+                } catch (Exception ex) {
+                    MessageBox.Show($"Beim Wiegen ist ein Fehler Aufgetreten:\n\n{ex.Message}", "Waagenfehler",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+        }
+
+        protected async Task<WeighingResult?> Receive() {
+            var line = await Reader.ReadUntilAsync("\r\n");
+            if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
+            if (line == null || line == "") {
+                return null;
+            } else if (line.Length != 35 || line[0] != ' ' || line[9] != ' ' || line[15] != ' ' || line[20] != ' ' || line[32] != ' ') {
+                throw new IOException($"Invalid event from scale: '{line}'");
+            }
+
+            var date    = line[ 1.. 9];
+            var time    = line[10..15];
+            var identNr = line[16..20].Trim();
+            var netto   = line[21..30].Trim();
+            var unit    = line[30..32];
+
+            if (unit != "kg") {
+                throw new IOException($"Unsupported unit in weighing event: '{unit}'");
+            }
+
+            identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
+            var parsedDate = DateOnly.Parse(date);
+            return new() {
+                Weight = int.Parse(netto),
+                WeighingId = identNr,
+                FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null,
+                Date = parsedDate,
+                Time = TimeOnly.Parse(time),
+            };
+        }
+    }
+}

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -1,15 +1,11 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Ports;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class GassnerScale : IScale {
-
-        protected SerialPort Serial = null;
-        protected StreamReader Reader;
-        protected StreamWriter Writer;
+    public class GassnerScale : Scale, ICommandScale {
 
         public string Manufacturer => "Gassner";
         public int InternalScaleNr => 1;
@@ -17,48 +13,110 @@ namespace Elwig.Helpers.Weighing {
         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(string id, string model, string connection) {
+        public GassnerScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+          base(cnx, empty, filling, limit, log) {
             ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
-
-            if (!connection.StartsWith("serial:"))
-                throw new ArgumentException("Unsupported scheme");
-
-            Serial = Utils.OpenSerialConnection(connection);
-            Writer = new(Serial.BaseStream, Encoding.ASCII, -1, true);
-            Reader = new(Serial.BaseStream, Encoding.ASCII, false, -1, true);
+            Stream.WriteTimeout = 250;
+            Stream.ReadTimeout = 11000;
         }
 
-        public void Dispose() {
-            Writer.Close();
-            Reader.Close();
-            Serial.Close();
-            GC.SuppressFinalize(this);
+        protected Task SendCommand(char command) => SendCommand(Convert.ToByte(command));
+
+        protected async Task SendCommand(byte command) {
+            byte[] cmd = [command];
+            await Stream.WriteAsync(cmd);
+            if (LogPath != null) await File.AppendAllTextAsync(LogPath, Encoding.ASCII.GetString(cmd));
         }
 
-        public async Task<WeighingResult> Weigh(bool incIdentNr) {
-            await Writer.WriteAsync(incIdentNr ? "\x05" : "?");
-            // TODO receive response
-            return new();
+        protected async Task<string> ReceiveResponse() {
+            var line = await Reader.ReadUntilAsync('\x03');
+            if (LogPath != null) await File.AppendAllTextAsync(LogPath, $"{line}\r\n");
+            if (line == null || line.Length < 4 || !line.StartsWith('\x02')) {
+                throw new IOException("Invalid response from scale");
+            }
+
+            var status = line[1..3];
+            if (status[0] == 'E' || status[1] != 'S') {
+                string msg = $"Unbekannter Fehler (Fehler code {status})";
+                switch (status[1]) {
+                    case 'M': msg = "Waage in Bewegung"; break;
+                }
+                throw new IOException($"Waagenfehler {status}: {msg}");
+            } else if (status[0] != ' ') {
+                throw new IOException($"Invalid response from scale (error code {status})");
+            }
+
+            return line[1..^1];
         }
 
-        public async Task<WeighingResult> GetCurrentWeight() {
-            return await Weigh(false);
+        protected async Task<WeighingResult> Weigh(bool incIdentNr) {
+            await SendCommand(incIdentNr ? '\x05' : '?');
+            string record = await ReceiveResponse();
+            if (record.Length != 45)
+                throw new IOException("Invalid response from scale: Received record has invalid size");
+            var line = record[2..];
+
+            var status  = line[ 0.. 2];
+            var brutto  = line[ 2.. 9].Trim();
+            var tara    = line[ 9..16].Trim();
+            var netto   = line[16..23].Trim();
+            var scaleNr = line[23..25].Trim();
+            var identNr = line[25..31].Trim();
+            var date    = line[31..39];
+            var time    = line[39..45];
+
+            identNr = identNr.Length > 0 && identNr != "0" ? identNr : null;
+            var parsedDate = DateOnly.ParseExact(date, "yyyyMMdd");
+            return new() {
+                Weight = int.Parse(netto),
+                WeighingId = identNr,
+                FullWeighingId = identNr,
+                Date = parsedDate,
+                Time = TimeOnly.ParseExact(time, "HHmmss"),
+            };
         }
 
         public async Task<WeighingResult> Weigh() {
             return await Weigh(true);
         }
 
-        public async Task Empty() { }
+        public async Task<WeighingResult> GetCurrentWeight() {
+            return await Weigh(false);
+        }
 
-        public async Task GrantFillingClearance() { }
+        public async Task Empty() {
+            SerialPort? p = ControlSerialEmpty ?? Serial;
+            if (EmptyMode == Output.RTS && p != null) {
+                p.RtsEnable = true;
+                await Task.Delay(EmptyDelay);
+                p.RtsEnable = false;
+            } else if (EmptyMode == Output.DTR && p != null) {
+                p.DtrEnable = true;
+                await Task.Delay(EmptyDelay);
+                p.DtrEnable = false;
+            }
+        }
 
-        public async Task RevokeFillingClearance() { }
+        protected Task SetFillingClearance(bool status) {
+            SerialPort? p = ControlSerialFilling ?? Serial;
+            if (FillingClearanceMode == Output.RTS && p != null) {
+                p.RtsEnable = status;
+            } else if (FillingClearanceMode == Output.DTR && p != null) {
+                p.DtrEnable = status;
+            }
+            return Task.CompletedTask;
+        }
+
+        public async Task GrantFillingClearance() {
+            await SetFillingClearance(true);
+        }
+
+        public async Task RevokeFillingClearance() {
+            await SetFillingClearance(false);
+        }
     }
 }

Elwig/Helpers/Weighing/IEventScale.cs

@@ -4,5 +4,8 @@
     /// </summary>
     public interface IEventScale : IScale {
 
+        public event EventHandler<WeighingEventArgs> WeighingEvent;
+
+        delegate void EventHandler<WeighingEventArgs>(object sender, WeighingEventArgs args);
     }
 }

Elwig/Helpers/Weighing/Scale.cs

@@ -0,0 +1,101 @@
+using System.IO.Ports;
+using System.IO;
+using System.Net.Sockets;
+using System;
+using System.Text;
+
+namespace Elwig.Helpers.Weighing {
+    public abstract class Scale : IDisposable {
+
+        protected enum Output { RTS, DTR, OUT1, OUT2 };
+
+        protected SerialPort? Serial = null;
+        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
+        protected TcpClient? Tcp = null;
+        protected Stream Stream;
+        protected StreamReader Reader;
+
+        protected readonly Output? EmptyMode = null;
+        protected readonly Output? FillingClearanceMode = null;
+        protected readonly int EmptyDelay;
+
+        public int? WeightLimit { get; private set; }
+        public string? LogPath { get; private set; }
+
+        public static IScale FromConfig(ScaleConfig config) {
+            int? limit = config.Limit != null ? int.Parse(config.Limit) : null;
+            if (config.Type == "SysTec-IT") {
+                return new SysTecITScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
+            } else if (config.Type == "Avery-Async") {
+                return new AveryEventScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
+            } else if (config.Type == "Gassner") {
+                return new GassnerScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
+            } else {
+                throw new ArgumentException($"Invalid scale type: \"{config.Type}\"");
+            }
+        }
+
+        protected Scale(string cnx, string? empty, string? filling, int? limit, string? log) {
+            if (cnx.StartsWith("serial:")) {
+                Serial = Utils.OpenSerialConnection(cnx);
+                Stream = Serial.BaseStream;
+            } else if (cnx.StartsWith("tcp:")) {
+                Tcp = Utils.OpenTcpConnection(cnx);
+                Stream = Tcp.GetStream();
+            } else {
+                throw new ArgumentException($"Unsupported scheme: \"{cnx.Split(':')[0]}\"");
+            }
+            Reader = new(Stream, Encoding.ASCII, false, 512);
+
+            LogPath = log;
+
+            if (empty != null) {
+                var parts = empty.Split(':');
+                if (parts.Length == 3) {
+                    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]);
+            }
+
+            WeightLimit = limit;
+            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() {
+            Reader.Close();
+            Stream.Close();
+            Serial?.Close();
+            ControlSerialEmpty?.Close();
+            ControlSerialFilling?.Close();
+            Tcp?.Close();
+            GC.SuppressFinalize(this);
+        }
+
+        protected static Output? ConvertOutput(string? value) {
+            return value switch {
+                null => null,
+                "RTS" => Output.RTS,
+                "DTR" => Output.DTR,
+                "OUT1" => Output.OUT1,
+                "OUT2" => Output.OUT2,
+                _ => throw new ArgumentException($"Invalid value for argument: '{value}'"),
+            };
+        }
+    }
+}

Elwig/Helpers/Weighing/SchemberScale.cs

@@ -1,22 +0,0 @@
-using System;
-
-namespace Elwig.Helpers.Weighing {
-    public class SchemberScale : IEventScale {
-
-        public string Manufacturer => "Schember";
-        public string Model => 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/SysTecITScale.cs

@@ -1,23 +1,11 @@
 using System;
 using System.IO;
 using System.IO.Ports;
-using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class SystecScale : ICommandScale {
-
-        protected enum Output { RTS, DTR, OUT1, OUT2 };
-
-        protected SerialPort? Serial = null;
-        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
-        protected TcpClient? Tcp = null;
-        protected Stream Stream;
-
-        protected readonly Output? EmptyMode = null;
-        protected readonly Output? FillingClearanceMode = null;
-        protected readonly int EmptyDelay;
+    public class SysTecITScale : Scale, ICommandScale {
 
         public string Manufacturer => "SysTec";
         public int InternalScaleNr => 1;
@@ -25,72 +13,15 @@ namespace Elwig.Helpers.Weighing {
         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(string id, string model, string connection, string? empty = null, string? filling = null, int? limit = null, string? log = null) {
+        public SysTecITScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+            base(cnx, empty, filling, limit, log) {
             ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
-            LogPath = log;
-
-            if (connection.StartsWith("serial:")) {
-                Serial = Utils.OpenSerialConnection(connection);
-                Stream = Serial.BaseStream;
-            } else if (connection.StartsWith("tcp:")) {
-                Tcp = Utils.OpenTcpConnection(connection);
-                Stream = Tcp.GetStream();
-            } else {
-                throw new ArgumentException("Unsupported scheme");
-            }
-
-            if (empty != null) {
-                var parts = empty.Split(':');
-                if (parts.Length == 3) {
-                    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]);
-            }
-
-            WeightLimit = limit;
-            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() {
-            Stream.Close();
-            Serial?.Close();
-            ControlSerialEmpty?.Close();
-            ControlSerialFilling?.Close();
-            Tcp?.Close();
-            GC.SuppressFinalize(this);
-        }
-
-        protected static Output? ConvertOutput(string? value) {
-            return value switch {
-                null => null,
-                "RTS" => Output.RTS,
-                "DTR" => Output.DTR,
-                "OUT1" => Output.OUT1,
-                "OUT2" => Output.OUT2,
-                _ => throw new ArgumentException($"Invalid value for argument: '{value}'"),
-            };
+            Stream.WriteTimeout = 250;
+            Stream.ReadTimeout = 11000;
         }
 
         protected async Task SendCommand(string command) {
@@ -100,12 +31,9 @@ namespace Elwig.Helpers.Weighing {
         }
 
         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");
-            }
-            if (line == null || line.Length < 4 || !line.StartsWith("<") || !line.EndsWith(">")) {
+            var line = await Reader.ReadUntilAsync("\r\n");
+            if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
+            if (line == null || line.Length < 4 || !line.StartsWith('<') || !line.EndsWith(">\r\n")) {
                 throw new IOException("Invalid response from scale");
             }
 
@@ -137,7 +65,7 @@ namespace Elwig.Helpers.Weighing {
                 throw new IOException($"Invalid response from scale (error code {error})");
             }
 
-            return line[1..^1];
+            return line[1..^3];
         }
 
         protected async Task<WeighingResult> Weigh(bool incIdentNr) {
@@ -151,7 +79,7 @@ namespace Elwig.Helpers.Weighing {
             var date       = line[ 2..10];
             var time       = line[10..15];
             var identNr    = line[15..19].Trim();
-            var scaleNr    = line[19..20];
+            var scaleNr    = line[19..20].Trim();
             var brutto     = line[20..28].Trim();
             var tara       = line[28..36].Trim();
             var netto      = line[36..44].Trim();
@@ -162,7 +90,7 @@ namespace Elwig.Helpers.Weighing {
             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()})");
+                throw new IOException($"Invalid response from scale: Invalid CRC16 checksum ({crc16} != {Utils.CalcCrc16Modbus(record[..54])})");
             } else if (unit != "kg") {
                 throw new IOException($"Unsupported unit in weighing response: '{unit}'");
             }

Elwig/Helpers/Weighing/WeighingEventArgs.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Elwig.Helpers.Weighing {
+    public class WeighingEventArgs : EventArgs {
+
+        public WeighingResult Result { get; set; }
+
+        public WeighingEventArgs(WeighingResult result) {
+            Result = result;
+        }
+    }
+}

Elwig/Helpers/Weighing/WeighingResult.cs

@@ -4,36 +4,38 @@ namespace Elwig.Helpers.Weighing {
     /// <summary>
     /// Result of a weighing process on an industrial scale
     /// </summary>
-    public class WeighingResult {
+    public struct WeighingResult {
         /// <summary>
         /// Measured net weight in kg
         /// </summary>
-        public int? Weight = null;
+        public int? Weight;
 
         /// <summary>
         /// Weighing id (or IdentNr) provided by the scale
         /// </summary>
-        public string? WeighingId = null;
+        public string? WeighingId;
 
         /// <summary>
         /// Wheighing id (or IdentNr) provided by the scale optionally combined with the current date
         /// </summary>
-        public string? FullWeighingId = null;
+        public string? FullWeighingId;
 
         /// <summary>
         /// Date string provided by the scale
         /// </summary>
-        public DateOnly? Date = null;
+        public DateOnly? Date;
 
         /// <summary>
         /// Time string provided by the scale
         /// </summary>
-        public TimeOnly? Time = null;
+        public TimeOnly? Time;
 
         /// <returns>&lt;Weight/WeighingId/Date/Time&gt;</returns>
-        override public string ToString() {
+        public override readonly string ToString() {
             var w = Weight != null ? $"{Weight}kg" : "";
             return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>";
         }
+
+
     }
 }

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

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

Elwig/Models/Dtos/CreditNoteData.cs

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

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

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

Elwig/Models/Dtos/DataTable.cs

@@ -8,6 +8,7 @@ namespace Elwig.Models.Dtos {
 
         public string Name { get; set; }
         public string FullName { get; set; }
+        public string? Subtitle { get; set; }
         public IEnumerable<T> Rows { get; private set; }
         public int RowNum => Rows.Count();
         public int ColNum => ColumnNames.Count();
@@ -24,6 +25,11 @@ namespace Elwig.Models.Dtos {
         private readonly FieldInfo[] _fields;
         private readonly (string, PropertyInfo?, FieldInfo?)[] _map;
 
+        public DataTable(string name, string fullName, string subtitle, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) :
+            this(name, fullName, rows, colNames) {
+            Subtitle = subtitle;
+        }
+
         public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) {
             _fields = typeof(T).GetFields();
             _properties = typeof(T).GetProperties();
@@ -36,7 +42,7 @@ namespace Elwig.Models.Dtos {
                 var elType = type?.GetElementType();
                 return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Select(f => f.FieldType) :
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Select(f => f.FieldType) :
-                       new Type?[] { type };
+                       [type];
             }).ToList();
             ColumnSpans = ColumnTypes.Select(type => {
                 var elType = type?.GetElementType();
@@ -44,7 +50,7 @@ namespace Elwig.Models.Dtos {
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Length : 1;
             }).ToList();
             ColumnWidths = colNames.Select(c => c.Item4).ToList();
-            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? Array.Empty<string?>()).ToList();
+            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? []).ToList();
         }
 
         public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -73,10 +73,12 @@ namespace Elwig.Models.Dtos {
         public int DPNr;
         public string Variety;
         public string? Attribute;
+        public string? Cultivation;
         public string QualityLevel;
         public (double Oe, double Kmw) Gradation;
         public string[] Modifiers;
         public int Weight;
+        public bool IsNetWeight;
         public (string Name, int Value)[] Buckets;
 
         public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
@@ -85,12 +87,14 @@ namespace Elwig.Models.Dtos {
             DPNr = p.DPNr;
             Variety = p.Variety.Name;
             Attribute = p.Attribute?.Name;
+            Cultivation = p.Cultivation?.Name;
             QualityLevel = p.Quality.Name;
             Gradation = (p.Oe, p.Kmw);
             Modifiers = p.Modifiers
                 .Select(m => m.Name)
                 .ToArray();
             Weight = p.Weight;
+            IsNetWeight = p.IsNetWeight;
             Buckets = p.Buckets
                 .Where(b => b.Value > 0)
                 .OrderByDescending(b => b.BktNr)

Elwig/Models/Dtos/DeliveryJournalData.cs

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

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

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

Elwig/Models/Dtos/MemberListData.cs

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

Elwig/Models/Dtos/OverUnderDeliveryData.cs

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

Elwig/Models/Dtos/PaymentVariantSummaryData.cs

@@ -0,0 +1,104 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class PaymentVariantSummaryData : DataTable<PaymentVariantSummaryData.PaymentRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("Type", "Typ", null, 10),
+            ("Variety", "Sorte", null, 40),
+            ("Attribute", "Attribut", null, 20),
+            ("Cultivation", "Bewirt.", null, 20),
+            ("QualityLevel", "Qualitätsstufe", null, 30),
+            ("Oe", "Gradation", "°Oe", 20),
+            ("Ungeb", "ungebunden", "kg|€/kg", 40),
+            ("Geb", "gebunden", "kg|€/kg", 40),
+            ("Amount", "Gesamt", "€", 25),
+        ];
+
+        public record struct PaymentRow(
+            string Type,
+            string Variety,
+            string? Attribute,
+            string? Cultivation,
+            string QualityLevel,
+            double Oe,
+            (int Weight, decimal? Price) Ungeb,
+            (int Weight, decimal? Price) Geb,
+            decimal Amount
+        );
+
+        public PaymentVariantSummaryData(PaymentVar v, IEnumerable<PaymentRow> rows) :
+            base($"{PaymentVariantSummary.Name} {v.Year}", $"{PaymentVariantSummary.Name} Lese {v.Year}", v.Name, rows, FieldNames) {
+        }
+
+        public static async Task<PaymentVariantSummaryData> ForPaymentVariant(PaymentVar v, DbSet<PaymentVariantSummaryRow> table) {
+            return new(v, (await FromDbSet(table, v.Year, v.AvNr))
+                .Select(r => new PaymentRow(r.Type, r.Variety, r.Attribute, r.Cultivation, r.QualityLevel, r.Oe,
+                    (r.WeightUngeb, r.PriceUngeb != null ? Utils.DecFromDb(r.PriceUngeb.Value, v.Season.Precision) : null),
+                    (r.WeightGeb, r.PriceGeb != null ? Utils.DecFromDb(r.PriceGeb.Value, v.Season.Precision) : null),
+                    Utils.DecFromDb(r.Amount, v.Season.Precision)))
+                .ToArray());
+        }
+
+        private static async Task<IEnumerable<PaymentVariantSummaryRow>> FromDbSet(DbSet<PaymentVariantSummaryRow> table, int year, int avnr) {
+            return await table.FromSqlRaw($"""
+                SELECT v.type AS type,
+                       v.name AS variety,
+                       a.name AS attribute,
+                       c.name AS cultivation,
+                       q.name AS quality_level,
+                       ROUND(kmw * (4.54 + 0.022 * kmw)) AS oe,
+                       SUM(IIF(w.discr = '_', w.value, 0)) AS weight_ungeb,
+                       MAX(IIF(w.discr = '_', b.price, NULL)) AS price_ungeb,
+                       SUM(IIF(w.discr != '_', w.value, 0)) AS weight_geb,
+                       MAX(IIF(w.discr != '_', b.price, NULL)) AS price_geb,
+                       SUM(b.amount) AS amount
+                FROM payment_delivery_part_bucket b
+                    LEFT JOIN delivery_part_bucket w ON (w.year, w.did, w.dpnr, w.bktnr) = (b.year, b.did, b.dpnr, b.bktnr)
+                    LEFT JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (b.year, b.did, b.dpnr)
+                    LEFT JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                    LEFT JOIN wine_variety v ON v.sortid = p.sortid
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN wine_cultivation c ON c.cultid = p.cultid
+                    LEFT JOIN wine_quality_level q ON q.qualid = p.qualid
+                WHERE d.year = {year} AND b.avnr = {avnr}
+                GROUP BY variety, attribute, cultivation, q.min_kmw, oe
+                ORDER BY variety, attribute, cultivation, q.min_kmw, oe
+                """).ToListAsync();
+        }
+    }
+
+    [Keyless]
+    public class PaymentVariantSummaryRow {
+        [Column("type")]
+        public required string Type { get; set; }
+        [Column("variety")]
+        public required string Variety { get; set; }
+        [Column("attribute")]
+        public string? Attribute { get; set; }
+        [Column("cultivation")]
+        public string? Cultivation { get; set; }
+        [Column("quality_level")]
+        public required string QualityLevel { get; set; }
+        [Column("oe")]
+        public double Oe { get; set; }
+        [Column("weight_ungeb")]
+        public int WeightUngeb { get; set; }
+        [Column("price_ungeb")]
+        public long? PriceUngeb { get; set; }
+        [Column("weight_geb")]
+        public int WeightGeb { get; set; }
+        [Column("price_geb")]
+        public long? PriceGeb { get; set; }
+        [Column("amount")]
+        public long Amount { get; set; }
+    }
+}

Elwig/Models/Dtos/Transaction.cs

@@ -15,6 +15,7 @@ namespace Elwig.Models.Dtos {
 
         public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
             return variant.Credits
+                .Where(c => c.Member.Iban != null)
                 .OrderBy(c => c.TgNr)
                 .Select(c => new Transaction(c))
                 .ToList();

Elwig/Models/Dtos/WeightBreakdownData.cs

@@ -0,0 +1,58 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class WeightBreakdownData : DataTable<WeightBreakdownRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+            ("Type", "R/W", null, 10),
+            ("SortId", "Sorte", null, 10),
+            ("AttrId", "Attr.", null, 10),
+            ("CultId", "Bewirt.", null, 15),
+            ("QualId", "Qual.", null, 15),
+            ("Geb", "gebunden", null, 20),
+            ("Weight", "Gewicht", "kg", 20),
+        ];
+
+        public WeightBreakdownData(IEnumerable<WeightBreakdownRow> rows, int year, string name) :
+            base(name, $"Sorten-/Qualitätsaufschlüsselung {year}", name, rows, FieldNames) {
+        }
+
+        public static async Task<WeightBreakdownData> ForSeason(DbSet<WeightBreakdownRow> table, int year, Branch? branch = null) {
+            return new(await FromDbSet(table, year, branch?.ZwstId), year, branch?.Name ?? "Gesamt");
+        }
+
+        private static async Task<IEnumerable<WeightBreakdownRow>> FromDbSet(DbSet<WeightBreakdownRow> table, int year, string? zwstid) {
+            zwstid = zwstid == null ? "NULL" : $"'{zwstid}'";
+            return await table.FromSqlRaw($"""
+                SELECT type, sortid, attrid, cultid, v.qualid, geb, SUM(weight) AS weight
+                FROM v_stat_total v
+                    LEFT JOIN wine_quality_level q ON q.qualid = v.qualid
+                WHERE year = {year} AND ({zwstid} IS NULL OR zwstid = {zwstid})
+                GROUP BY type, sortid, attrid, cultid, v.qualid, geb
+                ORDER BY type DESC, sortid, attrid, cultid, q.min_kmw, geb
+                """).ToListAsync();
+        }
+    }
+
+    [Keyless]
+    public class WeightBreakdownRow {
+        [Column("type")]
+        public required string Type { get; set; }
+        [Column("sortid")]
+        public required string SortId { get; set; }
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+        [Column("cultid")]
+        public string? CultId { get; set; }
+        [Column("qualid")]
+        public required string QualId { get; set; }
+        [Column("geb")]
+        public required string Geb { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Models/Dtos/WineQualityStatisticsData.cs

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

Elwig/Models/Entities/AT_Gem.cs

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

Elwig/Models/Entities/AT_Kg.cs

@@ -11,12 +11,12 @@ namespace Elwig.Models.Entities {
         public int Gkz { get; private set; }
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [ForeignKey("Gkz")]
-        public virtual AT_Gem Gem { get; private set; }
+        public virtual AT_Gem Gem { get; private set; } = null!;
 
-        [InverseProperty("AtKg")]
+        [InverseProperty(nameof(WbKg.AtKg))]
         public virtual WbKg? WbKg { get; private set; }
     }
 }

Elwig/Models/Entities/AT_Ort.cs

@@ -14,10 +14,10 @@ namespace Elwig.Models.Entities {
         public int? KgNr { get; private set; }
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [ForeignKey("Gkz")]
-        public virtual AT_Gem Gem { get; private set; }
+        public virtual AT_Gem Gem { get; private set; } = null!;
 
         [ForeignKey("KgNr")]
         public virtual AT_Kg? Kg { get; private set; }

Elwig/Models/Entities/AT_Plz.cs

@@ -9,13 +9,13 @@ namespace Elwig.Models.Entities {
         public int Plz { get; private set; }
 
         [Column("ort")]
-        public string Ort { get; private set; }
+        public string Ort { get; private set; } = null!;
 
         [Column("blnr")]
         public int BlNr { get; private set; }
 
         [Column("type")]
-        public string Type { get; private set; }
+        public string Type { get; private set; } = null!;
 
         [Column("internal")]
         public bool IsInternal { get; private set; }
@@ -26,7 +26,7 @@ namespace Elwig.Models.Entities {
         [Column("po_box")]
         public bool IsPoBox { get; private set; }
 
-        [InverseProperty("AtPlz")]
-        public virtual ISet<AT_PlzDest> Orte { get; private set; }
+        [InverseProperty(nameof(AT_PlzDest.AtPlz))]
+        public virtual ICollection<AT_PlzDest> Orte { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/AT_PlzDest.cs

@@ -15,18 +15,18 @@ namespace Elwig.Models.Entities {
         public int CountryNum { get; private set; }
 
         [Column("id")]
-        public string Id { get; private set;  }
+        public string Id { get; private set; } = null!;
 
         [Column("dest")]
-        public string Dest { get; private set; }
+        public string Dest { get; private set; } = null!;
 
         [ForeignKey("Plz")]
-        public virtual AT_Plz AtPlz { get; private set; }
+        public virtual AT_Plz AtPlz { get; private set; } = null!;
 
         [ForeignKey("Okz")]
-        public virtual AT_Ort Ort { get; private set; }
+        public virtual AT_Ort Ort { get; private set; } = null!;
 
         [ForeignKey("CountryNum")]
-        public virtual Country Country { get; private set; }
+        public virtual Country Country { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/AreaCom.cs

@@ -2,7 +2,6 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models.Entities {
     [Table("area_commitment"), PrimaryKey("FbNr")]
@@ -14,10 +13,10 @@ namespace Elwig.Models.Entities {
         public int MgNr { get; set; }
 
         [Column("vtrgid")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
 
         [Column("cultid")]
-        public string CultId { get; set; }
+        public string? CultId { get; set; }
 
         [Column("area")]
         public int Area { get; set; }
@@ -26,7 +25,7 @@ namespace Elwig.Models.Entities {
         public int KgNr { get; set; }
 
         [Column("gstnr")]
-        public string GstNr { get; set; }
+        public required string GstNr { get; set; }
 
         [Column("rdnr")]
         public int? RdNr { get; set; }
@@ -41,25 +40,24 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [ForeignKey("VtrgId")]
-        public virtual AreaComType AreaComType { get; private set; }
+        public virtual AreaComType AreaComType { get; private set; } = null!;
 
         [ForeignKey("CultId")]
-        public virtual WineCult WineCult { get; private set; }
+        public virtual WineCult? WineCult { get; private set; }
 
         [ForeignKey("KgNr")]
-        public virtual WbKg Kg { get; private set; }
+        public virtual WbKg Kg { get; private set; } = null!;
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
 
         public int SearchScore(IEnumerable<string> keywords) {
-            var list = new string?[] {
-                WineCult.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
-            }.ToList();
-            return Utils.GetSearchScore(list, keywords);
+            return Utils.GetSearchScore([
+                 WineCult?.Name, Kg.AtKg.Name, Rd?.Name, GstNr, Comment,
+            ], keywords);
         }
     }
 }

Elwig/Models/Entities/AreaComType.cs

@@ -7,10 +7,10 @@ namespace Elwig.Models.Entities {
     [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
     public class AreaComType {
         [Column("vtrgid")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
 
         [Column("sortid")]
-        public string SortId { get; set; }
+        public required string SortId { get; set; }
 
         [Column("attrid")]
         public string? AttrId { get; set; }
@@ -46,7 +46,7 @@ namespace Elwig.Models.Entities {
         }
 
         [ForeignKey("SortId")]
-        public virtual WineVar WineVar { get; private set; }
+        public virtual WineVar WineVar { get; private set; } = null!;
 
         [ForeignKey("AttrId")]
         public virtual WineAttr? WineAttr { get; private set; }

Elwig/Models/Entities/BillingAddr.cs

@@ -1,4 +1,3 @@
-using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -9,24 +8,24 @@ namespace Elwig.Models.Entities {
         public int MgNr { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("country")]
         public int CountryNum { get; set; }
 
         [Column("postal_dest")]
-        public string PostalDestId { get; set; }
+        public required string PostalDestId { get; set; }
 
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [ForeignKey("CountryNum")]
-        public virtual Country Country { get; private set; }
+        public virtual Country Country { get; private set; } = null!;
 
         [ForeignKey("CountryNum, PostalDestId")]
-        public virtual PostalDest PostalDest { get; private set; }
+        public virtual PostalDest PostalDest { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Branch.cs

@@ -7,10 +7,10 @@ namespace Elwig.Models.Entities {
     [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]
-        public string ZwstId { get; set; }
+        public required string ZwstId { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("country")]
         public int? CountryNum { get; set; }
@@ -36,7 +36,7 @@ namespace Elwig.Models.Entities {
         [Column("mobile_nr")]
         public string? MobileNr { get; set; }
 
-        [InverseProperty("Branch")]
-        public virtual ISet<Member> Members { get; private set; }
+        [InverseProperty(nameof(Member.Branch))]
+        public virtual ICollection<Member> Members { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/ClientParam.cs

@@ -5,7 +5,7 @@ namespace Elwig.Models.Entities {
     [Table("client_parameter"), PrimaryKey("Param")]
     public class ClientParam {
         [Column("param")]
-        public string Param { get; set; }
+        public required string Param { get; set; }
 
         [Column("value")]
         public string? Value { get; set; }

Elwig/Models/Entities/Country.cs

@@ -9,13 +9,13 @@ namespace Elwig.Models.Entities {
         public int Num { get; private set; }
 
         [Column("alpha2")]
-        public string Alpha2 { get; private set; }
+        public string Alpha2 { get; private set; } = null!;
 
         [Column("alpha3")]
-        public string Alpha3 { get; private set; }
+        public string Alpha3 { get; private set; } = null!;
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [Column("is_visible")]
         public bool IsVisible { get; private set; }

Elwig/Models/Entities/Credit.cs

@@ -94,12 +94,12 @@ namespace Elwig.Models.Entities {
         public DateTime ModifiedTimestamp => DateTimeOffset.FromUnixTimeSeconds(CTime).LocalDateTime;
 
         [ForeignKey("Year, AvNr, MgNr")]
-        public virtual PaymentMember Payment { get; private set; }
+        public virtual PaymentMember Payment { get; private set; } = null!;
 
         [ForeignKey("Year, AvNr")]
-        public virtual PaymentVar Variant { get; private set; }
+        public virtual PaymentVar Variant { get; private set; } = null!;
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Currency.cs

@@ -6,10 +6,10 @@ namespace Elwig.Models.Entities {
     [Table("currency"), PrimaryKey("Code")]
     public class Currency {
         [Column("code")]
-        public string Code { get; private set; }
+        public string Code { get; private set; } = null!;
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [Column("symbol")]
         public string? Symbol { get; private set; }

Elwig/Models/Entities/Delivery.cs

@@ -16,7 +16,7 @@ namespace Elwig.Models.Entities {
         public int DId { get; set; }
 
         [Column("date")]
-        public string DateString { get; set; }
+        public required string DateString { get; set; }
 
         [NotMapped]
         public DateOnly Date {
@@ -43,31 +43,31 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("zwstid")]
-        public string ZwstId { get; set; }
+        public required string ZwstId { get; set; }
 
         [ForeignKey("ZwstId")]
-        public virtual Branch Branch { get; private set; }
+        public virtual Branch Branch { get; private set; } = null!;
 
         [Column("lnr")]
         public int LNr { get; set; }
 
         [Column("lsnr")]
-        public string LsNr { get; set; }
+        public required string LsNr { get; set; }
 
         [Column("mgnr")]
         public int MgNr { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [Column("comment")]
         public string? Comment { get; set; }
 
         [ForeignKey("Year")]
-        public virtual Season Season { get; private set; }
+        public virtual Season Season { get; private set; } = null!;
 
-        [InverseProperty("Delivery")]
-        public virtual ISet<DeliveryPart> Parts { get; private set; }
+        [InverseProperty(nameof(DeliveryPart.Delivery))]
+        public virtual ICollection<DeliveryPart> Parts { get; private set; } = null!;
         [NotMapped]
         public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
 
@@ -85,10 +85,22 @@ namespace Elwig.Models.Entities {
             .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
             .Select(g => g.Key);
-
         public string SortIdString => string.Join(", ", SortIds);
         public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
+        public IEnumerable<string> Modifiers => Parts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public IEnumerable<string> FilteredModifiers => FilteredParts
+            .SelectMany(p => p.Modifiers)
+            .Select(m => m.Name)
+            .Distinct()
+            .Order();
+        public string ModifiersString => string.Join(" / ", Modifiers);
+        public string FilteredModifiersString => string.Join(" / ", FilteredModifiers);
+
         public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
         public double FilteredKmw => Utils.AggregateDeliveryPartsKmw(FilteredParts);
 

Elwig/Models/Entities/DeliveryPart.cs

@@ -6,7 +6,7 @@ using System.Linq;
 
 namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
-    public class DeliveryPart {
+    public class DeliveryPart : IDelivery {
         [Column("year")]
         public int Year { get; set; }
 
@@ -14,16 +14,16 @@ namespace Elwig.Models.Entities {
         public int DId { get; set; }
 
         [ForeignKey("Year, DId")]
-        public virtual Delivery Delivery { get; private set; }
+        public virtual Delivery Delivery { get; private set; } = null!;
 
         [Column("dpnr")]
         public int DPNr { get; set; }
 
         [Column("sortid")]
-        public string SortId { get; set; }
+        public required string SortId { get; set; }
 
         [ForeignKey("SortId")]
-        public virtual WineVar Variety { get; private set; }
+        public virtual WineVar Variety { get; private set; } = null!;
 
         [Column("attrid")]
         public string? AttrId { get; set; }
@@ -31,6 +31,12 @@ namespace Elwig.Models.Entities {
         [ForeignKey("AttrId")]
         public virtual WineAttr? Attribute { get; private set; }
 
+        [Column("cultid")]
+        public string? CultId { get; set; }
+
+        [ForeignKey("CultId")]
+        public virtual WineCult? Cultivation { get; private set; }
+
         [Column("weight")]
         public int Weight { get; set; }
 
@@ -43,16 +49,16 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("qualid")]
-        public string QualId { get; set; }
+        public required string QualId { get; set; }
 
         [ForeignKey("QualId")]
-        public virtual WineQualLevel Quality { get; private set; }
+        public virtual WineQualLevel Quality { get; private set; } = null!;
 
         [Column("hkid")]
-        public string HkId { get; set; }
+        public required string HkId { get; set; }
 
         [ForeignKey("HkId")]
-        public virtual WineOrigin Origin { get; private set; }
+        public virtual WineOrigin Origin { get; private set; } = null!;
 
         [Column("kgnr")]
         public int? KgNr { get; set; }
@@ -66,14 +72,14 @@ namespace Elwig.Models.Entities {
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
 
-        [Column("gerebelt")]
-        public bool IsGerebelt { get; set; }
+        [Column("net_weight")]
+        public bool IsNetWeight { get; set; }
 
         [Column("manual_weighing")]
-        public bool ManualWeighing { get; set; }
+        public bool IsManualWeighing { get; set; }
 
         [Column("spl_check")]
-        public bool SplCheck { get; set; }
+        public bool IsSplCheck { get; set; }
 
         [Column("hand_picked")]
         public bool? IsHandPicked { get; set; }
@@ -102,19 +108,19 @@ namespace Elwig.Models.Entities {
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
+        [InverseProperty(nameof(DeliveryPartModifier.Part))]
+        public virtual ICollection<DeliveryPartModifier> PartModifiers { get; private set; } = null!;
 
         [NotMapped]
         public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 
-        [InverseProperty("DeliveryPart")]
+        [InverseProperty(nameof(PaymentDeliveryPart.DeliveryPart))]
         public virtual PaymentDeliveryPart? Payment { get; private set; }
 
         [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
+        [InverseProperty(nameof(DeliveryPartBucket.Part))]
+        public virtual ICollection<DeliveryPartBucket> Buckets { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/DeliveryPartBucket.cs

@@ -17,12 +17,12 @@ namespace Elwig.Models.Entities {
         public int BktNr { get; set; }
 
         [Column("discr")]
-        public string Discr { get; set; }
+        public required string Discr { get; set; }
 
         [Column("value")]
         public int Value { get; set; }
 
         [ForeignKey("Year, DId, DPNr")]
-        public virtual DeliveryPart Part { get; private set; }
+        public virtual DeliveryPart Part { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/DeliveryPartModifier.cs

@@ -14,12 +14,12 @@ namespace Elwig.Models.Entities {
         public int DPNr { get; set; }
 
         [ForeignKey("Year, DId, DPNr")]
-        public virtual DeliveryPart Part { get; private set; }
+        public virtual DeliveryPart Part { get; private set; } = null!;
 
         [Column("modid")]
-        public string ModId { get; set; }
+        public required string ModId { get; set; }
 
         [ForeignKey("Year, ModId")]
-        public virtual Modifier Modifier { get; private set; }
+        public virtual Modifier Modifier { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Member.cs

@@ -18,19 +18,19 @@ namespace Elwig.Models.Entities {
         public string? Prefix { get; set; }
 
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
 
         [Column("middle_names")]
         public string? MiddleName { get; set; }
 
         [NotMapped]
         public string[] MiddleNames {
-            get { return (MiddleName != null) ? MiddleName.Split(" ") : Array.Empty<string>(); }
-            set { MiddleName = (value.Length > 0) ? string.Join(" ", value) : null; }
+            get => (MiddleName != null) ? MiddleName.Split(" ") : [];
+            set => MiddleName = (value.Length > 0) ? string.Join(" ", value) : null;
         }
 
         [Column("family_name")]
-        public string FamilyName { get; set; }
+        public required string FamilyName { get; set; }
 
         [Column("suffix")]
         public string? Suffix { get; set; }
@@ -46,7 +46,7 @@ namespace Elwig.Models.Entities {
 
         public string AdministrativeName => AdministrativeName1 + " " + AdministrativeName2;
 
-        public string AdministrativeName1 => FamilyName.ToUpper();
+        public string AdministrativeName1 => FamilyName.Replace('ß', 'ẞ').ToUpper();
 
         public string AdministrativeName2 =>
             (Prefix != null ? Prefix + " " : "") +
@@ -118,10 +118,10 @@ namespace Elwig.Models.Entities {
         public int CountryNum { get; set; }
 
         [Column("postal_dest")]
-        public string PostalDestId { get; set; }
+        public string PostalDestId { get; set; } = null!;
 
         [Column("address")]
-        public string Address { get; set; }
+        public string Address { get; set; } = null!;
 
         [Column("default_kgnr")]
         public int? DefaultKgNr { get; set; }
@@ -139,44 +139,47 @@ namespace Elwig.Models.Entities {
         public virtual Member? Predecessor { get; private set; }
 
         [ForeignKey("CountryNum")]
-        public virtual Country Country { get; private set; }
+        public virtual Country Country { get; private set; } = null!;
 
         [ForeignKey("CountryNum, PostalDestId")]
-        public virtual PostalDest PostalDest { get; private set; }
+        public virtual PostalDest PostalDest { get; private set; } = null!;
 
         [ForeignKey("DefaultKgNr")]
-        public virtual AT_Kg? DefaultKg { get; private set; }
+        public virtual WbKg? DefaultWbKg { get; private set; }
+
+        [NotMapped]
+        public AT_Kg? DefaultKg => DefaultWbKg?.AtKg;
 
         [ForeignKey("ZwstId")]
         public virtual Branch? Branch { get; private set; }
 
-        [InverseProperty("Member")]
-        public virtual ISet<AreaCom> AreaCommitments { get; private set; }
+        [InverseProperty(nameof(AreaCom.Member))]
+        public virtual ICollection<AreaCom> AreaCommitments { get; private set; } = null!;
 
-        [NotMapped]
-        public IEnumerable<AreaCom> ActiveAreaCommitments => AreaCommitments
-            .Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear);
+        public IQueryable<AreaCom> ActiveAreaCommitments(AppDbContext ctx) {
+            return ctx.AreaCommitments.Where(c => c.MgNr == MgNr).Where(Utils.ActiveAreaCommitments());
+        }
 
-        [InverseProperty("Member")]
+        [InverseProperty(nameof(BillingAddr.Member))]
         public virtual BillingAddr? BillingAddress { get; private set; }
 
-        [InverseProperty("Member")]
-        public virtual ISet<Delivery> Deliveries { get; private set; }
+        [InverseProperty(nameof(Delivery.Member))]
+        public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;
 
-        [InverseProperty("Member")]
-        public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; }
+        [InverseProperty(nameof(MemberTelNr.Member))]
+        public virtual ICollection<MemberTelNr> TelephoneNumbers { get; private set; } = null!;
 
-        [InverseProperty("member")]
-        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; }
+        [InverseProperty(nameof(MemberEmailAddr.Member))]
+        public virtual ICollection<MemberEmailAddr> EmailAddresses { get; private set; } = null!;
 
-        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
+        public string FullAddress => $"{Address}, {PostalDest.AtPlz?.Plz} {PostalDest.AtPlz?.Ort.Name}";
 
         public int SearchScore(IEnumerable<string> keywords) {
-            return Utils.GetSearchScore(new string?[] {
+            return Utils.GetSearchScore([
                 FamilyName, MiddleName, GivenName,
                 BillingAddress?.Name,
                 Comment,
-            }, keywords);
+            ], keywords);
         }
     }
 }

Elwig/Models/Entities/MemberEmailAddr.cs

@@ -11,12 +11,12 @@ namespace Elwig.Models.Entities {
         public int Nr { get; set; }
 
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
 
         [Column("comment")]
         public string? Comment { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
     }
 }