Bump version to 1.0.1.5

Bug was introduced by commit 9930e6173c
and shipped with v0.10.6 (2024-08-30)

.gitea/workflows/deploy.yaml

@@ -0,0 +1,56 @@
+name: Deploy
+on:
+  push:
+    tags: ["v[0-9]+.[0-9]+.[0-9]+.[0-9]+"]
+jobs:
+  deploy:
+    name: Build and Deploy
+    runs-on: windows-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Set APP_VERSION variable from tag
+        shell: powershell
+        run: |
+          $APP_VERSION = $env:GITHUB_REF -replace '^refs/tags/v', ''
+          Add-Content -Path $env:GITHUB_ENV -Value "APP_VERSION=$APP_VERSION"
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check version in project
+        shell: powershell
+        run: |
+          Select-String Elwig/Elwig.csproj -Pattern "<Version>"
+          $res = Select-String Elwig/Elwig.csproj -Pattern "<Version>${{ env.APP_VERSION }}</Version>"
+          if ($res -eq $null) {
+            exit 1
+          }
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Setup
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Setup/Setup.wixproj -property:Configuration=Release -property:Platform=x64; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Rename artifact
+        shell: powershell
+        run: Move-Item Setup/bin/x64/Release/Elwig.exe Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
+      - name: Create release
+        uses: akkuman/gitea-release-action@v1
+        with:
+          name: Elwig ${{ env.APP_VERSION }}
+          body: "**[Changelog](src/branch/main/CHANGELOG.md#v${{ env.APP_VERSION }})**"
+          files: |-
+            Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe
+      - name: Upload to website
+        shell: powershell
+        run: |
+          $content = [System.IO.File]::ReadAllBytes("Setup/bin/x64/Release/Elwig-${{ env.APP_VERSION }}.exe")
+          Invoke-WebRequest `
+            -Uri "https://elwig.at/files/Elwig-${{ env.APP_VERSION }}.exe" `
+            -Method PUT `
+            -Body $content `
+            -Headers @{ Authorization = "${{ secrets.API_AUTHORIZATION }}" } `
+            -ContentType "application/octet-stream"

.gitea/workflows/test.yaml

@@ -0,0 +1,43 @@
+name: Test
+on:
+  push:
+    branches: ["**"]
+    paths: ["Elwig/**", "Tests/**", "Installer/Files/*.exe", ".gitea/workflows/test.yaml"]
+jobs:
+  test:
+    name: Run tests
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Check for Byte order marks
+        shell: powershell
+        run: |
+          $pattern = [char]::ConvertFromUtf32(0xFEFF)
+          $files = git grep -IEl "^$pattern"
+          if ( $lastexitcode -ne 1 ) {
+            echo "Files with BOM found:"
+            echo $files
+            exit 1
+          } else {
+            echo "No files with BOM found"
+            exit 0
+          }
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Elwig
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Elwig/Elwig.csproj -property:Configuration=Debug; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Tests
+        shell: powershell
+        run: $(& dotnet build Tests; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Run Tests
+        shell: powershell
+        run: |
+          $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH
+          $(& dotnet test Tests --filter "FullyQualifiedName!~E2ETests"; $a=$lastexitcode) | findstr x*; exit $a

.gitignore

@@ -3,3 +3,7 @@ bin/
 *.user
 .vs
 .idea
+Tests/Resources/Sql/Create.sql
+*.exe
+!WinziPrint.exe
+*.sqlite3

Elwig/App.xaml

@@ -1,13 +1,12 @@
-<Application x:Class="Elwig.App"
+<Application
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        x:Class="Elwig.App"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:local="clr-namespace:Elwig"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:ctrl="clr-namespace:Elwig.Controls"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
-             StartupUri="Windows\MainWindow.xaml"
+        Exit="Application_Exit">
-             xmlns:ui="http://schemas.modernwpf.com/2019">
     <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,25 @@
             </StackPanel>
         </DataTemplate>
 
-        <ControlTemplate x:Key="WineVarietyTemplateSimple">
+        <DataTemplate x:Key="WineVarietyTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
             </StackPanel>
-        </ControlTemplate>
+        </DataTemplate>
-        <ControlTemplate x:Key="WineVarietyTemplateExtended">
+        <DataTemplate x:Key="WineVarietyTemplateExpanded">
             <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding SortId}" MinWidth="36" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding SortIdFormat}" Foreground="{Binding Color}" MinWidth="36" Margin="0,0,10,0"/>
-                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Name}" Foreground="{Binding Color}"/>
                 <TextBlock Text="{Binding CommentFormat}" FontSize="10" VerticalAlignment="Bottom" Margin="0,0,0,2"/>
             </StackPanel>
-        </ControlTemplate>
+        </DataTemplate>
-        <DataTemplate x:Key="WineVarietyTemplate">
+
-            <Control x:Name="Control" Focusable="False" Template="{StaticResource WineVarietyTemplateExtended}"/>
+        <DataTemplate x:Key="AreaCommitmentTypeTemplate">
-            <DataTemplate.Triggers>
+            <StackPanel Orientation="Horizontal">
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
+                <TextBlock Text="{Binding WineVar.Name}" Foreground="{Binding WineVar.Color}"/>
-                    <Setter TargetName="Control" Property="Template" Value="{StaticResource WineVarietyTemplateSimple}"/>
+                <TextBlock Text="{Binding WineAttr.Name}" Margin="5,0,0,0"/>
-                </DataTrigger>
+                <TextBlock Text="{Binding Discriminator}" Margin="5,0,0,0"/>
-            </DataTemplate.Triggers>
+            </StackPanel>
         </DataTemplate>
 
         <DataTemplate x:Key="ModifierTemplate">
@@ -63,45 +62,61 @@
             </StackPanel>
         </DataTemplate>
 
-        <ControlTemplate x:Key="WineQualityLevelTemplateSimple">
+        <DataTemplate x:Key="WineQualityLevelTemplateCollapsed">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
+        </DataTemplate>
-        <ControlTemplate x:Key="WineQualityLevelTemplateExtended">
+        <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>
 
-        <ControlTemplate x:Key="WineOriginTemplateSimple">
+        <DataTemplate x:Key="WineOriginTemplate">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="{Binding Name}"/>
-            </StackPanel>
-        </ControlTemplate>
-        <ControlTemplate x:Key="WineOriginTemplateExtended">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/>
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
-        </ControlTemplate>
+        </DataTemplate>
-        <DataTemplate x:Key="WineOriginTemplate">
+        <DataTemplate x:Key="WineOriginTemplateCollapsed">
-            <Control x:Name="Control" Focusable="False" Template="{StaticResource WineOriginTemplateExtended}"/>
+            <StackPanel Orientation="Horizontal">
-            <DataTemplate.Triggers>
+                <TextBlock Text="{Binding Name}"/>
-                <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
+            </StackPanel>
-                    <Setter TargetName="Control" Property="Template" Value="{StaticResource WineOriginTemplateSimple}"/>
+        </DataTemplate>
-                </DataTrigger>
+        <DataTemplate x:Key="WineOriginTemplateExpanded">
-            </DataTemplate.Triggers>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="GemTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding Name}"/>
+                <TextBlock Text="{Binding Gkz, StringFormat='{} ({0:00000})'}"/>
+            </StackPanel>
+        </DataTemplate>
+
+        <DataTemplate x:Key="WbKgTemplate">
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <TextBlock Width="250">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/>
+                </TextBlock>
+                <TextBlock Text="{Binding Gem.WbGem.Origin.Name}"/>
+            </StackPanel>
+        </DataTemplate>
+        <DataTemplate x:Key="WbKgGlTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Width="220">
+                    <TextBlock Text="{Binding Name}"/>
+                    <TextBlock Text="{Binding KgNr, StringFormat='{}({0:00000})'}"/>
+                </TextBlock>
+                <TextBlock Text="{Binding WbKg.Gl.Name}"/>
+            </StackPanel>
         </DataTemplate>
     </Application.Resources>
 </Application>

Elwig/App.xaml.cs

@@ -1,40 +1,45 @@
-using System;
+using Elwig.Dialogs;
-using System.Data;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.IO;
 using Elwig.Helpers;
-using Elwig.Helpers.Weighing;
+using Elwig.Helpers.Billing;
-using System.Collections.Generic;
+using Elwig.Helpers.Export;
-using System.Windows.Threading;
-using System.Globalization;
-using System.Threading;
-using System.Windows.Markup;
-using System.Reflection;
 using Elwig.Helpers.Printing;
+using Elwig.Helpers.Weighing;
+using Elwig.Models.Entities;
+using Elwig.Windows;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace Elwig {
     public partial class App : Application {
 
-        public static readonly string DataPath = @"C:\ProgramData\Elwig\";
+        protected static App CurrentApp;
-        public static readonly string ExePath = @"C:\Program Files\Elwig\";
+        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 = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Elwig");
+        public static readonly string MailsPath = Path.Combine(DataPath, "mails");
+        public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
+        public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
+        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
+            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
+            Path.Combine(InstallPath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
-        public static readonly Config Config = new(DataPath + "config.ini");
 
-        public static int VersionMajor { get; private set; }
+        public static Config Config { get; private set; } = new(ConfigPath);
-        public static int VersionMinor { get; private set; }
+        public static Version Version { get; private set; } = new();
-        public static int VersionPatch { get; private set; }
-        public static string Version {
-            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
-            private set {
-                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
-                VersionMajor = p.ElementAtOrDefault(0);
-                VersionMinor = p.ElementAtOrDefault(1);
-                VersionPatch = p.ElementAtOrDefault(2);
-            }
-        }
 
+        public static int BranchNum { get; private set; }
         public static string ZwstId { get; private set; }
         public static string BranchName { get; private set; }
         public static int? BranchPlz { get; private set; }
@@ -44,44 +49,61 @@ namespace Elwig {
         public static string? BranchFaxNr { get; private set; }
         public static string? BranchMobileNr { get; private set; }
         public static IList<IScale> Scales { get; private set; }
-        public static ClientParameters Client { get; private set; }
+        public static 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);
+            Directory.CreateDirectory(MailsPath);
             MainDispatcher = Dispatcher;
-            Scales = Array.Empty<IScale>();
+            Scales = [];
+            CurrentApp = this;
+            Utils.OverrideCulture();
+
+            var args = Environment.GetCommandLineArgs();
+            if (args.Length >= 2) {
+                Config = new(Path.GetFullPath(args[1]));
+            }
+
+            ContextTimer.Tick += (object? sender, EventArgs evt) => {
+                var ch = CurrentLastWrite;
+                if (ch > LastChanged) {
+                    LastChanged = ch;
+                    OnContextChanged();
+                }
+            };
         }
 
-        protected override void OnStartup(StartupEventArgs evt) {
+        private static void OnContextChanged() {
-            var locale = new CultureInfo("de-AT");
+            MainDispatcher.BeginInvoke(HintContextChange);
-            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
+        }
-            locale.NumberFormat.NumberGroupSeparator = "\u202f";
-            locale.NumberFormat.PercentGroupSeparator = "\u202f";
-            Thread.CurrentThread.CurrentCulture = locale;
-            Thread.CurrentThread.CurrentUICulture = locale;
-            CultureInfo.DefaultThreadCurrentCulture = locale;
-            CultureInfo.DefaultThreadCurrentUICulture = locale;
-            FrameworkElement.LanguageProperty.OverrideMetadata(
-                typeof(FrameworkElement),
-                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
-            );
 
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+        protected override async void OnStartup(StartupEventArgs evt) {
+            Version = new Version(typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0.0");
 
             try {
-                AppDbUpdater.CheckDb();
+                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 {
@@ -91,30 +113,39 @@ namespace Elwig {
                     Shutdown();
                     return;
                 }
+                BranchNum = branches.Count;
             }
 
-            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("Temp File Cleanup", () => {
-            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
+                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(1000);
+                        await CheckForUpdates();
+                    });
+                }
+                NetworkChange.NetworkAvailabilityChanged += OnNetworkAvailabilityChanged;
+                _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();
+                    list.Add(Scale.FromConfig(s));
-                    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}\"");
-                    }
                 } catch (Exception e) {
-                    list.Add(new InvalidScale(id));
+                    list.Add(new InvalidScale(s.Id));
-                    MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    if (s.Required)
+                        MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error",
+                            MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             Scales = list;
@@ -124,47 +155,207 @@ namespace Elwig {
                     MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                 } else {
-                    var entry = branches[Config.Branch.ToLower()];
+                    SetBranch(branches[Config.Branch.ToLower()]);
-                    ZwstId = entry.Item1;
-                    BranchName = entry.Item2;
-                    BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                    BranchAddress = entry.Item5;
-                    BranchPhoneNr = entry.Item6;
-                    BranchFaxNr = entry.Item7;
-                    BranchMobileNr = entry.Item8;
                 }
             } else if (branches.Count == 1) {
-                var entry = branches.First().Value;
+                SetBranch(branches.First().Value);
-                ZwstId = entry.Item1;
-                BranchName = entry.Item2;
-                BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                BranchAddress = entry.Item5;
-                BranchPhoneNr = entry.Item6;
-                BranchFaxNr = entry.Item7;
-                BranchMobileNr = entry.Item8;
             } else {
                 MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
             }
 
-            base.OnStartup(evt);
+            if (Config.WeighingMode == null) {
-        }
+                if (Client.IsMatzen || Client.IsWolkersdorf) {
-
+                    Config.WeighingMode = WeighingMode.Net;
-        private void PrintingReadyChanged() {
+                } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
-            Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
+                    Config.WeighingMode = WeighingMode.Box;
-        }
+                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
-
+                    Config.WeighingMode = WeighingMode.Gross;
-        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;
+
+            base.OnStartup(evt);
+
+            var window = new MainWindow();
+            window.Show();
+        }
+
+        private async void Application_Exit(object sender, ExitEventArgs evt) {
+            foreach (var s in EventScales) {
+                s.Dispose();
+            }
+            await Pdf.Cleanup();
+        }
+
+        public static void SetBranch(Branch b) {
+            SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
+        }
+
+        private static void SetBranch((string, string, int?, string?, string?, string?, string?, string?) entry) {
+            ZwstId = entry.Item1;
+            BranchName = entry.Item2;
+            BranchPlz = entry.Item3;
+            BranchLocation = entry.Item4?
+                .Split(" in ")[0]
+                .Split(" im ")[0]
+                .Split(" an ")[0]
+                .Split(" am ")[0]
+                .Split(" bei ")[0]
+                .Split(" beim ")[0];
+            BranchAddress = entry.Item5;
+            BranchPhoneNr = entry.Item6;
+            BranchFaxNr = entry.Item7;
+            BranchMobileNr = entry.Item8;
+        }
+
+        public static void HintContextChange() {
+            if (CurrentApp == null) return;
+            var ch = CurrentLastWrite;
+            if (ch > CurrentApp.LastChanged)
+                CurrentApp.LastChanged = ch;
+            MainDispatcher.Invoke(() => {
+                foreach (Window w in CurrentApp.Windows) {
+                    if (w is not ContextWindow c) continue;
+                    MainDispatcher.BeginInvoke(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());
+            }
+        }
+
+        private void OnNetworkAvailabilityChanged(object? sender, NetworkAvailabilityEventArgs evt) {
+            if (!evt.IsAvailable) return;
+            if (Utils.HasInternetConnectivity()) {
+                Utils.RunBackground("Auto Updater", async () => {
+                    await Task.Delay(2000);
+                    await CheckForUpdates();
+                });
+            }
+        }
+
+        public static async Task CheckForUpdates(bool showAlert = false) {
+            if (Config.UpdateUrl == null) return;
+            var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
+            if (latest != null && new Version(latest.Value.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 (showAlert) {
+                if (latest == null) {
+                    MessageBox.Show("Informationen konnten nicht abgerufen werden!", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Error);
+                } else {
+                    MessageBox.Show($"Elwig ist auf dem aktuellsten Stand! (Version: {latest.Value.Version})", "Nach Updates suchen",
+                        MessageBoxButton.OK, MessageBoxImage.Information);
                 }
             }
         }
+
+        public static async Task ReplaceDatabase(string filename) {
+            try {
+                await Task.Run(async () => {
+                    await Database.Import(filename);
+                });
+                MessageBox.Show("Das Ersetzen war erfolgreich!\n\nBitte starten Sie Elwig neu!", "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Information);
+                ForceShutdown = true;
+                Current.Shutdown();
+            } catch (Exception exc) {
+                MessageBox.Show("Fehler beim Ersetzen:\n\n" + exc.Message, "Datenbank ersetzen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is T t && (selector == null || selector(t))) {
+                    if (t.WindowState == WindowState.Minimized)
+                        t.WindowState = WindowState.Normal;
+                    t.Activate();
+                    return t;
+                }
+            }
+            var n = constructor();
+            n.Show();
+            return n;
+        }
+
+        public static DeliveryAdminWindow FocusReceipt() {
+            return FocusWindow<DeliveryAdminWindow>(() => new(true), w => w.ViewModel.IsReceipt);
+        }
+
+        public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
+            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember?.MgNr == mgnr);
+        }
+
+        public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
+            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.ViewModel.FilterMember.MgNr == mgnr);
+        }
+
+        public static BaseDataWindow FocusBaseData() {
+            return FocusWindow<BaseDataWindow>(() => new());
+        }
+
+        public static BaseDataWindow FocusBaseDataAreaComType() {
+            var w = FocusBaseData();
+            w.AreaCommitmentTypes.Focus();
+            return w;
+        }
+
+        public static BaseDataWindow FocusBaseDataSeason(int year) {
+            var w = FocusBaseData();
+            w.Seasons.Focus();
+            ControlUtils.SelectItemWithPk(w.SeasonList, year);
+            return w;
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchy() {
+            return FocusWindow<OriginHierarchyWindow>(() => new());
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchyKg(int kgnr) {
+            var w = FocusOriginHierarchy();
+            w.FocusKgNr(kgnr);
+            return w;
+        }
+
+        public static DeliveryAncmtAdminWindow FocusDeliveryAncmt() {
+            return FocusWindow<DeliveryAncmtAdminWindow>(() => new());
+        }
+
+        public static DeliveryScheduleAdminWindow FocusDeliverySchedule() {
+            return FocusWindow<DeliveryScheduleAdminWindow>(() => new());
+        }
+
+        public static PaymentVariantsWindow FocusPaymentVariants(int year) {
+            return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
+        }
+
+        public static PaymentAdjustmentWindow FocusPaymentAdjustment(int year) {
+            return FocusWindow<PaymentAdjustmentWindow>(() => 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/CheckComboBox.cs

@@ -0,0 +1,167 @@
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Controls {
+    public class CheckComboBox : ListBox {
+
+        public new static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register(nameof(SelectedItems), typeof(IList), typeof(CheckComboBox), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedItemsChangedCallback));
+        public new IList SelectedItems {
+            get => (IList)GetValue(SelectedItemsProperty);
+            set => SetValue(SelectedItemsProperty, value);
+        }
+
+        public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register(nameof(Delimiter), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(", "));
+        public string Delimiter {
+            get => (string)GetValue(DelimiterProperty);
+            set => SetValue(DelimiterProperty, value);
+        }
+
+        public static readonly DependencyProperty ListDisplayMemberPathProperty = DependencyProperty.Register(nameof(ListDisplayMemberPath), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata(null));
+        public string ListDisplayMemberPath {
+            get => (string)GetValue(ListDisplayMemberPathProperty);
+            set => SetValue(ListDisplayMemberPathProperty, value);
+        }
+
+        public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register(nameof(AllItemsSelectedContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public string AllItemsSelectedContent {
+            get => (string)GetValue(AllItemsSelectedContentProperty);
+            set => SetValue(AllItemsSelectedContentProperty, value);
+        }
+
+        public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register(nameof(IsSelectAllActive), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool IsSelectAllActive {
+            get => (bool)GetValue(IsSelectAllActiveProperty);
+            set => SetValue(IsSelectAllActiveProperty, value);
+        }
+
+        public static readonly DependencyProperty SelectAllContentProperty = DependencyProperty.Register(nameof(SelectAllContent), typeof(string), typeof(CheckComboBox), new FrameworkPropertyMetadata("All"));
+        public string SelectAllContent {
+            get => (string)GetValue(SelectAllContentProperty);
+            set => SetValue(SelectAllContentProperty, value);
+        }
+
+        public static readonly DependencyProperty AllItemsSelectedProperty = DependencyProperty.Register(nameof(AllItemsSelected), typeof(bool?), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool? AllItemsSelected {
+            get => (bool?)GetValue(AllItemsSelectedProperty);
+            set => SetValue(AllItemsSelectedProperty, value);
+        }
+
+        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(nameof(IsDropDownOpen), typeof(bool), typeof(CheckComboBox), new FrameworkPropertyMetadata(false));
+        public bool IsDropDownOpen {
+            get => (bool)GetValue(IsDropDownOpenProperty);
+            set => SetValue(IsDropDownOpenProperty, value);
+        }
+
+        public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register(nameof(MaxDropDownHeight), typeof(double), typeof(CheckComboBox), new FrameworkPropertyMetadata(ComboBox.MaxDropDownHeightProperty.DefaultMetadata.DefaultValue));
+        public double MaxDropDownHeight {
+            get => (double)GetValue(MaxDropDownHeightProperty);
+            set => SetValue(MaxDropDownHeightProperty, value);
+        }
+
+        public new static readonly RoutedEvent SelectionChangedEvent = EventManager.RegisterRoutedEvent(nameof(SelectionChanged), RoutingStrategy.Bubble, typeof(SelectionChangedEventHandler), typeof(CheckComboBox));
+        public new event SelectionChangedEventHandler SelectionChanged {
+            add => AddHandler(SelectionChangedEvent, value);
+            remove => RemoveHandler(SelectionChangedEvent, value);
+        }
+
+        static CheckComboBox() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckComboBox), new FrameworkPropertyMetadata(typeof(CheckComboBox)));
+        }
+
+        private bool _viewHandled;
+        private bool _modelHandled;
+        private TextBlock _textBox;
+
+        public CheckComboBox() {
+            SelectionMode = SelectionMode.Multiple;
+            SelectedItems = new ObservableCollection<object>();
+        }
+
+        public override void OnApplyTemplate() {
+            _textBox = (GetTemplateChild("TextBox") as TextBlock)!;
+            var button = GetTemplateChild("Button") as Button;
+            button!.Click += Button_MouseDown;
+            var item = GetTemplateChild("SelectAllItem") as ListBoxItem;
+            item!.PreviewMouseDown += SelectAllItem_MouseDown;
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
+            IsEnabledChanged += OnIsEnabledChanged;
+            base.SelectionChanged += OnSelectionChanged;
+            base.OnApplyTemplate();
+        }
+
+        private static void OnSelectedItemsChangedCallback(DependencyObject sender, DependencyPropertyChangedEventArgs e) {
+            if (sender is CheckComboBox ccb)
+                ccb.OnSelectedItemsChanged();
+        }
+
+        private void OnSelectedItemsChanged() {
+            if (SelectedItems is INotifyCollectionChanged collection) {
+                collection.CollectionChanged += (s, e) => { SelectItems(); };
+            }
+            SelectItems();
+        }
+
+        private void Button_MouseDown(object sender, RoutedEventArgs evt) {
+            IsDropDownOpen = !IsDropDownOpen;
+        }
+
+        private void SelectAllItem_MouseDown(object sender, RoutedEventArgs evt) {
+            if (AllItemsSelected == false) {
+                SelectAll();
+            } else {
+                UnselectAll();
+            }
+            evt.Handled = true;
+        }
+
+        private void OnSelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            SelectItemsReverse();
+            var dmp = !string.IsNullOrEmpty(ListDisplayMemberPath) ? ListDisplayMemberPath : !string.IsNullOrEmpty(DisplayMemberPath) ? DisplayMemberPath : null;
+            if (SelectedItems.Count == ItemsSource.Cast<object>().Count() && AllItemsSelectedContent != null) {
+                _textBox.Text = AllItemsSelectedContent;
+                AllItemsSelected = true;
+            } else if (SelectedItems.Count == 0) {
+                _textBox.Text = "";
+                AllItemsSelected = false;
+            } else {
+                _textBox.Text = string.Join(Delimiter,
+                    dmp == null ? SelectedItems.Cast<object>() :
+                    SelectedItems.Cast<object>()
+                        .Select(i => i.GetType().GetProperty(dmp)?.GetValue(i))
+                );
+                AllItemsSelected = null;
+            }
+            RaiseEvent(new SelectionChangedEventArgs(SelectionChangedEvent, evt.RemovedItems, evt.AddedItems));
+        }
+
+        private void OnIsEnabledChanged(object sender, DependencyPropertyChangedEventArgs evt) {
+            if (!IsEnabled) IsDropDownOpen = false;
+        }
+
+        private void SelectItems() {
+            if (_viewHandled || _modelHandled)
+                return;
+            _viewHandled = true;
+            base.SelectedItems.Clear();
+            foreach (var item in SelectedItems)
+                base.SelectedItems.Add(item);
+            _viewHandled = false;
+        }
+
+        private void SelectItemsReverse() {
+            if (_modelHandled || _viewHandled)
+                return;
+            _modelHandled = true;
+            SelectedItems.Clear();
+            foreach (var item in base.SelectedItems)
+                SelectedItems.Add(item);
+            _modelHandled = false;
+        }
+    }
+}

Elwig/Controls/CheckComboBox.xaml

@@ -0,0 +1,118 @@
+<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">
+    <ctrl:VisibilityConverter x:Key="VisibilityConverter"/>
+    <Style TargetType="ctrl:CheckComboBox" BasedOn="{StaticResource {x:Type ListBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:CheckComboBox">
+                    <Grid Style="{x:Null}">
+                        <Button x:Name="Button" ClickMode="Press" BorderThickness="1"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                IsEnabled="{Binding IsEnabled, RelativeSource={RelativeSource TemplatedParent}}">
+                            <Button.Style>
+                                <Style TargetType="{x:Type Button}">
+                                    <Setter Property="Background" Value="White"/>
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="{x:Type Button}">
+                                                <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True"
+                                                        BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+                                                    <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+                                                </Border>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </Button.Style>
+                            <Path x:Name="IconDropdown" Data="M 0,0 L 3,3 L 6,0" Stroke="#FF606060" StrokeThickness="1" Margin="0,0,5,0"
+                                  HorizontalAlignment="Right" VerticalAlignment="Center"/>
+                        </Button>
+                        <TextBlock x:Name="TextBox" Style="{x:Null}" Margin="6,0,18,0" IsHitTestVisible="False"
+                                   HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
+                        <Popup x:Name="Popup" Placement="Bottom" Focusable="True"
+                               IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                               PopupAnimation="Slide" AllowsTransparency="True">
+                            <Popup.Style>
+                                <Style TargetType="{x:Type Popup}">
+                                    <Setter Property="StaysOpen" Value="False"/>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding IsMouseOver, ElementName=Button}" Value="True">
+                                            <Setter Property="StaysOpen" Value="True"/>
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding IsMouseOver, ElementName=Border}" Value="True">
+                                            <Setter Property="StaysOpen" Value="True"/>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </Popup.Style>
+                            <Border x:Name="Border" Style="{x:Null}" BorderThickness="1" BorderBrush="Gray" Background="White" SnapsToDevicePixels="True"
+                                    MinWidth="{TemplateBinding ActualWidth}"
+                                    MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                                <DockPanel>
+                                    <ListBoxItem x:Name="SelectAllItem" Padding="2,1,2,1" DockPanel.Dock="Top"
+                                                 Visibility="{TemplateBinding IsSelectAllActive, Converter={StaticResource VisibilityConverter}}">
+                                        <StackPanel Orientation="Horizontal">
+                                            <CheckBox VerticalAlignment="Center" Margin="0,0,5,0" IsThreeState="True"
+                                                      IsChecked="{Binding AllItemsSelected, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                            <TextBlock Text="{TemplateBinding SelectAllContent}" VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/>
+                                        </StackPanel>
+                                    </ListBoxItem>
+                                    <ScrollViewer Style="{x:Null}">
+                                        <StackPanel Style="{x:Null}" IsItemsHost="True" SnapsToDevicePixels="True"
+                                                    KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                    </ScrollViewer>
+                                </DockPanel>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="IconDropdown" Property="Stroke" Value="#FFA0A0A0"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="IconDropdown" Property="Stroke" Value="Black"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="ListBoxItem">
+                                <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                                        BorderThickness="{TemplateBinding BorderThickness}" 
+                                        Background="{TemplateBinding Background}"
+                                        Padding="2,1,2,1">
+                                    <StackPanel Orientation="Horizontal">
+                                        <CheckBox VerticalAlignment="Center" Margin="0,0,5,0"
+                                                  IsChecked="{Binding IsSelected, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=ListBoxItem}}"/>
+                                        <ContentPresenter VerticalAlignment="Center" Margin="0" SnapsToDevicePixels="True"/>
+                                    </StackPanel>
+                                </Border>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                    <Setter Property="BorderThickness" Value="1"/>
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="#FF70C0E7"/>
+                            <Setter Property="Background" Value="#FFE5F3FB"/>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="#FF7EB4EA"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>

Elwig/Controls/IntegerUpDown.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Elwig.Controls {
+    public class IntegerUpDown : TextBox {
+
+        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(nameof(Minimum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public int? Minimum {
+            get => (int?)GetValue(MinimumProperty);
+            set => SetValue(MinimumProperty, value);
+        }
+
+        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(nameof(Maximum), typeof(int?), typeof(IntegerUpDown), new FrameworkPropertyMetadata(null));
+        public int? Maximum {
+            get => (int?)GetValue(MaximumProperty);
+            set => SetValue(MaximumProperty, value);
+        }
+
+        public int? Value {
+            get => int.TryParse(Text, out var res) ? res : null;
+            set => Text = $"{value}";
+        }
+
+        static IntegerUpDown() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(typeof(IntegerUpDown)));
+        }
+
+        public IntegerUpDown() {
+            TextChanged += IntegerUpDown_TextChanged;
+            LostFocus += IntegerUpDown_LostFocus;
+            KeyUp += IntegerUpDown_KeyUp;
+        }
+
+        public override void OnApplyTemplate() {
+            var incButton = GetTemplateChild("IncrementButton") as RepeatButton;
+            var decButton = GetTemplateChild("DecrementButton") as RepeatButton;
+            incButton!.Click += IncrementButton_Click;
+            decButton!.Click += DecrementButton_Click;
+            base.OnApplyTemplate();
+        }
+
+        private void IntegerUpDown_TextChanged(object sender, TextChangedEventArgs evt) {
+            var idx = CaretIndex;
+            Text = new string(Text.Where(char.IsAsciiDigit).Take(4).ToArray());
+            CaretIndex = idx;
+            evt.Handled = !(Value >= Minimum && Value <= Maximum);
+            if (idx >= 4) {
+                if (Value < Minimum) {
+                    Value = Minimum;
+                } else if (Value > Maximum) {
+                    Value = Maximum;
+                }
+                CaretIndex = 4;
+            }
+        }
+
+        private void IntegerUpDown_LostFocus(object sender, RoutedEventArgs evt) {
+            if (Value < Minimum) {
+                Value = Minimum;
+            } else if (Value > Maximum) {
+                Value = Maximum;
+            }
+        }
+
+        private void IncrementButton_Click(object sender, RoutedEventArgs evt) {
+            Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue);
+        }
+
+        private void DecrementButton_Click(object sender, RoutedEventArgs evt) {
+            Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue);
+        }
+
+        private void IntegerUpDown_KeyUp(object sender, KeyEventArgs evt) {
+            switch (evt.Key) {
+                case Key.Up:
+                case Key.Add:
+                case Key.OemPlus:
+                    Value = Math.Min((Value ?? 0) + 1, Maximum ?? int.MaxValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.Down:
+                case Key.Subtract:
+                case Key.OemMinus:
+                    Value = Math.Max((Value ?? 0) - 1, Minimum ?? int.MinValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.PageUp:
+                    Value = Math.Min((Value ?? 0) + 10, Maximum ?? int.MaxValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+                case Key.PageDown:
+                    Value = Math.Max((Value ?? 0) - 10, Minimum ?? int.MinValue);
+                    evt.Handled = true;
+                    CaretIndex = 4;
+                    break;
+            }
+        }
+    }
+}

Elwig/Controls/IntegerUpDown.xaml

@@ -0,0 +1,53 @@
+<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:IntegerUpDown" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:IntegerUpDown">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="18"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Border x:Name="Border" BorderThickness="1,1,0,1" Grid.RowSpan="2"
+                                BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                            <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center"/>
+                        </Border>
+
+                        <RepeatButton x:Name="IncrementButton" Padding="0" Height="Auto" Width="Auto" BorderThickness="1,1,1,1"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="0" Grid.Column="1">
+                            <Path x:Name="IconIncrement" Data="M 0,4 L 4,0 L 8,4 Z" Fill="#FF444444"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </RepeatButton>
+                        <RepeatButton x:Name="DecrementButton" Padding="0" Height="Auto" Width="Auto"  BorderThickness="1,0,1,1"
+                                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Row="1" Grid.Column="1">
+                            <Path x:Name="IconDecrement" Data="M 0,0 L 4,4 L 8,0 Z" Fill="#FF444444"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        </RepeatButton>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/>
+                            <Setter TargetName="IconIncrement" Property="Fill" Value="#FF888888"/>
+                            <Setter TargetName="IconDecrement" Property="Fill" Value="#FF888888"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextAlignment" Value="Right"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>

Elwig/Controls/UnitConverter.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Elwig.Controls {
+    public class UnitConverter : DependencyObject, IValueConverter {
+
+        public static readonly DependencyProperty UnitProperty = DependencyProperty.Register(nameof(Unit), typeof(string), typeof(UnitConverter), new FrameworkPropertyMetadata(null));
+        public string Unit {
+            get => (string)GetValue(UnitProperty);
+            set => SetValue(UnitProperty, value);
+        }
+
+        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register(nameof(Precision), typeof(byte), typeof(UnitConverter), new FrameworkPropertyMetadata((byte)0));
+        public byte Precision {
+            get => (byte)GetValue(PrecisionProperty);
+            set => SetValue(PrecisionProperty, value);
+        }
+
+        public object? Convert(object? value, Type targetType, object parameter, CultureInfo culture) {
+            if (value == null) {
+                return null;
+            }
+
+            var fmt = $"{{0:N{Precision}}}";
+            var unit = $"{(Unit != null ? " " : "")}{Unit}";
+            if (value is int i) {
+                return $"{string.Format(fmt, i)}{unit}";
+            } else if (value is decimal d) {
+                return $"{string.Format(fmt, d)}{unit}";
+            }
+
+            return Binding.DoNothing;
+        }
+
+        public object? ConvertBack(object? value, Type targetType, object parameter, CultureInfo culture) {
+            throw new NotImplementedException();
+        }
+    }
+}

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(nameof(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,42 @@
-<UserControl x:Class="Elwig.Controls.UnitTextBox"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+                    xmlns:ctrl="clr-namespace:Elwig.Controls">
-    <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Height="25">
+    <Style TargetType="ctrl:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-        <TextBox x:Name="TextBox" TextAlignment="Right" FontSize="14" VerticalAlignment="Stretch"
+        <Setter Property="Template">
-                 Padding="{Binding ElementName=UnitBlock, Path=ActualWidth, Converter={StaticResource WidthToPaddingConverter}}"
+            <Setter.Value>
-                 Text="{Binding Path=Text}" TextChanged="TextBox_TextChanged"/>
+                <ControlTemplate TargetType="ctrl:UnitTextBox">
-        <TextBlock x:Name="UnitBlock" Text="{Binding Path=Unit}" Margin="0,0,4,4" FontSize="10"
+                    <Border x:Name="Border"
-                   HorizontalAlignment="Right" VerticalAlignment="Bottom"/>
+                            BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-    </Grid>
+                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-</UserControl>
+                        <Grid Background="{Binding Path=Background, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                            <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.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="LightGray"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextAlignment" Value="Right"/>
+        <Setter Property="SnapsToDevicePixels" Value="True"/>
+        <Setter Property="UseLayoutRounding" Value="True"/>
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+        </Style.Triggers>
+    </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/VisibilityConverter.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Elwig.Controls {
+    public class VisibilityConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            return (Visibility)value == Visibility.Visible;
+        }
+    }
+}

Elwig/Controls/WidthToMarginConverter.cs

@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Windows;
 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/AbwertenDialog.xaml

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

Elwig/Dialogs/AbwertenDialog.xaml.cs

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

Elwig/Dialogs/AreaComModifyDialog.xaml

@@ -0,0 +1,71 @@
+<Window x:Class="Elwig.Dialogs.AreaComModifyDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Flächenbindungen bearbeiten" Height="220" Width="450">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend bearbeitet werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+        <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Soll die Flächenbindung (<Run Text="{Binding Area}"/> m², <Run Text="{Binding OrigYearFrom}"/>–<Run Text="{Binding OrigYearTo}"/>) rückwirkend gelöscht werden,<LineBreak/>
+            oder erst ab der angegebenen Saison?
+        </TextBlock>
+
+        <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"
+               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14"
+                            Minimum="1900" Maximum="9999"
+                            HorizontalAlignment="Center" VerticalAlignment="Top"
+                            TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="RetroactiveInput" Content="Rückwirkend bearbeiten" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="RetroactiveInput_Changed" Unchecked="RetroactiveInput_Changed"
+                  IsChecked="{Binding ModifyRetroactively}"/>
+
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> unverändert,<LineBreak/>
+            und wird ab inkl. Saison <Bold><Run x:Name="NewSeason1"/></Bold> in geänderter Form übernommen.
+        </TextBlock>
+        <TextBlock x:Name="DescBlock2" Margin="0,105,0,0" TextAlignment="Center" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindung bleibt bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig.
+        </TextBlock>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AreaComModifyDialog.xaml.cs

@@ -0,0 +1,62 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AreaComModifyDialog : Window {
+
+        public int? YearTo { get; set; }
+        public bool ModifyRetroactively { get; set; }
+
+        public string OrigYearFrom { get; set; }
+        public string OrigYearTo { get; set; }
+        public string Area { get; set; }
+
+        public AreaComModifyDialog(int? yearFrom, int? yearTo, int area, bool delete) {
+            Area = $"{area:N0}";
+            OrigYearFrom = $"{yearFrom}";
+            OrigYearTo = $"{yearTo}";
+            InitializeComponent();
+            Title = delete ? "Flächenbindung löschen" : "Flächenbindung bearbeiten";
+            RetroactiveInput.Content = delete ? "Rückwirkend löschen" : "Rückwirkend bearbeiten";
+            if (delete) {
+                QuestionBlock1.Visibility = Visibility.Hidden;
+                QuestionBlock2.Visibility = Visibility.Visible;
+                DescBlock1.Visibility = Visibility.Hidden;
+                DescBlock2.Visibility = Visibility.Visible;
+            }
+            if ((yearTo.HasValue && yearTo < Utils.CurrentNextSeason) || (yearFrom.HasValue && yearFrom >= Utils.CurrentNextSeason)) {
+                RetroactiveInput.IsChecked = true;
+            } else {
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+            }
+        }
+
+        private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            YearTo = SeasonInput.Value! - 1;
+            CancelSeason1.Text = $"{YearTo}";
+            CancelSeason2.Text = $"{YearTo}";
+            NewSeason1.Text = $"{YearTo + 1}";
+        }
+
+        private void RetroactiveInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ModifyRetroactively) {
+                SeasonInput.IsEnabled = false;
+                SeasonInput.Text = "";
+                YearTo = null;
+                DescBlock1.Visibility = Visibility.Hidden;
+                DescBlock2.Visibility = Visibility.Hidden;
+            } else {
+                SeasonInput.IsEnabled = true;
+                SeasonInput.Text = $"{Utils.CurrentNextSeason}";
+                DescBlock1.Visibility = QuestionBlock1.Visibility;
+                DescBlock2.Visibility = QuestionBlock2.Visibility;
+            }
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/AreaComTransferDialog.xaml

@@ -0,0 +1,78 @@
+<Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock x:Name="QuestionBlock1" TextAlignment="Center" Margin="0,10,0,0"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Sollen die aktiven Flächenbindungen des angegebenen Vorgängers<LineBreak/>
+            übernommen werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+        </TextBlock>
+        <TextBlock x:Name="QuestionBlock2" TextAlignment="Center" Margin="0,10,0,0" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Sollen die aktiven Flächenbindungen gekündigt werden? (<Run Text="{Binding AreaComNum}"/> FB, <Run Text="{Binding Area}"/> m²)
+        </TextBlock>
+
+        <Label x:Name="SeasonLabel" Content="Saison:" Margin="0,50,100,0"
+               HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        <ctrl:IntegerUpDown x:Name="SeasonInput" Width="56" Height="25" Margin="0,50,0,0" FontSize="14"
+                            Minimum="1900" Maximum="9999"
+                            HorizontalAlignment="Center" VerticalAlignment="Top"
+                            TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearFrom}"/>
+
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
+            und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
+        </TextBlock>
+        <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden"
+                   HorizontalAlignment="Center" VerticalAlignment="Top">
+            Die Flächenbindungen sind bis inklusive Saison <Bold><Run x:Name="CancelSeason2"/></Bold> gültig.
+        </TextBlock>
+
+        <TextBlock x:Name="InfoBlock" Margin="0,0,0,75" TextAlignment="Center"
+                   HorizontalAlignment="Center" VerticalAlignment="Bottom">
+            Falls die Flächenbindungen später an ein neues Mitglied<LineBreak/>
+            übertragen werden sollen bitte <Italic>Nein</Italic> auswählen!
+        </TextBlock>
+        <TextBlock Text="Die Änderungen werden erst beim Speichern übernommen!"
+                   HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,0,0,50"/>
+
+        <Button x:Name="ConfirmButton" Content="Ja" Margin="10,10,115,10" Grid.Column="1"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Nein" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/AreaComTransferDialog.xaml.cs

@@ -0,0 +1,60 @@
+using Elwig.Helpers;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class AreaComTransferDialog : Window {
+
+        public int CancelSeason { get; set; }
+        public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearFrom { get; set; }
+
+        public string AreaComNum { get; set; }
+        public string Area { get; set; }
+
+        public AreaComTransferDialog(string name, int areaComNum, int area) {
+            CancelSeason = Utils.FollowingSeason - 1;
+            AreaComNum = $"{areaComNum:N0}";
+            Area = $"{area:N0}";
+            InitializeComponent();
+            SeasonInput.Text = $"{CancelSeason}";
+            Title = $"Aktive Flächenbindungen kündigen - {name}";
+            QuestionBlock1.Visibility = Visibility.Hidden;
+            QuestionBlock2.Visibility = Visibility.Visible;
+            DescBlock1.Visibility = Visibility.Hidden;
+            DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
+            Height = 240;
+            SeasonInput.Margin = new(0, 40, 0, 0);
+            SeasonLabel.Margin = new(0, 40, 100, 0);
+        }
+
+        public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) {
+            CancelSeason = Utils.FollowingSeason - 1;
+            AreaComNum = $"{areaComNum:N0}";
+            Area = $"{area:N0}";
+            InitializeComponent();
+            SeasonInput.Text = $"{CancelSeason}";
+            Title = $"Aktive Flächenbindungen übertragen - {name} - {successorName}";
+            InfoBlock.Visibility = Visibility.Hidden;
+        }
+
+        private void SeasonInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            CancelSeason = (int)SeasonInput.Value!;
+            CancelSeason1.Text = $"{CancelSeason}";
+            CancelSeason2.Text = $"{CancelSeason}";
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
+            TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/DeleteMemberDialog.xaml

@@ -0,0 +1,64 @@
+<Window x:Class="Elwig.Dialogs.DeleteMemberDialog"
+        AutomationProperties.AutomationId="DeleteMemberDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Mitglied löschen" Height="280" Width="400">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="TextBox">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="Height" Value="25"/>
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+        </Style>
+        <Style TargetType="CheckBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <TextBlock TextAlignment="Center" Margin="10,10,10,10" VerticalAlignment="Top">
+            Bei Bestätigung wird das Mitglied samt zugehöriger Daten<LineBreak/>
+            <Bold>unwiderruflich gelöscht!</Bold> Wenn möglich sollte stattdessen<LineBreak/>
+            der Status des Mitglieds auf <Italic>Inaktiv</Italic> gesetzt werden!
+        </TextBlock>
+
+        <Label Content="Name u. MgNr. wiederholen:" Margin="10,60,10,10" HorizontalAlignment="Center"/>
+        <TextBox x:Name="NameInput" Margin="10,85,10,10"
+                 TextChanged="NameInput_TextChanged"/>
+
+        <Label Content="Beim Löschen müssen folgende Daten auch gelöscht werden:" Margin="10,120,10,10"/>
+        <CheckBox x:Name="AreaComInput" Content="Flächenbindungen" Margin="40,145,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeleteAreaComs}"/>
+        <CheckBox x:Name="DeliveryInput" Content="Lieferungen" Margin="40,165,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeleteDeliveries}"/>
+        <CheckBox x:Name="PaymentInput" Content="Auszahlungsdaten" Margin="40,185,0,0"
+                  Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
+                  IsChecked="{Binding DeletePaymentData}"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/DeleteMemberDialog.xaml.cs

@@ -0,0 +1,66 @@
+using Elwig.Helpers;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Elwig.Dialogs {
+    public partial class DeleteMemberDialog : Window {
+
+        protected string[] NameParts;
+
+        public bool DeleteAreaComs { get; set; }
+        public bool DeleteDeliveries { get; set; }
+        public bool DeletePaymentData { get; set; }
+
+        public DeleteMemberDialog(int mgnr, string name, int numAreaComs, int numDeliveries, int numCredits) {
+            NameParts = name.ToLower().Split(' ').Where(p => p.Length > 0).Append($"{mgnr}").ToArray();
+            InitializeComponent();
+            Title += " - " + name;
+            AreaComInput.IsEnabled = numAreaComs != 0;
+            AreaComInput.Content += $" ({numAreaComs:N0})";
+            DeliveryInput.IsEnabled = numDeliveries != 0;
+            DeliveryInput.Content += $" ({numDeliveries:N0})";
+            PaymentInput.IsEnabled = numCredits != 0;
+            PaymentInput.Content += $" ({numCredits:N0})";
+        }
+
+        private void NameInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            Update();
+        }
+
+        private void CheckBox_Changed(object sender, RoutedEventArgs evt) {
+            Update();
+        }
+
+        private static void UpdateCheckBox(CheckBox cb) {
+            if (cb.IsEnabled && cb.IsChecked != true) {
+                ControlUtils.SetInputInvalid(cb);
+            } else {
+                ControlUtils.ClearInputState(cb);
+            }
+        }
+
+        private void Update() {
+            var t = NameInput.Text.ToLower().Split(' ');
+            var nameValid = NameParts.All(t.Contains);
+            UpdateCheckBox(AreaComInput);
+            UpdateCheckBox(DeliveryInput);
+            UpdateCheckBox(PaymentInput);
+            if (!nameValid) {
+                ControlUtils.SetInputInvalid(NameInput);
+            } else {
+                ControlUtils.ClearInputState(NameInput);
+            }
+            ConfirmButton.IsEnabled =
+                (!AreaComInput.IsEnabled || DeleteAreaComs) &&
+                (!DeliveryInput.IsEnabled || DeleteDeliveries) &&
+                (!PaymentInput.IsEnabled || DeletePaymentData) &&
+                nameValid;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/DeliveryExtractionDialog.xaml

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

Elwig/Dialogs/DeliveryExtractionDialog.xaml.cs

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

Elwig/Dialogs/DeliverySplittingDialog.xaml

@@ -0,0 +1,104 @@
+<local:ContextWindow
+        x:Class="Elwig.Dialogs.DeliverySplittingDialog"
+        AutomationProperties.AutomationId="DeliverySplittingDialog"
+        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:local="clr-namespace:Elwig.Windows"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Lieferung abwerten oder aufteilen" Height="400" Width="600">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+
+        <RadioButton x:Name="DepreciateModeInput" GroupName="ModeInput" Content="Abwerten" Margin="15,10,10,10" IsChecked="True"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+        <RadioButton x:Name="MemberModeInput" GroupName="ModeInput" Content="Auf Mitglied übertragen" Margin="15,30,10,10"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+        <RadioButton x:Name="DeliveryModeInput" GroupName="ModeInput" Content="Zu anderer Lieferung hinzufügen" Margin="15,50,10,10"
+                     VerticalAlignment="Top" HorizontalAlignment="Left"
+                     Checked="ModeInput_Changed"/>
+
+        <TextBox x:Name="MgNrInput" FontSize="14" Padding="2" Visibility="Hidden"
+                 Width="48" Margin="220,10,0,0" Height="25" TextAlignment="Right"
+                 TextChanged="MgNrInput_TextChanged"
+                 VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <ComboBox x:Name="MemberInput" FontSize="14" Visibility="Hidden"
+                  Margin="273,10,40,10" IsEditable="True" Height="25"
+                  ItemTemplate="{StaticResource MemberAdminNameTemplate}" TextSearch.TextPath="AdministrativeName"
+                  SelectionChanged="MemberInput_SelectionChanged"
+                  VerticalAlignment="Top" HorizontalAlignment="Stretch"/>
+        <Button x:Name="MemberReferenceButton" Height="25" Width="25" FontFamily="Segoe MDL2 Assets" Content="&#xEE35;" Padding="0"
+                Margin="10,10,10,10" VerticalAlignment="Top" HorizontalAlignment="Right" ToolTip="Zu Mitglied springen" FontSize="14" Visibility="Hidden"
+                Click="MemberReferenceButton_Click"/>
+
+        <ComboBox x:Name="DeliveryInput" FontSize="14" Visibility="Hidden"
+                  Margin="220,10,10,10" Height="25"
+                  TextSearch.TextPath="LsNr"
+                  SelectionChanged="DeliveryInput_SelectionChanged"
+                  VerticalAlignment="Top" HorizontalAlignment="Stretch">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding LsNr}" Width="100"/>
+                        <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="80" TextAlignment="Right" Margin="0,0,10,0"/>
+                        <TextBlock Text="{Binding Member.AdministrativeName}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <TextBlock x:Name="InfoBlock" Margin="230,45,10,10" FontSize="14" TextAlignment="Right"
+                   VerticalAlignment="Top" HorizontalAlignment="Stretch"
+                   Text="Insgesamt 0 kg / 0 kg ausgewählt."/>
+
+        <ListBox x:Name="DeliveryPartList" Margin="10,75,10,40" ItemsSource="{Binding DeliveryParts, Mode=TwoWay}">
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="{x:Type ListBoxItem}">
+                    <Setter Property="Focusable" Value="False"/>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Part.DPNr}" Width="20" TextAlignment="Right"
+                                   VerticalAlignment="Center"  Margin="0,0,5,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.SortId}" Width="40" TextAlignment="Center"
+                                   VerticalAlignment="Center" Margin="0,0,0,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.Kmw, StringFormat='{}{0:N1}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.QualId}" Width="30"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.Weight, StringFormat='{}{0:N0} kg'}" Width="70" TextAlignment="Right"
+                                   VerticalAlignment="Center" Margin="0,0,10,0" FontSize="14"/>
+                        <TextBlock Text="{Binding Part.Attribute.Name}" Width="60"
+                                   VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding Part.Cultivation.Name}" Width="50"
+                                   VerticalAlignment="Center"/>
+                        <CheckBox IsChecked="{Binding SplitCompletely, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Content="Vollständig" Tag="{Binding Part.DPNr}"
+                                  VerticalAlignment="Center" Margin="20,0,5,0"
+                                  Checked="SplitCompletelyInput_Changed" Unchecked="SplitCompletelyInput_Changed"/>
+                        <ctrl:UnitTextBox Text="{Binding SplitWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Unit="kg" Width="70" Height="25" IsEnabled="{Binding SplitWeightEnabled}" Tag="{Binding Part.DPNr}"
+                                          VerticalAlignment="Center" Margin="5,0,5,0" FontSize="14" Padding="2" Background="White"
+                                          TextChanged="SplitWeightInput_TextChanged"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" IsEnabled="False"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" IsCancel="True"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Dialogs/DeliverySplittingDialog.xaml.cs

@@ -0,0 +1,163 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+
+namespace Elwig.Dialogs {
+    public partial class DeliverySplittingDialog : ContextWindow {
+
+        public class Row {
+            public DeliveryPart Part { get; set; }
+            public bool SplitCompletely { get; set; }
+            public string? SplitWeightString { get; set; }
+            public int? SplitWeight {
+                get => int.TryParse(SplitWeightString, out var v) ? v : null;
+                set => SplitWeightString = $"{value}";
+            }
+            public bool SplitWeightEnabled { get; set; }
+        }
+
+        private readonly Delivery _delivery;
+
+        public int? MgNr { get; set; }
+        public string? LsNr { get; set; }
+        public int[]? Weights => DeliveryParts.Select(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0).ToArray();
+
+        public ObservableCollection<Row> DeliveryParts { get; set; }
+
+        public DeliverySplittingDialog(Delivery d) {
+            _delivery = d;
+            DeliveryParts = new(d.Parts.Select(p => new Row {
+                Part = p,
+                SplitCompletely = false,
+                SplitWeight = null,
+                SplitWeightEnabled = true,
+            }).ToList());
+            InitializeComponent();
+        }
+
+        protected override async Task OnRenewContext(AppDbContext ctx) {
+            ControlUtils.RenewItemsSource(MemberInput, await ctx.Members
+                .Where(m => m.IsActive)
+                .OrderBy(m => m.Name)
+                .ThenBy(m => m.GivenName)
+                .ToListAsync());
+            ControlUtils.RenewItemsSource(DeliveryInput, await ctx.Deliveries
+                .Where(d => d.DateString == $"{_delivery.Date:yyyy-MM-dd}" && d.ZwstId == _delivery.ZwstId)
+                .OrderBy(d => d.LsNr)
+                .Include(d => d.Member)
+                .Include(d => d.Parts)
+                .ToListAsync());
+            if (DeliveryInput.SelectedItem == null)
+                ControlUtils.SelectItem(DeliveryInput, _delivery);
+            CheckValidity();
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            if (DepreciateModeInput.IsChecked == true) {
+                MgNr = null;
+                LsNr = null;
+            } else if (MemberModeInput.IsChecked == true) {
+                MgNr = ((Member)MemberInput.SelectedItem).MgNr;
+                LsNr = null;
+            } else if (DeliveryModeInput.IsChecked == true) {
+                MgNr = null;
+                LsNr = ((Delivery)DeliveryInput.SelectedItem).LsNr;
+            }
+            DialogResult = true;
+            Close();
+        }
+
+        private void ModeInput_Changed(object sender, RoutedEventArgs evt) {
+            if (!IsLoaded) return;
+            CheckValidity();
+            if (DepreciateModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Hidden;
+                MemberInput.Visibility = Visibility.Hidden;
+                MemberReferenceButton.Visibility = Visibility.Hidden;
+                DeliveryInput.Visibility = Visibility.Hidden;
+            } else if (MemberModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Visible;
+                MemberInput.Visibility = Visibility.Visible;
+                MemberReferenceButton.Visibility = Visibility.Visible;
+                DeliveryInput.Visibility = Visibility.Hidden;
+            } else if (DeliveryModeInput.IsChecked == true) {
+                MgNrInput.Visibility = Visibility.Hidden;
+                MemberInput.Visibility = Visibility.Hidden;
+                MemberReferenceButton.Visibility = Visibility.Hidden;
+                DeliveryInput.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void CheckValidity() {
+            var weight = DeliveryParts.Sum(r => r.SplitCompletely ? r.Part.Weight : r.SplitWeight ?? 0);
+            var total = DeliveryParts.Sum(r => r.Part.Weight);
+            InfoBlock.Text = $"Insgesamt {weight:N0} kg / {total:N0} kg ausgewählt.";
+            ConfirmButton.IsEnabled = DeliveryParts.Any(r => r.SplitCompletely || r.SplitWeight > 0) && (
+                DepreciateModeInput.IsChecked == true ||
+                (MemberModeInput.IsChecked == true && MemberInput.SelectedItem != null && !DeliveryParts.All(r => r.SplitCompletely)) ||
+                (DeliveryModeInput.IsChecked == true && DeliveryInput.SelectedItem != null));
+        }
+
+        private void MgNrInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var res = Validator.CheckMgNr((TextBox)sender, true);
+            var text = MgNrInput.Text;
+            var caret = MgNrInput.CaretIndex;
+            ControlUtils.SelectItemWithPk(MemberInput, res.IsValid ? int.Parse(MgNrInput.Text) : null);
+            MgNrInput.Text = text;
+            MgNrInput.CaretIndex = caret;
+        }
+
+        private void MemberInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            var m = MemberInput.SelectedItem as Member;
+            MgNrInput.Text = m?.MgNr.ToString();
+            CheckValidity();
+        }
+
+        private void MemberReferenceButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberInput.SelectedItem is not Member m) return;
+            App.FocusMember(m.MgNr);
+        }
+
+        private void DeliveryInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
+            CheckValidity();
+        }
+
+        private void SplitCompletelyInput_Changed(object sender, RoutedEventArgs evt) {
+            var checkbox = (CheckBox)sender;
+            var dpnr = int.Parse(checkbox.Tag.ToString()!);
+            var row = DeliveryParts.First(d => d.Part.DPNr == dpnr);
+            if (checkbox.IsChecked == true) {
+                row.SplitWeightEnabled = false;
+                row.SplitWeight = row.Part.Weight;
+            } else if (checkbox.IsChecked == false) {
+                row.SplitWeightEnabled = true;
+                row.SplitWeight = null;
+            }
+            CollectionViewSource.GetDefaultView(DeliveryParts).Refresh();
+            CheckValidity();
+        }
+
+        private void SplitWeightInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            var textbox = (TextBox)sender;
+            Validator.CheckInteger(textbox, false, 6);
+            var dpnr = int.Parse(textbox.Tag.ToString()!);
+            var row = DeliveryParts.First(d => d.Part.DPNr == dpnr);
+            var w = int.TryParse(textbox.Text, out var v) ? v : (int?)null;
+            if (w >= row.Part.Weight) {
+                row.SplitCompletely = true;
+                row.SplitWeightEnabled = false;
+                row.SplitWeight = row.Part.Weight;
+                CollectionViewSource.GetDefaultView(DeliveryParts).Refresh();
+            }
+            CheckValidity();
+        }
+    }
+}

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=PriceInput}"
         Title="Linear wachsen" Height="140" Width="270">

Elwig/Dialogs/LinearPriceIncreaseDialog.xaml.cs

@@ -1,5 +1,4 @@
 using Elwig.Helpers;
-using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -14,7 +13,7 @@ namespace Elwig.Dialogs {
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
-            Price = double.Parse(PriceInput.Text.Replace("\u202f", ""));
+            Price = double.Parse(PriceInput.Text.Replace(Utils.GroupSeparator, ""));
             Close();
         }
 

Elwig/Dialogs/ManualWeighingDialog.xaml

@@ -4,10 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Elwig.Dialogs"
-        mc:Ignorable="d"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
-        ResizeMode="NoResize"
-        ShowInTaskbar="False"
-        Topmost="True"
         WindowStartupLocation="CenterOwner"
         FocusManager.FocusedElement="{Binding ElementName=WeightInput}"
         Title="Handwiegung" Height="170" Width="400">

Elwig/Dialogs/NewSeasonDialog.xaml

@@ -0,0 +1,69 @@
+<Window x:Class="Elwig.Dialogs.NewSeasonDialog"
+        AutomationProperties.AutomationId="NewSeasonDialog"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Dialogs"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        DataContext="{Binding RelativeSource={RelativeSource Self}}"
+        Title="Saison anlegen" Height="180" Width="400">
+    <Window.Resources>
+        <Style TargetType="Label">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="Padding" Value="2,4,2,4"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="ComboBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+        <Style TargetType="CheckBox">
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="VerticalAlignment" Value="Top"/>
+        </Style>
+        <Style TargetType="Button">
+            <Setter Property="HorizontalAlignment" Value="Right"/>
+            <Setter Property="VerticalAlignment" Value="Bottom"/>
+            <Setter Property="Width" Value="100"/>
+            <Setter Property="Height" Value="25"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Label Content="Währung:" Margin="10,10,10,10"/>
+        <ComboBox x:Name="CurrencyInput" Width="150" Margin="130,10,10,10"
+                  ItemsSource="{Binding Currencies}">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Code}" Width="30"/>
+                        <TextBlock Text="- "/>
+                        <TextBlock Text="{Binding Name}"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
+        <Label Content="Nachkommastellen:" Margin="10,40,10,10"/>
+        <ComboBox x:Name="PrecisionInput" Width="50" Margin="130,40,10,10">
+            <ComboBoxItem>2</ComboBoxItem>
+            <ComboBoxItem>3</ComboBoxItem>
+            <ComboBoxItem IsSelected="True">4</ComboBoxItem>
+            <ComboBoxItem>5</ComboBoxItem>
+            <ComboBoxItem>6</ComboBoxItem>
+            <ComboBoxItem>7</ComboBoxItem>
+            <ComboBoxItem>8</ComboBoxItem>
+        </ComboBox>
+
+        <CheckBox x:Name="CopyModifiersInput" Content="Zu-/Abschläge der letzten Saison übernehmen"
+                  Margin="15,75,10,10" IsChecked="{Binding CopyModifiers}"/>
+
+        <Button x:Name="ConfirmButton" Content="Bestätigen" Margin="10,10,115,10" Grid.Column="1" IsDefault="True"
+                Click="ConfirmButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="10,10,10,10" Grid.Column="1" IsCancel="True"/>
+    </Grid>
+</Window>

Elwig/Dialogs/NewSeasonDialog.xaml.cs

@@ -0,0 +1,30 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Elwig.Dialogs {
+    public partial class NewSeasonDialog : Window {
+
+        public IEnumerable<Currency> Currencies { get; set; }
+        public int Year { get; set; }
+
+        public string CurrencyCode => (CurrencyInput.SelectedItem as Currency)!.Code;
+        public byte Precision => (byte)(PrecisionInput.SelectedIndex + 2);
+        public bool CopyModifiers { get; set; }
+
+        public NewSeasonDialog(Season? s, IEnumerable<Currency> currencies) {
+            Currencies = currencies;
+            CopyModifiers = s != null;
+            InitializeComponent();
+            CopyModifiersInput.IsEnabled = s != null;
+            ControlUtils.SelectItemWithPk(CurrencyInput, s?.CurrencyCode ?? "EUR");
+            PrecisionInput.SelectedIndex = (s?.Precision ?? 4) - 2;
+        }
+
+        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
+            DialogResult = true;
+            Close();
+        }
+    }
+}

Elwig/Dialogs/UpdateDialog.xaml

@@ -0,0 +1,32 @@
+<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"
+        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
+        WindowStartupLocation="CenterOwner"
+        Title="Neues Update verfügbar - Elwig" Height="190" Width="400"
+        Closed="OnClosed">
+    <Grid>
+        <TextBlock x:Name="Description" FontSize="14" Margin="0,0,0,40"
+                   HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center">
+            Version <Run x:Name="VersionText" FontWeight="Bold">0.0.0</Run> von Elwig ist verfügbar!
+            (<Hyperlink NavigateUri="https://elwig.at/changelog" RequestNavigate="Hyperlink_RequestNavigate">Änderungen</Hyperlink>)<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,20"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
+                Width="100" Height="27"
+                Click="InstallButton_Click"/>
+        <Button x:Name="CancelButton" Content="Abbrechen" Margin="115,10,10,20" IsCancel="True"
+                FontSize="14" HorizontalAlignment="Center" VerticalAlignment="Bottom"
+                Width="100" Height="27"/>
+    </Grid>
+</Window>

Elwig/Dialogs/UpdateDialog.xaml.cs

@@ -0,0 +1,67 @@
+using Elwig.Helpers;
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Navigation;
+
+namespace Elwig.Dialogs {
+    public partial class UpdateDialog : Window {
+
+        public string Version { get; private set; }
+        public string Url { get; private set; }
+
+        private readonly CancellationTokenSource Cancellation;
+
+        public UpdateDialog(string version, string url, long size) {
+            Version = version;
+            Url = url;
+            Cancellation = new();
+            InitializeComponent();
+            VersionText.Text = version;
+            SizeText.Text = $"{size / 1024 / 1024}";
+        }
+
+        private void OnClosed(object sender, EventArgs evt) {
+            Cancellation.Cancel();
+        }
+
+        private async void InstallButton_Click(object sender, RoutedEventArgs evt) {
+            Description.Visibility = Visibility.Hidden;
+            ProgressBar.Visibility = Visibility.Visible;
+            InstallButton.IsEnabled = false;
+            await Install();
+            Close();
+        }
+
+        public async Task Install() {
+            var fileName = Path.Combine(App.TempPath, $"Elwig-{Version}.exe");
+            try {
+                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;
+                }), Cancellation.Token);
+            } catch (OperationCanceledException) {
+                File.Delete(fileName);
+                return;
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            Process.Start(fileName);
+            DialogResult = true;
+        }
+
+        private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e) {
+            Process.Start(new ProcessStartInfo {
+                FileName = e.Uri.ToString(),
+                UseShellExecute = true,
+            });
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cs

@@ -1,16 +1,19 @@
 using Elwig.Helpers;
+using Elwig.Models;
 using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Globalization;
+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;
@@ -19,9 +22,9 @@ namespace Elwig.Documents {
             var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
             Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
                 $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
                 $"</tbody></table>";
         }
 
@@ -29,8 +32,151 @@ namespace Elwig.Documents {
             get {
                 IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
                 var plz = addr.PostalDest.AtPlz;
-                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
+                return string.Join("\n", ((string?[])[Member.BillingAddress?.FullName, Member.AdministrativeName, Member.ForTheAttentionOf, addr.Address, $"{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}", addr.PostalDest.Country.Name]).Where(s => !string.IsNullOrWhiteSpace(s)));
             }
         }
+
+        private static string GetColGroup(IEnumerable<double> cols) {
+            return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n";
+        }
+
+        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()
+                .Where(s => s.Length > 0)
+                .Order()
+            ];
+            names.AddRange(bucketAttrs);
+            names.Add("Gesamt");
+            discrs.AddRange(bucketAttrs);
+
+            List<double> cols = [40];
+            cols.AddRange(names.Select(_ => 125.0 / names.Count));
+            string tbl = GetColGroup(cols);
+            tbl += "<thead><tr>" +
+                $"<th><b>Sortenaufteilung</b> [kg]</th>" +
+                string.Join("", names.Select(c => $"<th>{c}</th>")) +
+                "</tr></thead>";
+
+            tbl += string.Join("\n", stats
+                .GroupBy(b => b.Variety)
+                .OrderBy(b => b.Key)
+                .Select(g => {
+                    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 = 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>";
+
+            return "<table class=\"sortenaufteilung small number cohere\">" + tbl + "</table>";
+        }
+
+        private static string FormatRow(
+            int obligation, int right, int delivery, int? totalDelivery = null, int? payment = null, int? area = null,
+            bool isGa = false, bool showPayment = false, bool showArea = false
+        ) {
+            totalDelivery ??= delivery;
+            payment ??= delivery;
+
+            if (showArea) {
+                return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" +
+                    $"<td>{obligation:N0}</td>" +
+                    $"<td>{right:N0}</td>";
+            }
+
+            return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" +
+                $"<td>{(totalDelivery < obligation ? $"<b>{obligation - totalDelivery:N0}</b>" : "-")}</td>" +
+                $"<td>{(delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
+                $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
+                (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") +
+                $"<td>{totalDelivery:N0}</td>";
+        }
+
+        private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) {
+            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
+        }
+
+        public string PrintBucketTable(
+            Season season, Dictionary<string, MemberBucket> buckets,
+            bool includeDelivery = true, bool includePayment = false,
+            bool isTiny = false, IEnumerable<string>? filter = null
+        ) {
+            includePayment = includePayment && includeDelivery;
+            string tbl = GetColGroup(!includeDelivery ? [105, 20, 20, 20] : includePayment ? [45, 17, 17, 17, 19, 16, 17, 17] : [45, 20, 20, 20, 20, 20, 20]);
+            tbl += $"""
+                <thead>
+                    <tr>
+                        <th{(!includeDelivery ? " rowspan=\"2\"" : "")}>
+                            <b>{(includeDelivery ? "Lese " + season.Year : "Zusammengefasste Flächenbindungen")}</b>
+                            per {Date:dd.MM.yyyy} {(includeDelivery ? "[kg]" : "")}
+                        </th>
+                        {(!includeDelivery ? "<th>Fläche</th>" : "")}
+                        <th>Lieferpflicht</th>
+                        <th>Lieferrecht</th>
+                        {(includeDelivery ? "<th>Unterliefert</th>" : "")}
+                        {(includeDelivery ? "<th>Noch lieferbar</th>" : "")}
+                        {(includeDelivery ? "<th>Überliefert</th>" : "")}
+                        {(includePayment ? "<th>Zugeteilt</th>" : "")}
+                        {(includeDelivery ? "<th>Geliefert</th>" : "")}
+                    </tr>
+                    {(!includeDelivery ? "<tr><th class=\"unit\">[m²]</th><th class=\"unit\">[kg]</th><th class=\"unit\">[kg]</th></tr>" : "")}
+                </thead>
+                """;
+
+            var mBuckets = buckets
+                .Where(b => ((!includeDelivery && b.Value.Area > 0) ||
+                             (includeDelivery && (b.Value.Right > 0 || b.Value.Obligation > 0 || b.Value.Delivery > 0))) &&
+                            (filter == null || filter.Contains(b.Key[..2])))
+                .ToList();
+            var fbVars = mBuckets
+                .Where(b => b.Value.Right > 0 || b.Value.Obligation > 0)
+                .Select(b => b.Key.Replace("_", ""))
+                .Order()
+                .ToArray();
+            var fbs = mBuckets
+                .Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2)
+                .OrderBy(b => b.Value.Name);
+            var vtr = mBuckets
+                .Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2)
+                .OrderBy(b => b.Value.Name);
+            var rem = mBuckets
+                .Where(b => !fbVars.Contains(b.Key))
+                .OrderBy(b => b.Value.Name);
+
+            tbl += "\n<tbody>\n";
+            tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow(
+                    Member.BusinessShares * season.MinKgPerBusinessShare,
+                    Member.BusinessShares * season.MaxKgPerBusinessShare,
+                    season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
+                    isGa: true, showPayment: includePayment, showArea: !includeDelivery
+                )}</tr>";
+            if (fbs.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    $"Flächenbindungen{(vtr.Any() ? " (inkl. Verträge)" : "")}:</th></tr>";
+                foreach (var (id, b) in fbs) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            if (vtr.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    "Verträge:</th></tr>";
+                foreach (var (id, b) in vtr) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            tbl += "\n</tbody>\n";
+
+            return $"<table class=\"buckets {(isTiny ? "tiny" : "small")} number cohere\">\n" + tbl + "\n</table>";
+        }
     }
 }

Elwig/Documents/BusinessDocument.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">

Elwig/Documents/BusinessDocument.css

@@ -1,5 +1,5 @@
 
-.address-wrapper, aside, main {
+.address-wrapper, aside {
     overflow: hidden;
 }
 
@@ -55,16 +55,16 @@ 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 th {
+aside table thead tr {
     background-color: #E0E0E0;
     font-size: 10pt;
 }
@@ -95,7 +95,10 @@ main > *:first-child {
     margin-top: 0;
 }
 
-main h1, .main-wrapper p {
+main h1,
+main h2,
+main h3,
+.main-wrapper p {
     font-size: 12pt;
     margin: 1em 0;
     text-align: justify;
@@ -116,6 +119,11 @@ main h1 {
     font-size: 10pt;
 }
 
+.main-wrapper p.custom {
+    white-space: pre-wrap;
+    break-inside: avoid;
+}
+
 .main-wrapper .hidden {
     break-before: avoid;
 }
@@ -135,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.cs

@@ -1,40 +1,98 @@
 using Elwig.Helpers;
+using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Elwig.Documents {
     public class CreditNote : BusinessDocument {
 
-        public Credit Credit;
+        public new static string Name => "Traubengutschrift";
+
+        public PaymentMember? Payment;
+        public Credit? Credit;
+        public CreditNoteDeliveryData Data;
         public string? Text;
         public string CurrencySymbol;
-        public string[] BucketNames;
         public int Precision;
-        public IEnumerable<DeliveryPart> Parts;
+        public string MemberModifier;
+        public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
+        public decimal MemberTotalUnderDelivery;
+        public int MemberAutoBusinessShares;
+        public decimal MemberAutoBusinessSharesAmount;
+        public PaymentCustom? CustomPayment;
 
-        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
+        public CreditNote(
+            AppDbContext ctx,
+            PaymentMember p,
+            CreditNoteDeliveryData data,
+            bool considerContractPenalties,
+            bool considerTotalPenalty,
+            bool considerAutoBusinessShares,
+            bool considerCustomModifiers,
+            Dictionary<string, UnderDelivery>? underDeliveries = null
+        ) :
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.FullName)} – {p.Variant.Name}", p.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
-            Credit = c;
+            Data = data;
+            Payment = p;
+            Credit = p.Credit;
+            var season = p.Variant.Season;
+            if (considerCustomModifiers) {
+                CustomPayment = ctx.CustomPayments.Find(p.Year, p.MgNr);
+            }
+
+            var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
+            if (CustomPayment?.ModComment != null) {
+                MemberModifier = CustomPayment.ModComment;
+            } else if (mod != null) {
+                MemberModifier = $"{mod.Name} ({mod.ValueStr})";
+            } else {
+                MemberModifier = "Sonstige Zu-/Abschläge";
+            }
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{c.TgId}</td></tr>" +
+                $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{c.Payment.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{c.ModifiedTimestamp:dd.MM.yyyy} / {c.ModifiedTimestamp:HH:mm}</td></tr>" +
+                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
                 $"</tbody></table>";
-            Text = App.Client.TextDeliveryNote;
+            Text = App.Client.TextCreditNote;
-            DocumentId = $"Tr.-Gutschr. {c.TgId}";
+            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
-            CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
+            CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
-            BucketNames = new string[0]; // FIXME
+            Precision = season.Precision;
-            Precision = c.Payment.Variant.Season.Precision;
+
-            Parts = ctx.DeliveryParts.FromSql($"""
+            if (considerTotalPenalty) {
-                SELECT p.*
+                var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
-                FROM v_delivery v
+                var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
-                JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
-                WHERE (v.year, v.mgnr) = ({c.Year}, {c.Member.MgNr})
+                if (total == 0)
-                ORDER BY sortid, attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, date, time, dpnr
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
-                """).ToList();
+            }
+            if (considerAutoBusinessShares) {
+                var fromDate = $"{season.Year}-01-01";
+                var toDate = $"{season.Year}-12-31";
+                MemberAutoBusinessShares = ctx.MemberHistory
+                    .Where(h => h.MgNr == p.Member.MgNr && h.Type == "auto")
+                    .Where(h => h.DateString.CompareTo(fromDate) >= 0 && h.DateString.CompareTo(toDate) <= 0)
+                    .Sum(h => h.BusinessShares);
+                MemberAutoBusinessSharesAmount = MemberAutoBusinessShares * (-season.BusinessShareValue ?? 0);
+            }
+            if (considerContractPenalties) {
+                var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
+                var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+                var comTypes = ctx.AreaCommitmentTypes.ToDictionary(t => t.VtrgId, t => t);
+                MemberUnderDeliveries = underDeliveries?
+                    .OrderBy(u => u.Key)
+                    .Select(u => (
+                        varieties[u.Key[..2]].Name + (u.Key.Length > 2 ? " " + attributes[u.Key[2..]].Name : ""),
+                        u.Value.Diff,
+                        u.Value.Diff * (comTypes[u.Key].PenaltyPerKg ?? 0)
+                          - (comTypes[u.Key].PenaltyAmount ?? 0)
+                          - ((u.Value.Weight == 0 ? comTypes[u.Key].PenaltyNone : null) ?? 0)))
+                    .Where(u => u.Item3 != 0)
+                    .ToList();
+            }
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -1,87 +1,197 @@
+@using Elwig.Helpers
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
-@{
-    var bucketNum = Model.BucketNames.Length;
-}
 <main>
     <h1>@Model.Title</h1>
     <table class="credit">
         <colgroup>
-            <col style="width: 24mm;"/>
+            <col style="width: 25mm;"/>
-            <col style="width: 6mm;"/>
+            <col style="width:  6mm;"/>
-            <col style="width: 31mm;"/>
+            <col style="width: 21mm;"/>
             <col style="width: 15mm;"/>
-            <col style="width: 8mm;"/>
             <col style="width: 10mm;"/>
-            <col style="width: 12mm;"/>
             <col style="width: 10mm;"/>
-            <col style="width: 12mm;"/>
             <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 13mm;"/>
+            <col style="width:  5mm;"/>
             <col style="width: 17mm;"/>
+            <col style="width: 16mm;"/>
         </colgroup>
         <thead>
             <tr>
-                <th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="3">Pos.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
-                <th rowspan="3" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="3" style="text-align: left;">Attribut</th>
+                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
-                <th rowspan="2" colspan="2">Gradation</th>
+                <th colspan="2">Gradation</th>
-                <th colspan="2">Zu-/Abschläge</th>
+                <th colspan="2">Flächenbindung</th>
-                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
-                <th rowspan="2">Betrag</th>
-            </tr>
-            <tr>
-                <th>Abs.</th>
-                <th>Rel.</th>
-                <th>Gewicht</th>
                 <th>Preis</th>
+                <th class="narrow">Rbl.</th>
+                <th class="narrow">Zu-/Abschläge</th>
+                <th>Betrag</th>
             </tr>
             <tr>
-                <th>[°Oe]</th>
+                <th class="unit">[°Oe]</th>
-                <th>[°KMW]</th>
+                <th class="unit narrow">[°KMW]</th>
-                <th>[@Model.CurrencySymbol/kg]</th>
+                <th class="unit" colspan="2">[kg]</th>
-                <th>[%]</th>
+                <th class="unit">[@Model.CurrencySymbol/kg]</th>
-                <th>[kg]</th>
+                <th class="narrow unit">[%]</th>
-                <th>[@Model.CurrencySymbol/kg]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
-                <th>[@Model.CurrencySymbol]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
             </tr>
         </thead>
-        <tbody>
+        <tbody class="sum">
-            @{
+            @foreach (var p in Model.Data.Rows) {
-                string FormatRow(int? weight, decimal? amount) {
+                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
-                    var w = weight == null || weight == 0 ? "-" : $"{weight:N0}";
+                @for (int i = 0; i < rows; i++) {
-                    return $"<td class='weight'>{w}</td><td class='amount'>{amount?.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)))}</td>";
+                    <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")">
-                }
+                        @if (i == 0) {
-                string? last = null;
+                            <td rowspan="@rows">@p.LsNr</td>
-            }
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
-            @foreach (var part in Model.Parts) {
+                            <td class="small">@p.Variety</td>
-                var pmt = part.Payment;
+                            <td class="small">
-                var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
+                                @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation
-                var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
+                                @((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI" ? " / " : "")@Raw(p.QualId == "WEI" ? "<i>abgew.</i>" : "")
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
+                            </td>
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
+                        }
-                    <td rowspan="@bucketNum" class="attribute">@part.Attribute?.Name</td>
+                        @if (i > 0 && i <= p.Modifiers.Length) {
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
+                            <td colspan="4" class="small mod">@p.Modifiers[i - 1]</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                        } else if (i > 0) {
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
+                            <td colspan="4"></td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
+                        }
-                    <!--FIXME price-->
+                        @if (i < p.Buckets.Length) {
-                    @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(0)?.Value, 0))
+                            var bucket = p.Buckets[i];
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                            <td class="small">@bucket.Name:</td>
-                </tr>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
-                @for (int i = 1; i < bucketNum; i++) {
+                            <td class="number">@($"{bucket.Price:N4}")</td>
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
+                        } else {
-                        <!--FIXME price-->
+                            <td></td>
-                        @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(i)?.Value, 0))
+                        }
+                        @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 {
+                            <td colspan="2"></td>
+                        }
                     </tr>
                 }
-                last = part.SortId;
             }
         </tbody>
     </table>
+    <div class="hint">
+        Hinweis:<br/>
+        Die Summe der Lieferungen und die Summe der anfal&shy;lenden Pönalen werden mit
+        @Model.Payment?.Variant.Season.Precision Nach&shy;komma&shy;stellen berechnent,
+        erst das Ergebnis wird kauf&shy;männisch auf 2 Nach&shy;komma&shy;stellen gerundet.
+    </div>
+    <table class="credit-sum">
+        <colgroup>
+            <col style="width: auto;"/>
+            <col style="width:  5mm;"/>
+            <col style="width: 30mm;"/>
+        </colgroup>
+        @{
+            string FormatRow(string name, decimal? value, bool add = false, bool bold = false, bool subCat = false, bool noTopBorder = false) {
+                return $"<tr class=\"{(!add && !noTopBorder ? "sum" : !add ? "large" : "")} {(bold ? "large bold" : "")}\">"
+                     + $"<td class=\"{(subCat ? "small" : "")}\">{name}:</td>"
+                     + $"<td class=\"number {(subCat ? "small" : "large")}\">{(value < 0 ? "–" : (add ? "+" : ""))}</td>"
+                     + $"<td class=\"number {(subCat ? "small" : "large")}\">"
+                     +   $"<span class=\"fleft\">{Model.CurrencySymbol}</span>{Math.Abs(value ?? 0):N2}</td>"
+                     + $"</tr>\n";
+            }
+        }
+        <tbody style="break-inside: avoid;">
+            @{ var sum = Model.Data.Rows.Sum(p => p.Amount); }
+            @if (Model.Payment == null) {
+                @Raw(FormatRow("Gesamt", sum, bold: true, noTopBorder: true))
+            } else {
+                var noBorder = true;
+                if (Model.Payment.NetAmount != Model.Payment.Amount) {
+                    @Raw(FormatRow("Zwischensumme", Model.Payment.NetAmount, noTopBorder: noBorder))
+                    noBorder = false;
+                    @Raw(FormatRow(Model.MemberModifier, Model.Payment.Amount - Model.Payment.NetAmount, add: true))
+                }
+                if (Model.Credit == null) {
+                    @Raw(FormatRow("Gesamtbetrag", Model.Payment.Amount, bold: true, noTopBorder: noBorder))
+                    // TODO Mock VAT
+                } else {
+                    var hasPrev = Model.Credit.PrevNetAmount != null;
+                    @Raw(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Model.Credit.NetAmount, bold: true, noTopBorder: noBorder))
+                    if (hasPrev) {
+                        @Raw(FormatRow("Bisher berücksichtigt", -Model.Credit.PrevNetAmount, add: true))
+                        @Raw(FormatRow("Nettobetrag", Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0)))
+                    }
+                    @Raw(FormatRow($"Mehrwertsteuer ({Model.Credit.Vat * 100} %)", Model.Credit.VatAmount, add: true))
+                    @Raw(FormatRow("Bruttobetrag", Model.Credit.GrossAmount, bold: true))
+                }
+            }
+        </tbody>
+        <tbody style="break-inside: avoid;">
+            @{
+                decimal penalty = 0;
+                string? comment = null;
+            }
+
+            @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
+                <tr class="small">
+                    <td colspan="2" style="padding-top: 5mm;">Anfallende Pönalen durch Unterlieferungen:</td>
+                    <td></td>
+                </tr>
+                foreach (var u in Model.MemberUnderDeliveries) {
+                    @Raw(FormatRow($"{u.Name} ({u.Kg:N0} kg)", u.Amount, add: true, subCat: true))
+                    penalty += u.Amount;
+                }
+                penalty = Math.Round(penalty, 2, MidpointRounding.AwayFromZero);
+            }
+            @if (Model.MemberTotalUnderDelivery != 0) {
+                @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
+                penalty += Model.MemberTotalUnderDelivery;
+            }
+            @if (Model.MemberAutoBusinessSharesAmount != 0) {
+                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
+                penalty += Model.MemberAutoBusinessSharesAmount;
+            }
+            @if (Model.CustomPayment?.Amount != null) {
+                comment = Model.CustomPayment.Comment;
+                string text = (Model.CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
+                if (comment != null && comment!.Length <= 30) {
+                    text = comment;
+                    comment = null;
+                }
+                @Raw(FormatRow(text, Model.CustomPayment.Amount.Value, add: true));
+                penalty += Model.CustomPayment.Amount.Value;
+            }
+
+            @if (Model.Credit == null) {
+                @Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true))
+            } else {
+                var diff = Model.Credit.Modifiers - penalty;
+                if (diff != 0) {
+                    @Raw(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true))
+                }
+                if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) {
+                    @Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true))
+                }
+                @Raw(FormatRow("Auszahlungsbetrag", Model.Credit.Amount, bold: true))
+            }
+        </tbody>
+    </table>
+    @if (comment != null) {
+        <p>* @comment</p>
+    }
+    <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
+    <div style="margin-top: 1em;">
+        @if (Model.Text != null) {
+            <p class="custom">@Model.Text</p>
+        }
+    </div>
 </main>

Elwig/Documents/CreditNote.css

@@ -1,64 +1,48 @@
 
 table.credit {
-    font-size: 10pt;
+    margin-bottom: 0;
 }
 
-table.credit th,
+table.credit .mod {
-table.credit td {
+    padding-left: 5mm;
-    padding: 0 0.25mm;
 }
 
-table.credit thead {
+table.credit tbody tr:not(.first) {
-    font-size: 8pt
-}
-
-table.credit thead th {
-    font-weight: normal;
-    font-style: italic;
-    vertical-align: bottom;
-}
-
-table.credit td {
-    vertical-align: top;
-}
-
-table.credit .oe,
-table.credit .kmw {
-    text-align: center;
-}
-
-table.credit .dpnr {
-    text-align: center;
-}
-
-table.credit .amount,
-table.credit .weight {
-    text-align: right;
-}
-
-table.credit .rel,
-table.credit .abs {
-    text-align: center;
-}
-
-table.credit .amount.sum {
-    vertical-align: bottom;
-    padding-bottom: 1mm;
-}
-
-table.credit tbody tr:not(.first):not(.last) {
     break-before: avoid;
+}
+
+table.credit tbody tr:not(.last) {
     break-after: avoid;
 }
 
-table.credit tbody tr.first td {
+table.credit tr:not(.first) td {
-    padding-top: 1mm;
+    padding-top: 0;
 }
 
-table.credit tbody tr.last td {
+table.credit tr.last td {
-    padding-bottom: 1mm;
+    padding-bottom: 0;
 }
 
-table.credit tbody tr.new {
+table.credit-sum {
-    border-top: 0.5pt solid black;
+    width: 60%;
+    margin-left: 40%;
+}
+
+table.credit-sum tr.sum,
+table.credit-sum tr .sum {
+    font-size: 12pt;
+}
+
+table.credit-sum tr.sum td,
+table.credit-sum td.sum {
+    padding-top: 1mm !important;
+}
+
+.hint {
+    font-style: italic;
+    font-size: 8pt;
+    width: 56mm;
+    position: absolute;
+    left: 0;
+    margin: 2mm 4mm;
 }

Elwig/Documents/DeliveryAncmtList.cs

@@ -0,0 +1,21 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryAncmtList : Document {
+
+        public new static string Name => "Anmeldeliste";
+
+        public string Filter;
+        public IEnumerable<DeliveryAncmtListRow> Announcements;
+
+        public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) : base($"{Name} {filter}") {
+            Filter = filter;
+            Announcements = announcements;
+        }
+
+        public DeliveryAncmtList(string filter, DeliveryAncmtListData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -0,0 +1,52 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
+@model Elwig.Documents.DeliveryAncmtList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
+<main>
+    <h1>Anmeldeliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="announcement-list">
+        <colgroup>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 50mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 11mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">MgNr.</th>
+                <th rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Ort</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2">Anmldg.</th>
+                <th>Menge</th>
+            </tr>
+            <tr>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var a in Model.Announcements) {
+                <tr>
+                    <td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
+                    <td class="number">@a.MgNr</td>
+                    <td>@a.AdministrativeName</td>
+                    <td class="small">@a.DefaultKg</td>
+                    <td>@a.Variety</td>
+                    <td class="small center">@(a.Status ?? "-")</td>
+                    <td class="number">@($"{a.Weight:N0}")</td>
+                </tr>
+            }
+            <tr class="sum bold">
+                <td colspan="2">Gesamt:</td>
+                <td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>

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

@@ -7,20 +7,23 @@ using System.Collections.Generic;
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
-        public Season Season;
+        public new static string Name => "Anlieferungsbestätigung";
-        public DeliveryConfirmationData Data;
-        public string? Text = App.Client.TextDeliveryConfirmation;
-        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationData data) :
+        public Season Season;
-            base($"Anlieferungsbestätigung {year}", m) {
+        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) {
             Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;
-            IncludeSender = true;
             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

@@ -1,177 +1,112 @@
+@using Elwig.Documents
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
 <main>
     <h1>@Model.Title</h1>
     <table class="delivery-confirmation">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width: 5mm;"/>
+            <col style="width:  6mm;"/>
-            <col style="width: 20mm;"/>
+            <col style="width: 23mm;"/>
-            <col style="width: 21mm;"/>
+            <col style="width: 16mm;"/>
-            <col style="width: 19mm;"/>
+            <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>
             <tr>
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2">Pos.</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>Menge</th>
+                <th rowspan="3" style="padding: 0;">
+                    <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
+                        <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
+                              style="text-anchor: start; alignment-baseline: middle;">
+                            gerebelt
+                        </text>
+                    </svg>
+                </th>
                 <th>Davon<br/>abzuwerten</th>
             </tr>
             <tr>
-                <th>[°Oe]</th>
+                <th class="unit">[°Oe]</th>
-                <th>[°KMW]</th>
+                <th class="unit narrow">[°KMW]</th>
-                <th colspan="2">[kg]</th>
+                <th class="unit" colspan="2">[kg]</th>
-                <th>[kg]</th>
+                <th class="unit">[kg]</th>
-                <th>[kg]</th>
+                <th class="unit">[kg]</th>
             </tr>
         </thead>
         <tbody>
             @{
-                var lastVariant = "";
+                var lastVariety = "";
             }
             @foreach (var p in Model.Data.Rows) {
                 var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
                 var first = true;
                 @for (int i = 0; i < rows; i++) {
-                    <tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                    <tr class="@(first ? "first" : "") @(p.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
                         @if (first) {
                             <td rowspan="@rows">@p.LsNr</td>
-                            <td rowspan="@rows">@p.DPNr</td>
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
-                            <td class="small">@p.Variant</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="grad">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
-                            <td rowspan="@rows" class="grad">@($"{p.Gradation.Kmw:N1}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }
                         @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="3" class="mod">@(p.Modifiers[i - 1])</td>
+                            <td colspan="3" class="small mod">@(p.Modifiers[i - 1])</td>
                         } else if (i > 0) {
                             <td colspan="3"></td>
                         }
                         @if (i < p.Buckets.Length) {
                             var bucket = p.Buckets[i];
-                            <td class="geb">@bucket.Name:</td>
+                            <td class="small">@bucket.Name:</td>
-                            <td class="weight">@($"{bucket.Value:N0}")</td>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
                         } else {
                             <td colspan="2"></td>
                         }
                         @if (i == p.Buckets.Length - 1) {
-                            <td class="weight">@($"{p.Weight:N0}")</td>
+                            <td class="number">@($"{p.Weight:N0}")</td>
+                            <td style="font-size: 7pt;">@(p.IsNetWeight ? "\u2611" : "\u2610")</td>
                         } else {
                             <td></td>
+                            <td></td>
                         }
                         @if (first) {
-                            <td rowspan="@rows" class="weight"></td>
+                            <td rowspan="@rows" class="number"></td>
                             first = false;
                         }
                     </tr>
-                    lastVariant = p.Variant;
+                    lastVariety = p.Variety;
                 }
             }
-            <tr class="sum">
+            <tr class="sum bold">
                 <td colspan="8">Gesamt:</td>
-                <td colspan="2" class="weight">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
+                <td></td>
                 <td></td>
             </tr>
         </tbody>
     </table>
-    <table class="delivery-confirmation-stats">
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
-        <colgroup>
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
-            <col style="width: 45mm;"/>
+    <div style="margin-top: 2em;">
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 19mm;"/>
-            <col style="width: 16mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 17mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th><b>Lese @Model.Season.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
-                <th>Lieferpflicht</th>
-                <th>Lieferrecht</th>
-                <th>Unterliefert</th>
-                <th>Noch lieferbar</th>
-                <th>Überliefert</th>
-                <th>Zugeteilt</th>
-                <th>Geliefert</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                string FormatRow(int mode, int obligation, int right, int sum, int? payment = null) {
-                    var isGa = mode == 0;
-                    payment ??= sum;
-                    return $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>" +
-                        $"<td>{(mode == 1 ? "" : payment < obligation ? $"<b>{obligation - payment:N0}\x3c/b>" : "-")}</td>" +
-                        $"<td>{(mode == 1 ? "" : payment >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                        $"<td>{(mode == 1 ? "" : obligation == 0 && right == 0 ? "-" : (sum > right ? ((isGa ? "<b>" : "") + $"{sum - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
-                        $"<td>{(mode != 2 ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" +
-                        $"<td>{sum:N0}</td>";
-                }
-                var mBuckets = Model.MemberBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
-                var fbVars = mBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
-                var fbs = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2).OrderBy(b => b.Value.Item1);
-                var vtr = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2).OrderBy(b => b.Value.Item1);
-                var rem = mBuckets.Where(b => !fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
-            }
-            <tr>
-                <th>Gesamtlieferung lt. gez. GA</th>
-                @Raw(FormatRow(
-                    0,
-                    Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
-                    Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare,
-                    Model.Member.Deliveries.Where(d => d.Year == Model.Season.Year).Sum(d => d.Weight)
-                ))
-            </tr>
-            @if (rem.Any()) {
-                <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in rem) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(1, obligation, right, sum, payment))
-                </tr>
-            }
-            @if (fbs.Any()){
-                <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in fbs) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(2, obligation, right, sum, payment))
-                </tr>
-            }
-            @if (vtr.Any()) {
-                <tr class="subheading"><th colspan="8">Verträge:</th></tr>
-            }
-            @foreach (var (id, (name, right, obligation, sum, payment)) in vtr) {
-                <tr>
-                    <th>@name</th>
-                    @Raw(FormatRow(2, obligation, right, sum, payment))
-                </tr>
-            }
-        </tbody>
-    </table>
-    <div class="text" style="margin-top: 2em;">
         @if (Model.Text != null) {
-            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+            <p class="custom comment">@Model.Text</p>
         }
     </div>
 </main>

Elwig/Documents/DeliveryConfirmation.css

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

Elwig/Documents/DeliveryDepreciationList.cs

@@ -0,0 +1,22 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryDepreciationList : Document {
+
+        public new static string Name => "Abwertungsliste";
+
+        public string Filter;
+        public IEnumerable<DeliveryJournalRow> Deliveries;
+
+        public DeliveryDepreciationList(string filter, IEnumerable<DeliveryJournalRow> deliveries) :
+            base($"{Name} {filter}") {
+            Filter = filter;
+            Deliveries = deliveries;
+        }
+
+        public DeliveryDepreciationList(string filter, DeliveryJournalData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/DeliveryDepreciationList.cshtml

@@ -0,0 +1,104 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
+@model Elwig.Documents.DeliveryDepreciationList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
+<main>
+    <h1>Abwertungsliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="journal">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width:  6mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 35mm;"/>
+            <col style="width: 30mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">Zeit</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
+                <th colspan="2">Gradation</th>
+                <th>Menge</th>
+            </tr>
+            <tr>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                int? lastMember = null;
+            }
+            @foreach (var p in Model.Deliveries) {
+                if (lastMember != p.MgNr) {
+                    <tr class="subheading @(lastMember != null ? "new" : "")">
+                        @{
+                            var memberDeliveries = Model.Deliveries.Where(d => d.MgNr == p.MgNr).ToList();
+                            var memberKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(memberDeliveries);
+                            var memberOe = Elwig.Helpers.Utils.KmwToOe(memberKmw);
+                        }
+                        <th colspan="5">
+                            @($"{p.MgNr}, {p.AdministrativeName}")
+                        </th>
+                        <td>Teil-Lfrg.: <span style="float: right;">@($"{memberDeliveries.Count():N0}")</span></td>
+                        <td class="center">@($"{memberOe:N0}")</td>
+                        <td class="center">@($"{memberKmw:N1}")</td>
+                        <td class="number">@($"{memberDeliveries.Sum(p => p.Weight):N0}")</td>
+                    </tr>
+                }
+                <tr>
+                    <td>@p.LsNr</td>
+                    <td class="center narrow">@p.Pos</td>
+                    <td>@($"{p.Date:dd.MM.yyyy}")</td>
+                    <td>@($"{p.Time:HH:mm}")</td>
+                    <td>@p.Variety</td>
+                    <td>@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
+                    <td class="center">@($"{p.Oe:N0}")</td>
+                    <td class="center">@($"{p.Kmw:N1}")</td>
+                    <td class="number">@($"{p.Weight:N0}")</td>
+                </tr>
+                lastMember = p.MgNr;
+            }
+            @{
+                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+                if (branches.Length > 1) {
+                    foreach (var b in branches) {
+                        <tr class="@(branches[0] == b ? "sum" : "") bold">
+                            @{
+                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
+                            }
+                            <td colspan="2">@b:</td>
+                            <td colspan="4">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
+                            <td class="center">@($"{branchOe:N0}")</td>
+                            <td class="center">@($"{branchKmw:N1}")</td>
+                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
+                        </tr>
+                    }
+                }
+            }
+            <tr class="sum bold">
+                @{
+                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
+                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
+                }
+                <td colspan="2">Gesamt:</td>
+                <td colspan="4">(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>
+            </tr>
+        </tbody>
+    </table>
+</main>

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

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

Elwig/Documents/DeliveryJournal.cshtml

@@ -2,17 +2,17 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryJournal>
 @model Elwig.Documents.DeliveryJournal
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
 <main>
     <h1>Lieferjournal</h1>
     <h2>@Model.Filter</h2>
     <table class="journal">
         <colgroup>
             <col style="width: 25mm;"/>
-            <col style="width: 5mm;"/>
+            <col style="width:  6mm;"/>
-            <col style="width: 17mm;"/>
+            <col style="width: 15mm;"/>
-            <col style="width: 10mm;"/>
+            <col style="width:  8mm;"/>
-            <col style="width: 8mm;"/>
+            <col style="width: 11mm;"/>
             <col style="width: 38mm;"/>
             <col style="width: 28mm;"/>
             <col style="width: 10mm;"/>
@@ -22,45 +22,65 @@
         <thead>
             <tr>
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2">Pos.</th>
+                <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>
+                <th>Menge</th>
             </tr>
             <tr>
-                <th>[°Oe]</th>
+                <th class="unit">[°Oe]</th>
-                <th>[°KMW]</th>
+                <th class="unit narrow">[°KMW]</th>
-                <th>[kg]</th>
+                <th class="unit">[kg]</th>
             </tr>
         </thead>
         <tbody>
             @foreach (var p in Model.Deliveries) {
                 <tr>
-                    <td>@p.Delivery.LsNr</td>
+                    <td>@p.LsNr</td>
-                    <td>@p.DPNr</td>
+                    <td class="center narrow">@p.Pos</td>
-                    <td>@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{p.Date:dd.MM.yyyy}")</td>
-                    <td>@($"{p.Delivery.Time:HH:mm}")</td>
+                    <td class="small">@($"{p.Time:HH:mm}")</td>
-                    <td class="mgnr">@p.Delivery.Member.MgNr</td>
+                    <td class="number">@p.MgNr</td>
-                    <td>@p.Delivery.Member.AdministrativeName</td>
+                    <td class="small">@p.AdministrativeName</td>
-                    <td>@p.Variant.Name</td>
+                    <td class="small">@p.Variety</td>
-                    <td class="grad">@($"{p.Oe:N0}")</td>
+                    <td class="center">@($"{p.Oe:N0}")</td>
-                    <td class="grad">@($"{p.Kmw:N1}")</td>
+                    <td class="center">@($"{p.Kmw:N1}")</td>
-                    <td class="weight">@($"{p.Weight:N0}")</td>
+                    <td class="number">@($"{p.Weight:N0}")</td>
                 </tr>
             }
-            <tr class="sum">
+            @{
+                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+                if (branches.Length > 1) {
+                    foreach (var b in branches) {
+                        <tr class="@(branches[0] == b ? "sum" : "") bold">
+                            @{
+                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
+                            }
+                            <td colspan="2">@b:</td>
+                            <td colspan="5">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
+                            <td class="center">@($"{branchOe:N0}")</td>
+                            <td class="center">@($"{branchKmw:N1}")</td>
+                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
+                        </tr>
+                    }
+                }
+            }
+            <tr class="sum bold">
                 @{
                     var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
                     var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
                 }
                 <td colspan="2">Gesamt:</td>
-                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.Delivery).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
+                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
-                <td class="grad">@($"{oe:N0}")</td>
+                <td class="center">@($"{oe:N0}")</td>
-                <td class="grad">@($"{kmw:N1}")</td>
+                <td class="center">@($"{kmw:N1}")</td>
-                <td class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
             </tr>
         </tbody>
     </table>

Elwig/Documents/DeliveryJournal.css

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

Elwig/Documents/DeliveryNote.cs

@@ -5,9 +5,11 @@ 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, (string, int, int, int, int)> MemberBuckets;
+        public Dictionary<string, MemberBucket> MemberBuckets;
 
         // 0 - none
         // 1 - GA only
@@ -15,19 +17,19 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext ctx) : 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;
             Aside = Aside.Replace("</table>", "") +
                 $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.</th><td>{d.LsNr}</td></tr>" +
+                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
         }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -2,16 +2,16 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
-<table class="delivery">
+<table class="delivery large">
     <colgroup>
         <col style="width: 10.00mm;"/>
-        <col style="width: 21.25mm;"/>
+        <col style="width: 21.00mm;"/>
-        <col style="width: 21.25mm;"/>
+        <col style="width: 25.00mm;"/>
-        <col style="width: 21.25mm;"/>
+        <col style="width: 19.50mm;"/>
-        <col style="width: 21.25mm;"/>
+        <col style="width: 19.50mm;"/>
         <col style="width: 30.00mm;"/>
         <col style="width: 12.50mm;"/>
         <col style="width: 12.50mm;"/>
@@ -19,30 +19,38 @@
     </colgroup>
     <thead>
         <tr>
-            <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
+            <th class="main center narrow" rowspan="2">Pos.</th>
             <th class="main" rowspan="2" colspan="2">Sorte</th>
             <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <th>Menge</th>
         </tr>
         <tr>
-            <th style="font-size: 8pt;">[°Oe]</th>
+            <th class="unit">[°Oe]</th>
-            <th style="font-size: 8pt;">[°KMW]</th>
+            <th class="unit narrow">[°KMW]</th>
-            <th style="font-size: 8pt;">[kg]</th>
+            <th class="unit">[kg]</th>
         </tr>
     </thead>
     <tbody>
         @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
             <tr class="main">
-                <td style="text-align: center;">@part.DPNr</td>
+                <td class="center">@part.DPNr</td>
-                <td colspan="2">@part.Variant.Name</td>
+                <td colspan="2">@part.Variety.Name</td>
                 <td colspan="2">@part.Attribute?.Name</td>
                 <td>@part.Quality.Name</td>
-                <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
+                <td class="center">@($"{part.Oe:N0}")</td>
-                <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
+                <td class="center">@($"{part.Kmw:N1}")</td>
-                <td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</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,18 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                @if (part.IsManualWeighing) {
-                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
+                    <i>Handwiegung @(part.IsNetWeight ? " (gerebelt gewogen)" : " (nicht gerebelt gewogen)")</i>@Raw(part.WeighingReason != null ? ", <i>Begründung:</i> " : "") @part.WeighingReason
+                } else {
+                    var info = part.WeighingInfo;
+                    <i>Waage:</i> @(part.ScaleId ?? "?")@(", ") <i>ID:</i> @(info.Id ?? "?")
+                    @(info.Date != null || info.Time != null ? " – " : "")@(info.Time != null ? $"{info.Time:HH:mm}" : "")@(info.Date != null ? $", {info.Date:dd.MM.yyyy}" : "")
+                    @if (info.Gross != null && info.Tare != null && info.Net != null) {
+                        <br/><i>Brutto:</i> @($"{info.Gross:N0} kg")@(" – ") <i>Tara:</i> @($"{info.Tare:N0} kg")@(" – ") <i>Netto:</i> @($"{info.Net:N0} kg")@(" – ")@Raw(part.IsNetWeight ? "<i>gerebelt gewogen</i>" : "<i>nicht gerebelt gewogen</i>")
+                    } else {
+                        @Raw($" <i>({(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen")})</i>")
+                    }
+                }
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
@@ -63,11 +81,11 @@
             }
         }
         @if (Model.Delivery.Parts.Count() > 1) {
-            <tr class="main sum">
+            <tr class="main sum bold">
                 <td colspan="6">Gesamt:</td>
-                <td style="text-align: center;">@($"{Model.Delivery.Oe:N0}")</td>
+                <td class="center">@($"{Model.Delivery.Oe:N0}")</td>
-                <td style="text-align: center;">@($"{Model.Delivery.Kmw:N1}")</td>
+                <td class="center">@($"{Model.Delivery.Kmw:N1}")</td>
-                <td style="text-align: right;">@($"{Model.Delivery.Weight:N0}")</td>
+                <td class="number">@($"{Model.Delivery.Weight:N0}")</td>
             </tr>
         }
     </tbody>
@@ -76,63 +94,12 @@
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
 @if (Model.DisplayStats > 0) {
-    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
+    @Raw(Model.PrintBucketTable(
-        <colgroup>
+        Model.Delivery.Season, Model.MemberBuckets, isTiny: true,
-            <col style="width: 45mm;"/>
+        filter: Model.DisplayStats > 2 ? null :
-            <col style="width: 20mm;"/>
+                Model.DisplayStats == 1 ? new List<string>() :
-            <col style="width: 20mm;"/>
+                Model.Delivery.Parts.Select(p => p.SortId).Distinct().ToList()
-            <col style="width: 20mm;"/>
+    ))
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
-                <th>Lieferpflicht</th>
-                <th>Lieferrecht</th>
-                <th>Unterliefert</th>
-                <th>Noch lieferbar</th>
-                <th>Überliefert</th>
-                <th>Geliefert</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                string FormatRow(int obligation, int right, int sum) {
-                    return $"<td>{obligation:N0}</td>" +
-                        $"<td>{right:N0}</td>" +
-                        $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                        $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                        $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                        $"<td>{sum:N0}</td>";
-                }
-                var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                var buckets = Model.MemberBuckets.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
-            }
-            <tr>
-                <th>Gesamtlieferung lt. gez. GA</th>
-                @Raw(FormatRow(
-                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
-                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
-                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
-                ))
-            </tr>
-            @if (Model.DisplayStats > 1) {
-                <tr class="subheading">
-                    <th>Flächenbindungen:</th>
-                </tr>
-                    @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBuckets.OrderBy(b => b.Key)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
-                    }
-                }
-            }
-        </tbody>
-    </table>
 }
 </main>
 @for (int i = 0; i < 2; i++) {

Elwig/Documents/DeliveryNote.css

@@ -11,12 +11,6 @@ table.delivery tr:not(.main) {
     break-before: avoid;
 }
 
-table.delivery th {
-    font-weight: normal;
-    font-style: italic;
-    font-size: 10pt;
-}
-
 table.delivery th.main {
     text-align: left;
 }
@@ -43,55 +37,10 @@ table.delivery tr.tight:has(+ tr:not(.tight)) td {
     padding-bottom: 0.5mm !important;
 }
 
-table.delivery tr.sum {
-    border-top: 0.5pt solid black;
-    break-before: avoid;
-}
-
 table.delivery tr.sum td {
     padding-top: 1mm;
 }
 
 table.delivery-note-stats {
-    font-size: 8pt;
-    break-inside: avoid;
     break-after: avoid;
 }
-
-table.delivery-note-stats th,
-table.delivery-note-stats td {
-    padding: 0.125mm 0;
-}
-
-table.delivery-note-stats:not(.expanded) tr.optional {
-    display: none;
-}
-
-table.delivery-note-stats tr.subheading th {
-    text-align: left;
-}
-
-table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
-table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
-    display: none;
-}
-
-table.delivery-note-stats thead th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: right;
-}
-
-table.delivery-note-stats thead th:first-child {
-    text-align: left;
-}
-
-table.delivery-note-stats td {
-    text-align: right;
-}
-
-table.delivery-note-stats tbody th {
-    font-weight: normal;
-    font-style: italic;
-    text-align: left;
-}

Elwig/Documents/Document.Page.css

@@ -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;
@@ -68,4 +68,9 @@ hr.page-break {
     .page::after {
         content: "Seite " counter(page) " von " counter(pages) !important;
     }
+
+    a {
+        text-decoration: inherit;
+        color: inherit;
+    }
 }

Elwig/Documents/Document.Table.css

@@ -0,0 +1,178 @@
+
+main table {
+    border-collapse: collapse;
+    margin-bottom: 10mm;
+    font-size: 10pt;
+}
+main table.large {font-size: 12pt;}
+main table.tiny {
+    font-size: 8pt;
+    margin-bottom: 5mm;
+}
+
+main table.border {
+    border: var(--border-thickness) solid black;
+}
+
+main table tr {
+    break-inside: avoid;
+}
+
+main table th,
+main table td {
+    overflow: hidden;
+    white-space: nowrap;
+    vertical-align: middle;
+    padding: 0.5mm 1mm;
+    font-weight: normal;
+}
+main table.small th,
+main table.small td,
+main table.tiny th,
+main table.tiny td {
+    padding: 0.125mm 0.125mm;
+}
+
+main table td[rowspan] {
+    vertical-align: top;
+}
+
+main table thead {
+    font-size: 8pt;
+}
+main table.large thead {
+    font-size: 10pt;
+}
+
+main table th {
+    font-style: italic;
+}
+
+main table tbody {
+}
+
+main table .small {
+    font-size: 8pt;
+}
+main table .large {
+    font-size: 12pt;
+}
+main table .tiny {
+    font-size: 6pt;
+}
+
+main table.number td,
+main table.number th {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+main table.number thead th,
+main table.number td,
+main table tbody td.number {
+    text-align: right;
+}
+
+main table.center tbody td,
+main table tbody td.center {
+    text-align: center;
+}
+
+main table tbody th {
+    text-align: left;
+}
+
+main table.cohere {
+    break-inside: avoid;
+}
+
+main table tr.subheading th,
+main table tr.subheading td {
+    font-weight: bold;
+}
+
+main table tr.subheading th {
+    text-align: left;
+    font-size: 10pt;
+}
+
+main table.small tr.subheading th,
+main table.small tr.subheading td,
+main table.tiny tr.subheading th,
+main table.tiny tr.subheading td {
+    font-size: 8pt;
+}
+
+main table tr.sectionheading {
+    background-color: #E0E0E0;
+}
+
+main table tr.sectionheading th {
+    padding-top: 0.5mm;
+    padding-bottom: 0.5mm;
+    font-weight: bold;
+    text-align: center;
+    font-size: 10pt;
+    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 {
+    text-align: left;
+}
+
+main table tr.bold td {
+    font-weight: bold;
+}
+
+main table tr.sum,
+main table td.sum,
+main table tr.new,
+main table tr.border {
+    border-top: var(--border-thickness) solid black;
+}
+
+main table th.unit {
+    font-size: 8pt;
+}
+
+main table.number th.unit {
+    padding-right: 2mm;
+}
+
+main table th.narrow {
+    padding-left: 0;
+    padding-right: 0;
+}
+
+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: var(--border-thickness) solid black;
+}

Elwig/Documents/Document.cs

@@ -5,27 +5,36 @@ 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 {
 
-        private TempFile? _pdfFile = null;
+        public static string Name => "Dokument";
+
+        protected static readonly double GenerationProportion = 0.125;
+
+        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 string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
         public string Author;
         public string Header;
         public string Footer;
-        public DateTime Date;
+        public DateOnly Date;
 
         public Document(string title) {
             var c = App.Client;
-            DataPath = App.DataPath;
+            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
@@ -33,10 +42,12 @@ namespace Elwig.Documents {
             Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
                 .Item(c.NameFull).NextLine()
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
-                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
+                .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                    .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
+                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
+                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
                 .ToString();
-            Date = DateTime.Today;
+            Date = DateOnly.FromDateTime(Utils.Today);
         }
 
         ~Document() {
@@ -53,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) {
@@ -63,10 +78,22 @@ namespace Elwig.Documents {
                 name = "CreditNote";
             } else if (this is DeliveryJournal) {
                 name = "DeliveryJournal";
+            } else if (this is DeliveryDepreciationList) {
+                name = "DeliveryDepreciationList";
             } else if (this is Letterhead) {
                 name = "Letterhead";
             } else if (this is DeliveryConfirmation) {
                 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 if (this is DeliveryAncmtList) {
+                name = "DeliveryAncmtList";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -78,21 +105,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(25.0 * i / n);
+                    progress?.Report(GenerationProportion * 100 * i / n);
                 }
-                progress?.Report(25.0);
+                progress?.Report(GenerationProportion * 100);
-                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(25.0 + v * 0.75)));
+                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();
                 }
@@ -102,7 +140,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;
             }
@@ -110,24 +149,38 @@ namespace Elwig.Documents {
         }
 
         public void SaveTo(string pdfPath) {
-            if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            File.Copy(_pdfFile.FilePath, pdfPath);
+            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");
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            await Pdf.Print(_pdfFile.FilePath, copies);
+            await Pdf.Print(PdfPath, copies, DoublePaged);
         }
 
         public void Show() {
             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
+            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.FullName}" : ""));
         }
 
-        private class MergedDocument : Document {
+        public MimePart AsEmailAttachment(string filename) {
-            public IEnumerable<Document> Documents;
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            public MergedDocument(IEnumerable<Document> docs) : base("Mehrere Dokumente") {
+            return new("application", "pdf") {
-                Documents = docs;
+                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

@@ -7,9 +7,10 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
-    @if (Model.DoubleSided) {
+    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
+    @if (Model.DoublePaged) {
         <style>
             @@page :left {
                 margin: 25mm 25mm 35mm 20mm;
@@ -37,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/Letterhead.cs

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

Elwig/Documents/MemberDataSheet.cs

@@ -0,0 +1,23 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class MemberDataSheet : BusinessDocument {
+
+        public new static string Name => "Stammdatenblatt";
+
+        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(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult();
+            ActiveAreaCommitments = m.ActiveAreaCommitments(ctx);
+        }
+    }
+}

Elwig/Documents/MemberDataSheet.cshtml

@@ -0,0 +1,222 @@
+@using RazorLight
+@using Elwig.Helpers
+@inherits TemplatePage<Elwig.Documents.MemberDataSheet>
+@model Elwig.Documents.MemberDataSheet
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
+<main>
+    <h1>@Model.Title</h1>
+    <table class="member border">
+        <colgroup>
+            <col style="width: 30.0mm;"/>
+            <col style="width: 51.5mm;"/>
+            <col style="width: 20.0mm;"/>
+            <col style="width: 12.0mm;"/>
+            <col style="width: 18.0mm;"/>
+            <col style="width: 31.5mm;"/>
+        </colgroup>
+        <tbody>
+            <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr>
+            <tr>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <th colspan="3" class="small">Name</th>
+                    <th colspan="3" class="small">Zu Handen</th>
+                } else {
+                    <th class="small">Titel (vorangestellt)</th>
+                    <th class="small">Vorname</th>
+                    <th colspan="3" class="small">Nachname</th>
+                    <th class="small">Titel (nachgestellt)</th>
+                }
+            </tr>
+            <tr>
+                @if (Model.Member.IsJuridicalPerson) {
+                    <td colspan="3" class="large">@Model.Member.Name</td>
+                    <td colspan="3" class="large">@Model.Member.ForTheAttentionOf</td>
+                } else {
+                    <td class="large">@Model.Member.Prefix</td>
+                    <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
+                    <td class="large" colspan="3">@Model.Member.Name</td>
+                    <td class="large">@Model.Member.Suffix</td>
+                }
+            </tr>
+            <tr>
+                <th>Mitglieds-Nr.:</th>
+                <td>@Model.Member.MgNr</td>
+                <th colspan="2">@(Model.Member.IsJuridicalPerson ? "Gründungsjahr/-tag" : "Geburtsjahr/-tag"):</th>
+                <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td>
+            </tr>
+            <tr>
+                <th>Adresse:</th>
+                <td colspan="5">@Model.Member.Address</td>
+            </tr>
+            <tr>
+                <th>PLZ/Ort:</th>
+                <td colspan="5">
+                    @Model.Member.PostalDest.AtPlz?.Plz
+                    @Model.Member.PostalDest.AtPlz?.Dest
+                    (@Model.Member.PostalDest.AtPlz?.Ort.Name)
+                </td>
+            </tr>
+            <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr>
+            <tr>
+                <th>Name:</th>
+                <td colspan="5">@Model.Member.BillingAddress?.FullName</td>
+            </tr>
+            <tr>
+                <th>Adresse:</th>
+                <td colspan="5">@Model.Member.BillingAddress?.Address</td>
+            </tr>
+            <tr>
+                <th>PLZ/Ort:</th>
+                <td colspan="5">
+                    @if (Model.Member.BillingAddress != null) {
+                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz
+                        @(" ")@Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
+                        @(" (")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
+                    }
+                </td>
+            </tr>
+            <tr class="sectionheading">
+                <th colspan="3">Kontaktdaten</th>
+                <th colspan="3" class="lborder">Bankverbindung</th>
+            </tr>
+            @{
+                List<string?[]> subTbl1 = new();
+                subTbl1.AddRange(Model.Member.EmailAddresses.Select(a => new[] { "E-Mail-Adresse", a.Address }));
+                subTbl1.AddRange(Model.Member.TelephoneNumbers.Select(n => new[] { Utils.PhoneNrTypeToString(n.Type), n.Number, n.Comment }));
+                subTbl1.Add(new[] { "Tel.-Nr./E-Mail-Adr.", null });
+
+                List<string?[]> subTbl2 = new();
+                subTbl2.Add(new[] { "IBAN", Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : null });
+                subTbl2.Add(new[] { "BIC", Model.Member.Bic });
+            }
+            @for (int i = 0; i < Math.Max(subTbl1.Count, subTbl2.Count); i++) {
+                <tr>
+                    <th>@(i < subTbl1.Count ? subTbl1[i][0] + ":" : "")</th>
+                    @if (i < subTbl1.Count && subTbl1[i].Length >= 3 && subTbl1[i][2] != null) {
+                        <td>@subTbl1[i][1]</td>
+                        <td>(@subTbl1[i][2])</td>
+                    } else {
+                        <td colspan="2">@(i < subTbl1.Count ? subTbl1[i][1] : "")</td>
+                    }
+
+                    <th class="lborder">@(i < subTbl2.Count ? subTbl2[i][0] + ":" : "")</th>
+                    <td colspan="2">@(i < subTbl2.Count ? subTbl2[i][1] : "")</td>
+                </tr>
+            }
+            <tr class="sectionheading"><th colspan="6">Betrieb</th></tr>
+            <tr>
+                <th>Betriebs-Nr.:</th>
+                <td>@Model.Member.LfbisNr</td>
+                <th colspan="2">UID:</th>
+                <td colspan="2">@Model.Member.UstIdNr</td>
+            </tr>
+            <tr>
+                <th>Stammgemeinde:</th>
+                <td>@Model.Member.DefaultKg?.Name</td>
+                <th colspan="2">Buchführend:</th>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
+            </tr>
+            <tr>
+                <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
+                <th colspan="2">Bio:</th>
+                <td colspan="2">@(Model.Member.IsOrganic ? "Ja" : "Nein")</td>
+            </tr>
+            <tr class="sectionheading"><th colspan="6">Genossenschaft</th></tr>
+            <tr>
+                <th>Status:</th>
+                <td>
+                    @(Model.Member.IsActive ? "Aktiv" : "Nicht aktiv")
+                    <span class="small">
+                        (@(Model.Member.ExitDate != null ?
+                        $"{Model.Member.EntryDate:dd.MM.yyyy}–{Model.Member.ExitDate:dd.MM.yyyy}" :
+                        $"seit {Model.Member.EntryDate:dd.MM.yyyy}"))
+                    </span>
+                </td>
+                <th colspan="2">Geschäftsanteile:</th>
+                <td colspan="2">@Model.Member.BusinessShares</td>
+            </tr>
+            <tr>
+                <th>Stamm-Zweigstelle:</th>
+                <td>@Model.Member.Branch?.Name</td>
+                <th colspan="2">Volllierferant:</th>
+                <td colspan="2">@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th>Zusendungen via...</th>
+                <td>
+                    <i>Post:</i> @(Model.Member.ContactViaPost ? "Ja" : "Nein") –
+                    <i>E-Mail:</i> @(Model.Member.ContactViaEmail ? "Ja" : "Nein")
+                </td>
+                <th colspan="2">Funktionär:</th>
+                <td colspan="2">@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td>
+            </tr>
+        </tbody>
+    </table>
+
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false))
+
+    @{
+        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)
+        }).OrderByDescending(a => a.Size).ToList();
+        var lastContract = "";
+    }
+
+    @if (areaComs.Count != 0) {
+        <br class="area-commitements"/>
+        <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2>
+        <table class="area-commitements">
+            <colgroup>
+                <col style="width: 40mm;"/>
+                <col style="width: 30mm;"/>
+                <col style="width: 35mm;"/>
+                <col style="width: 15mm;"/>
+                <col style="width: 25mm;"/>
+                <col style="width: 20mm;"/>
+            </colgroup>
+            <thead>
+                <tr>
+                    <th rowspan="2" style="text-align: left;">Katastralgemeinde</th>
+                    <th rowspan="2" style="text-align: left;">Ried</th>
+                    <th rowspan="2" style="text-align: left;">Parzelle(n)</th>
+                    <th>Fläche</th>
+                    <th rowspan="2" style="text-align: center;">Bewirt.</th>
+                    <th rowspan="2" style="text-align: center;">Laufzeit</th>
+                </tr>
+                <tr>
+                    <th>[m²]</th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var contractType in areaComs) {
+                    <tr class="subheading @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")">
+                        <th colspan="3">
+                            @($"{contractType.AreaComType.WineVar.Name} {(contractType.AreaComType.WineAttr != null ? "(" + contractType.AreaComType.WineAttr + ")" : "")}")
+                        </th>
+                        <td class="number">@($"{contractType.Size:N0}")</td>
+                        <td colspan="2"></td>
+                    </tr>
+                    @foreach (var areaCom in contractType.AreaComs) {
+                        <tr class="area-commitment">
+                            <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@($"{areaCom.Kg.AtKg.KgNr:00000}"))</span></td>
+                            <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.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
+                        </tr>
+                        lastContract = contractType.AreaComType.DisplayName;
+                    }
+                }
+                <tr class="sum bold">
+                    <td colspan="3">Gesamt:</td>
+                    <td class="number">@($"{Model.ActiveAreaCommitments.Sum(a => a.Area):N0}")</td>
+                    <td colspan="2"></td>
+                </tr>
+            </tbody>
+        </table>
+    }
+</main>

Elwig/Documents/MemberDataSheet.css

@@ -0,0 +1,30 @@
+
+h2 {
+    margin-bottom: 0.5em !important;
+}
+
+table.member {
+    margin-bottom: 5mm;
+}
+
+table.area-commitements {
+    margin-top: 0;
+}
+
+table.area-commitements td {
+    vertical-align: top;
+}
+
+table.area-commitements td.text {
+    white-space: normal;
+}
+
+table.area-commitements tr.sum {
+    font-size: 12pt;
+}
+
+@page :not(:first) {
+    br.area-commitements {
+        display: none;
+    }
+}

Elwig/Documents/MemberList.cs

@@ -0,0 +1,30 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class MemberList : Document {
+
+        public new static string Name => "Mitgliederliste";
+
+        public string Filter;
+        public IEnumerable<MemberListRow> Members;
+
+        public string[] AreaComFilters;
+        public bool FilterAreaComs => AreaComFilters.Length > 0;
+
+        public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
+            Filter = filter;
+            Members = members;
+            AreaComFilters = [..members
+                .SelectMany(m => m.AreaCommitmentsFiltered)
+                .Select(c => c.VtrgId)
+                .Distinct()
+                .Order()];
+        }
+
+        public MemberList(string filter, MemberListData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

Elwig/Documents/MemberList.cshtml

@@ -0,0 +1,109 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.MemberList>
+@model Elwig.Documents.MemberList
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
+<main>
+    <h1>Mitgliederliste</h1>
+    <h2>@Model.Filter</h2>
+    <table class="members">
+        <colgroup>
+            <col style="width:  8mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 38mm;"/>
+            } else {
+                <col style="width: 42mm;"/>
+            }
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 36mm;"/>
+            } else {
+                <col style="width: 40mm;"/>
+            }
+            <col style="width:  8mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 18mm;"/>
+            } else {
+                <col style="width: 20mm;"/>
+            }
+            <col style="width: 12mm;"/>
+            <col style="width:  5mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 16mm;"/>
+            } else {
+                <col style="width: 18mm;"/>
+            }
+            <col style="width: 12mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 12mm;"/>
+            }
+        </colgroup>
+        <thead>
+            <tr>
+                @{
+                    var headerSpan = Model.FilterAreaComs ? 3 : 2;
+                }
+                <th rowspan="@headerSpan">Nr.</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Name</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Adresse</th>
+                <th rowspan="@headerSpan">PLZ</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Ort</th>
+                <th rowspan="@headerSpan">Betr.-Nr.</th>
+                <th rowspan="@headerSpan">GA</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th>
+                <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th>
+            </tr>
+            @if (Model.FilterAreaComs) {
+                <tr>
+                    @foreach (var vtrgId in Model.AreaComFilters) {
+                        <th>@vtrgId</th>
+                    }
+                </tr>
+            }
+            <tr>
+                @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) {
+                    <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="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr>
+                    <tr class="header">
+                        <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th>
+                    </tr>
+                    lastBranch = m.Branch;
+                }
+                <tr>
+                    <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
+                    <td>@m.AdminName1 @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>
+                    @if (Model.AreaComFilters.Length > 0) {
+                        foreach (var v in Model.AreaComFilters) {
+                            <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td>
+                        }
+                    } else {
+                        <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,36 @@
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+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 List<ModifierStat> ModifierStat;
+        public Dictionary<string, Modifier> Modifiers;
+
+        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;
+            ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
+            Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
+        }
+    }
+}

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -0,0 +1,288 @@
+@using RazorLight
+@using Elwig.Helpers
+@inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
+@model Elwig.Documents.PaymentVariantSummary
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\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 deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
+            var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
+            var sum1 = sum2 - deliveryModifiers - memberModifiers;
+            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 style="overflow: visible;">Rebel-Zuschl.:</th>
+                <td colspan="3" class="center">
+                    @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
+                    @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %
+                </td>
+                <th colspan="2" class="lborder">Strafen bei Unterlieferungen (GA):</th>
+                <td class="center">@(Model.BillingData.ConsiderTotalPenalty ? "Ja" : "Nein")</td>
+            </tr>
+            <tr>
+                <th style="overflow: visible;">Datum/Überw.:</th>
+                <td colspan="3" class="center">
+                    @($"{Model.Variant.Date:dd.MM.yyyy}") /
+                    @($"{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>
+                <th>Berechnung:</th>
+                <td colspan="3" class="center">@($"{Model.Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}")</td>
+                <th colspan="2" class="lborder">Benutzerdef. Zu-/Abschläge pro Mitglied:</th>
+                <td class="center">@(Model.BillingData.ConsiderCustomModifiers ? "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 (Mitglieder):</th>
+                <td class="number">@Utils.GetSign(memberModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td>
+                <th class="lborder">Lieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
+            </tr>
+            <tr>
+                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
+                <td class="number">@Utils.GetSign(deliveryModifiers)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td>
+                <th class="lborder">Teillieferungen:</th>
+                <td colspan="2" class="number">@($"{Model.DeliveryPartNum: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"></th>
+                <td colspan="2"></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>
+                @{
+                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
+                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
+                }
+                <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">Nettosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
+                @{
+                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
+                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
+                }
+                <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">Mehrwertsteuer:</th>
+                <td class="number">@Utils.GetSign(vat)</td>
+                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
+                @{
+                    var gebRows = Model.Data.Rows
+                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
+                    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">Bruttosumme:</th>
+                <td class="number tborder"></td>
+                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
+                <th class="lborder"></th>
+                <td colspan="2"></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 border">
+        <colgroup>
+            <col style="width: 35mm;"/>
+            <col style="width: 30mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 25mm;"/>
+        </colgroup>
+        <thead>
+            <tr class="sectionheading">
+                <th colspan="6">Statistik Zu-/Abschläge</th>
+            </tr>
+            <tr>
+                <th rowspan="2">Name</th>
+                <th rowspan="2">Zu-/Abschlag</th>
+                <th>Lieferungen</th>
+                <th>Minimum</th>
+                <th>Maximum</th>
+                <th>Betrag</th>
+            </tr>
+            <tr>
+                <th>[#]</th>
+                <th>[@Model.CurrencySymbol]</th>
+                <th>[@Model.CurrencySymbol]</th>
+                <th>[@Model.CurrencySymbol]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var m in Model.ModifierStat) {
+                var mod = Model.Modifiers[m.ModId];
+                <tr>
+                    <th>@mod.Name</th>
+                    <td class="number">@mod.ValueStr</td>
+                    <td class="number">@($"{m.Count:N0}")</td>
+                    <td class="number">@($"{m.Min:N2}")</td>
+                    <td class="number">@($"{m.Max:N2}")</td>
+                    <td class="number">@($"{m.Sum:N2}")</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    <table class="payment-variant-data">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 22mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th>Gradation</th>
+                <th colspan="2">ungebunden</th>
+                <th colspan="2">attributlos gebunden</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>[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.LowGeb.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.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
+                    <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
+                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice: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.DocumentsPath)\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

@@ -2,36 +2,42 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.5.0</Version>
+    <Version>1.0.1.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
     <Resource Include="Resources\Images\Elwig.png" />
     <Content Include="Resources\Images\Elwig.ico" />
+    <EmbeddedResource Include="Resources\Schemas\PaymentVariantData.json" />
+    <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
   <ItemGroup>
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
-    <PackageReference Include="LinqKit" Version="1.2.4" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.24" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.9" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3485.44" />
+    <PackageReference Include="NJsonSchema" Version="11.4.0" />
+    <PackageReference Include="PdfiumViewer" Version="2.13.0" />
+    <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="4.1.68" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.56" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.9" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.9" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
   </ItemGroup>
 
 </Project>

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

@@ -10,8 +10,17 @@ using Microsoft.Data.Sqlite;
 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 DeliveryTotal, int Payment);
+    public record struct MemberStat(string Variety, string Discr, int Weight);
+    public record struct ModifierStat(string ModId, string Name, int Count, decimal? Min, decimal? Max, decimal Sum);
+
     public class AppDbContext : DbContext {
 
         public DbSet<Country> Countries { get; private set; }
@@ -27,6 +36,8 @@ namespace Elwig.Helpers {
         public DbSet<WineVar> WineVarieties { get; private set; }
 
         public DbSet<ClientParam> ClientParameters { get; private set; }
+        public DbSet<WbGl> WbGls { get; private set; }
+        public DbSet<WbGem> WbGems { get; private set; }
         public DbSet<WbKg> WbKgs { get; private set; }
         public DbSet<WbRd> WbRde { get; private set; }
         public DbSet<WineAttr> WineAttributes { get; private set; }
@@ -36,30 +47,46 @@ 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; }
+        public DbSet<DeliverySchedule> DeliverySchedules { get; private set; }
+        public DbSet<DeliveryScheduleWineVar> DeliveryScheduleWineVarieties { get; private set; }
+        public DbSet<DeliveryAncmt> DeliveryAnnouncements { get; private set; }
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
         public DbSet<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<PaymentCustom> CustomPayments { get; private set; }
         public DbSet<Credit> Credits { get; private set; }
+        public DbSet<DeliveryPartBucket> DeliveryPartBuckets { get; private set; }
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
         public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { 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);
         public DateTime SavedLastWriteTime { get; private set; }
         public bool HasBackendChanged => SavedLastWriteTime != LastWriteTime;
 
-        public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
+        public static string? ConnectionStringOverride { get; set; } = null;
+        public static string ConnectionString => ConnectionStringOverride ?? $"Data Source=\"{App.Config.DatabaseFile}\"; Mode=ReadWrite; Foreign Keys=True; Cache=Default; Pooling=False";
 
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
-        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBucketsStrict = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, UnderDelivery>>> _memberUnderDelivery = [];
 
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
@@ -76,20 +103,53 @@ namespace Elwig.Helpers {
             SavedChanges += OnSavedChanges;
         }
 
-        public static SqliteConnection Connect() {
+        public static SqliteConnection Connect(string? connectionString = null) {
-            var cnx = new SqliteConnection(ConnectionString);
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             cnx.Open();
             return cnx;
         }
 
-        public static async Task<SqliteConnection> ConnectAsync() {
+        public static async Task<SqliteConnection> ConnectAsync(string? connectionString = null) {
-            var cnx = new SqliteConnection(ConnectionString);
+            var cnx = new SqliteConnection(connectionString ?? ConnectionString);
             cnx.CreateFunction<string, string?, bool?>("REGEXP", (pattern, value) => value == null ? null : Regex.Match(value, pattern).Success, true);
             await cnx.OpenAsync();
             return cnx;
         }
 
+        public static async Task ExecuteBatch(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            await (await cmd.ExecuteReaderAsync()).CloseAsync();
+        }
+
+        public static async Task ExecuteEmbeddedScript(SqliteConnection cnx, Assembly asm, string name) {
+            using var stream = asm.GetManifestResourceStream(name) ?? throw new FileNotFoundException("Unable to load embedded resource");
+            using var reader = new StreamReader(stream);
+            await ExecuteBatch(cnx, await reader.ReadToEndAsync());
+        }
+
+        public static async Task<object?> ExecuteScalar(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            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();
@@ -127,24 +187,28 @@ 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;
         }
 
-        public async Task<int> NextLNr(DateOnly date) {
+        public async Task<int> NextLNr(DateOnly date, string zwstid) {
             var dateStr = date.ToString("yyyy-MM-dd");
             int c = 0;
-            (await Deliveries.Where(d => d.DateString == dateStr).Select(d => d.LNr).ToListAsync())
+            (await Deliveries.Where(d => d.DateString == dateStr && d.ZwstId == zwstid).Select(d => d.LNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 100) c = a; });
             return c + 1;
         }
@@ -163,51 +227,91 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
-        public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
+        public async Task<int> NextRdNr(int kgnr) {
-            return await WineQualityLevels
+            int c = 0;
-                .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
+            (await WbRde.Where(r => r.KgNr == kgnr).Select(r => r.RdNr).ToListAsync())
-                .OrderBy(q => q.MinKmw)
+                .ForEach(a => { if (a <= c + 100) c = a; });
-                .LastOrDefaultAsync();
+            return c + 1;
         }
 
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        public async Task<int> NextAvNr(int year) {
+            int c = 0;
+            (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
+        public async Task<int> NextDsNr(int year) {
+            int c = 0;
+            (await DeliverySchedules.Where(s => s.Year == year).Select(s => s.DsNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> oldModifiers, IEnumerable<Modifier> newModifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
-                var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
+                var mod = new DeliveryPartModifier {
-                if (modifiers.Contains(m)) {
+                    Year = part.Year,
-                    DeliveryPartModifier dpm = mod ?? this.CreateProxy<DeliveryPartModifier>();
+                    DId = part.DId,
-                    dpm.Year = part.Year;
+                    DPNr = part.DPNr,
-                    dpm.DId = part.DId;
+                    ModId = m.ModId,
-                    dpm.DPNr = part.DPNr;
+                };
-                    dpm.ModId = m.ModId;
+                var old = oldModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
-                    if (mod == null) {
+                if (newModifiers.Any(md => md.ModId == m.ModId)) {
-                        await AddAsync(dpm);
+                    if (old == null) {
+                        Add(mod);
                     } else {
-                        Update(dpm);
+                        Update(mod);
                     }
                 } else {
-                    if (mod != null) {
+                    if (old != null) {
                         Remove(mod);
                     }
                 }
             }
         }
 
-        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
+        public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) {
+            foreach (var v in WineVarieties) {
+                var e = new DeliveryScheduleWineVar {
+                    Year = schedule.Year,
+                    DsNr = schedule.DsNr,
+                    SortId = v.SortId,
+                    Priority = 1,
+                };
+                var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
+                if (n != -1) {
+                    e.Priority = n;
+                    if (o == -1) {
+                        Add(e);
+                    } else {
+                        Update(e);
+                    }
+                } else {
+                    if (o != -1) {
+                        Remove(e);
+                    }
+                }
+            }
+        }
+
+        private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var buckets = new Dictionary<int, Dictionary<string, (int, int)>>();
+            var buckets = new Dictionary<int, Dictionary<string, AreaComBucket>>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, bucket, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
+                cmd.CommandText = $"SELECT mgnr, bucket, area, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var vtrgid = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
-                    buckets[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                    buckets[mgnr][vtrgid] = new(reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4));
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberRightsAndObligations[year] = buckets;
+            _memberAreaCommitmentBuckets[year] = buckets;
         }
 
         private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) {
@@ -220,7 +324,7 @@ namespace Elwig.Helpers {
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var bucket = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
                     buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
@@ -228,6 +332,24 @@ namespace Elwig.Helpers {
             _memberDeliveryBuckets[year] = buckets;
         }
 
+        private async Task FetchMemberDeliveryBucketsStrict(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket_strict WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBucketsStrict[year] = buckets;
+        }
+
         private async Task FetchMemberPaymentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
@@ -238,7 +360,7 @@ namespace Elwig.Helpers {
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
                     var bucket = reader.GetString(1);
-                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
                     buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
@@ -246,47 +368,135 @@ namespace Elwig.Helpers {
             _memberPaymentBuckets[year] = buckets;
         }
 
-        public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
+        private async Task FetchMemberUnderDelivery(int year, SqliteConnection? cnx = null) {
-            if (!_memberRightsAndObligations.ContainsKey(year))
+            var ownCnx = cnx == null;
-                await FetchMemberRightsAndObligations(year, cnx);
+            cnx ??= await ConnectAsync();
-            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+            var buckets = new Dictionary<int, Dictionary<string, UnderDelivery>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight, diff FROM v_under_delivery WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = new(reader.GetInt32(2), reader.GetInt32(3));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberUnderDelivery[year] = buckets;
+        }
+
+        public async Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberAreaCommitmentBuckets.ContainsKey(year))
+                await FetchMemberAreaCommitmentBuckets(year, cnx);
+            return _memberAreaCommitmentBuckets[year].GetValueOrDefault(mgnr, []);
         }
 
         public async Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberDeliveryBuckets.ContainsKey(year))
                 await FetchMemberDeliveryBuckets(year, cnx);
-            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, new());
+            return _memberDeliveryBuckets[year].GetValueOrDefault(mgnr, []);
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBucketsStrict(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBucketsStrict.ContainsKey(year))
+                await FetchMemberDeliveryBucketsStrict(year, cnx);
+            return _memberDeliveryBucketsStrict[year].GetValueOrDefault(mgnr, []);
         }
 
         public async Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             if (!_memberPaymentBuckets.ContainsKey(year))
                 await FetchMemberPaymentBuckets(year, cnx);
-            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, new());
+            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, []);
         }
 
-        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+        public async Task<Dictionary<string, UnderDelivery>> GetMemberUnderDelivery(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberUnderDelivery.ContainsKey(year))
+                await FetchMemberUnderDelivery(year, cnx);
+            return _memberUnderDelivery[year].GetValueOrDefault(mgnr, []);
+        }
+
+        public async Task<Dictionary<string, MemberBucket>> GetMemberBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var rightsAndObligations = await GetMemberAreaCommitmentBuckets(year, mgnr, cnx);
             var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx);
+            var deliveryBucketsStrict = await GetMemberDeliveryBucketsStrict(year, mgnr, cnx);
             var paymentBuckets = await GetMemberPaymentBuckets(year, mgnr, cnx);
             if (ownCnx) await cnx.DisposeAsync();
 
-            var buckets = new Dictionary<string, (string, int, int, int, int)>();
+            var buckets = new Dictionary<string, MemberBucket>();
             foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
                 var variety = await WineVarieties.FindAsync(id[..2]);
-                var attrIds = id[2..];
+                var attribute = await WineAttributes.FindAsync(id[2..]);
-                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
-                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
+                buckets[id] = new(
-                buckets[id] = (
                     name,
-                    rightsAndObligations.GetValueOrDefault(id).Item1,
+                    rightsAndObligations.GetValueOrDefault(id).Area,
-                    rightsAndObligations.GetValueOrDefault(id).Item2,
+                    rightsAndObligations.GetValueOrDefault(id).Obligation,
+                    rightsAndObligations.GetValueOrDefault(id).Right,
                     deliveryBuckets.GetValueOrDefault(id),
+                    deliveryBucketsStrict.GetValueOrDefault(id),
+                    deliveryBuckets.GetValueOrDefault(id) + deliveryBuckets.GetValueOrDefault(id + "_"),
                     paymentBuckets.GetValueOrDefault(id)
                 );
             }
             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;
+        }
+
+        public static async Task<List<ModifierStat>> GetModifierStats(int year, int avnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var list = new List<ModifierStat>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT m.modid, m.name, m.count, m.min, m.max, m.sum, s.precision
+                    FROM v_stat_modifier m
+                        JOIN season s ON s.year = m.year
+                    WHERE m.year = {year} AND m.avnr = {avnr}
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var prec = (byte)reader.GetInt16(6);
+                    long? min = reader.IsDBNull(3) ? null : reader.GetInt64(3);
+                    long? max = reader.IsDBNull(4) ? null : reader.GetInt64(4);
+                    var sum = reader.GetInt64(5);
+                    if (min != null && max != null && Math.Abs((long)min) > Math.Abs((long)max))
+                        (min, max) = (max, min);
+                    list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2),
+                        min == null ? null : Utils.DecFromDb((long)min, prec),
+                        max == null ? null : Utils.DecFromDb((long)max, prec),
+                        Utils.DecFromDb(sum, prec)));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            return list;
+        }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

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

Elwig/Helpers/Billing/Billing.cs

@@ -1,6 +1,9 @@
+using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -8,41 +11,86 @@ 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;
         protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes;
 
         public Billing(int year) {
             Year = year;
-            Context = new AppDbContext();
+            using var ctx = new AppDbContext();
-            Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
+            Season = ctx.Seasons.Find(Year)!;
-            Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
+            Attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
-            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
+            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() {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
-                cmd.CommandText = $"""
+                UPDATE season
-                    UPDATE season
+                SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
-                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
+                WHERE year = {Year};
-                    WHERE year = {Year}
+                """);
-                    """;
-                await cmd.ExecuteNonQueryAsync();
-            }
-
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM delivery_part_bucket WHERE year = {Year}";
-                await cmd.ExecuteNonQueryAsync();
-            }
         }
 
-        public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
+        public async Task AutoAdjustBusinessShares(DateOnly date, int allowanceKg = 0, double allowanceBs = 0, int allowanceKgPerBs = 0, double allowanceRel = 0, int addMinBs = 1) {
-            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
+            if (addMinBs < 1) addMinBs = 1;
-            var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
             using var cnx = await AppDbContext.ConnectAsync();
-            await Context.GetMemberRightsAndObligations(Year, 0, cnx);
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                INSERT INTO member_history (mgnr, date, type, business_shares)
+                SELECT u.mgnr,
+                       '{date:yyyy-MM-dd}',
+                       'auto',
+                       CEIL((u.diff - {allowanceKg}.0 - {allowanceKgPerBs}.0 * u.business_shares) / s.max_kg_per_bs
+                            - {allowanceBs.ToString(CultureInfo.InvariantCulture)}
+                            - {allowanceRel.ToString(CultureInfo.InvariantCulture)} * u.business_shares) AS bs
+                FROM v_total_under_delivery u
+                    JOIN season s ON s.year = u.year
+                    JOIN member m ON m.mgnr = u.mgnr
+                WHERE s.year = {Year} AND bs >= {addMinBs} AND m.active
+                ON CONFLICT DO UPDATE
+                SET business_shares = excluded.business_shares;
+
+                UPDATE member
+                SET business_shares = member.business_shares + h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr;
+                """);
+        }
+
+        public async Task UnAdjustBusinessShares() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE member
+                SET business_shares = member.business_shares - h.business_shares
+                FROM member_history h
+                WHERE h.date = '{Year}-11-30' AND h.type = 'auto' AND h.mgnr = member.mgnr AND member.active;
+
+                DELETE FROM member_history WHERE date = '{Year}-11-30' AND type = 'auto';
+                """);
+        }
+
+        public async Task CalculateBuckets(
+            bool? honorGebundenField = null,
+            bool? allowAttributesIntoLower = null,
+            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 = 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 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?)>();
@@ -60,19 +108,19 @@ namespace Elwig.Helpers.Billing {
                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4),
                         reader.GetDouble(5), reader.GetString(6),
                         reader.IsDBNull(7) ? null : reader.GetString(7),
-                        reader.IsDBNull(8) ? Array.Empty<string>() : reader.GetString(8).Split(",").Order().ToArray(),
+                        reader.IsDBNull(8) ? [] : reader.GetString(8).Split(",").Order().ToArray(),
                         reader.IsDBNull(9) ? null : reader.GetBoolean(9)
                     ));
                 }
             }
 
             int lastMgNr = 0;
-            Dictionary<string, (int, int)>? rightsAndObligations = null;
+            Dictionary<string, AreaComBucket>? rightsAndObligations = null;
-            Dictionary<string, int> used = new();
+            Dictionary<string, int> used = [];
             foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
                 if (lastMgNr != mgnr) {
-                    rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
+                    rightsAndObligations = await ctx.GetMemberAreaCommitmentBuckets(Year, mgnr);
-                    used = new();
+                    used = [];
                 }
                 if ((honorGebunden && gebunden == false) ||
                     rightsAndObligations == null || rightsAndObligations.Count == 0 ||
@@ -87,16 +135,16 @@ namespace Elwig.Helpers.Billing {
                 }
 
                 int w = weight;
-                var attributes = attrid == null ? Array.Empty<string>() : new string[] { attrid };
+                var attributes = attrid == null ? [] : new string[] { attrid };
                 var isStrict = attrid != null && attrVals[attrid].IsStrict;
                 foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
                     var c = p.Count();
                     var key = sortid + string.Join("", p);
-                    if (rightsAndObligations.ContainsKey(key)) {
+                    if (rightsAndObligations.TryGetValue(key, out AreaComBucket value)) {
                         int i = (c == 0) ? 1 : 2;
                         var u = used.GetValueOrDefault(key, 0);
-                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Item1 - u, w));
+                        var vr = Math.Max(0, Math.Min(value.Right - u, w));
-                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Item2 - u, w));
+                        var vo = Math.Max(0, Math.Min(value.Obligation - u, w));
                         var v = (attributes.Length == c || attributes.Select(a => !attrVals[a].IsStrict ? 2 : attrVals[a].FillLower).Min() == 2) ? vr : vo;
                         used[key] = u + v;
                         if (key.Length > 2 && !isStrict) used[key[..2]] = used.GetValueOrDefault(key[..2], 0) + v;
@@ -109,18 +157,20 @@ namespace Elwig.Helpers.Billing {
                 lastMgNr = mgnr;
             }
 
-            using (var cmd = cnx.CreateCommand()) {
+            await AppDbContext.ExecuteBatch(cnx, $"UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year}");
-                cmd.CommandText = $"""
+            if (inserts.Count > 0) {
+                await AppDbContext.ExecuteBatch(cnx, $"""
                     INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
                     VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
                     ON CONFLICT DO UPDATE
-                    SET discr = excluded.discr, value = value + excluded.value
+                    SET discr = excluded.discr, value = value + excluded.value;
-                    """;
+                    """);
-                await cmd.ExecuteNonQueryAsync();
             }
 
-            if (!avoidUnderDeliveries)
+            if (!avoidUnderDlvrs) {
+                if (ownCnx) await cnx.DisposeAsync();
                 return;
+            }
 
             // FIXME avoidUnderDelivery-calculations not always right!
 
@@ -187,25 +237,19 @@ namespace Elwig.Helpers.Billing {
                     if (needed == 0) break;
                 }
 
-                using (var cmd = cnx.CreateCommand()) {
+                await AppDbContext.ExecuteBatch(cnx, $"""
-                    cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
-                        VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                    ON CONFLICT DO UPDATE
-                        ON CONFLICT DO UPDATE
+                    SET value = value + excluded.value;
-                        SET value = value + excluded.value
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
-                }
 
-                using (var cmd = cnx.CreateCommand()) {
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                    cmd.CommandText = $"""
+                    VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
-                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    ON CONFLICT DO UPDATE
-                        VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                    SET value = excluded.value;
-                        ON CONFLICT DO UPDATE
+                    """);
-                        SET value = excluded.value
+
-                        """;
+                if (ownCnx) await cnx.DisposeAsync();
-                    await cmd.ExecuteNonQueryAsync();
-                }
             }
         }
     }

Elwig/Helpers/Billing/BillingData.cs

@@ -0,0 +1,487 @@
+using Newtonsoft.Json;
+using NJsonSchema;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingData {
+
+        public enum CalculationMode { Elwig, WgMaster }
+        public enum CurveMode { Oe, Kmw }
+        public record struct Curve(CurveMode Mode, Dictionary<double, decimal> Normal, Dictionary<double, decimal>? Gebunden);
+
+        public static JsonSchema? Schema { get; private set; }
+
+        public static async Task Init() {
+            var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Elwig.Resources.Schemas.PaymentVariantData.json");
+            Schema = await JsonSchema.FromJsonAsync(stream ?? throw new ArgumentException("JSON schema not found"));
+        }
+
+        public readonly JsonObject Data;
+        public readonly CalculationMode Mode;
+
+        public bool ConsiderDelieryModifiers {
+            get => GetConsider("consider_delivery_modifiers");
+            set => SetConsider(value, "consider_delivery_modifiers");
+        }
+        public bool ConsiderContractPenalties {
+            get => GetConsider("consider_contract_penalties");
+            set => SetConsider(value, "consider_contract_penalties");
+        }
+        public bool ConsiderTotalPenalty {
+            get => GetConsider("consider_total_penalty");
+            set => SetConsider(value, "consider_total_penalty");
+        }
+        public bool ConsiderAutoBusinessShares {
+            get => GetConsider("consider_auto_business_shares");
+            set => SetConsider(value, "consider_auto_business_shares");
+        }
+        public bool ConsiderCustomModifiers {
+            get => GetConsider("consider_custom_modifiers");
+            set => SetConsider(value, "consider_custom_modifiers");
+        }
+
+        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;
+        }
+
+        private void SetConsider(bool value, string name, string? wgMasterName = null) {
+            if (Mode == CalculationMode.WgMaster && wgMasterName == null) {
+                return;
+            } else if (value) {
+                Data[(Mode == CalculationMode.Elwig) ? name : wgMasterName ?? ""] = value;
+            } else {
+                Data.Remove((Mode == CalculationMode.Elwig) ? name : wgMasterName ?? "");
+            }
+        }
+
+        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>();
+            Mode = (mode == "elwig") ? CalculationMode.Elwig : CalculationMode.WgMaster;
+        }
+
+        protected static JsonObject ParseJson(string json) {
+            if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
+            try {
+                var errors = Schema.Validate(json);
+                if (errors.Count != 0) throw new ArgumentException("Invalid JSON data");
+                return JsonNode.Parse(json)?.AsObject() ?? throw new ArgumentException("Invalid JSON data");
+            } catch (JsonReaderException) {
+                throw new ArgumentException("Invalid JSON data");
+            }
+        }
+
+        public static BillingData FromJson(string json) {
+            return new(ParseJson(json));
+        }
+
+        protected JsonArray GetCurvesEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "curves" : "Kurven"]?.AsArray() ?? throw new InvalidOperationException();
+        }
+
+        protected JsonNode GetPaymentEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "payment" : "AuszahlungSorten"] ?? throw new InvalidOperationException();
+        }
+
+        protected JsonObject? GetQualityEntry() {
+            return Data[Mode == CalculationMode.Elwig ? "quality" : "AuszahlungSortenQualitätsstufe"]?.AsObject();
+        }
+
+        private static Dictionary<double, decimal> GetCurveData(JsonObject data, CurveMode mode) {
+            var dict = new Dictionary<double, decimal>();
+            foreach (var (index, price) in data) {
+                double idx;
+                bool? gtlt = index.StartsWith('>') ? true : index.StartsWith('<') ? false : null;
+                if (index.EndsWith("kmw")) {
+                    idx = double.Parse(index[(gtlt != null ? 1 : 0)..^3], CultureInfo.InvariantCulture);
+                    if (mode == CurveMode.Oe) {
+                        idx = Utils.KmwToOe(idx);
+                    }
+                } else if (index.EndsWith("oe")) {
+                    idx = double.Parse(index[(gtlt != null ? 1 : 0)..^2], CultureInfo.InvariantCulture);
+                    if (mode == CurveMode.Kmw) {
+                        idx = Utils.OeToKmw(idx);
+                    }
+                } else {
+                    throw new InvalidOperationException();
+                }
+                if (gtlt == true) {
+                    idx = Math.BitIncrement(idx);
+                } else if (gtlt == false) {
+                    idx = Math.BitDecrement(idx);
+                }
+                dict[idx] = price?.AsValue().GetValue<decimal>() ?? throw new InvalidOperationException();
+            }
+            return dict;
+        }
+
+        protected Dictionary<int, Curve> GetCurves() {
+            var dict = new Dictionary<int, Curve>();
+            var curves = GetCurvesEntry();
+            foreach (var c in curves) {
+                var obj = c?.AsObject() ?? throw new InvalidOperationException();
+                var id = obj["id"]?.GetValue<int>() ?? throw new InvalidOperationException();
+                var cMode = (obj["mode"]?.GetValue<string>() == "kmw") ? CurveMode.Kmw : CurveMode.Oe;
+                double quw = cMode == CurveMode.Oe ? 73 : 15;
+
+                Dictionary<double, decimal> c1;
+                Dictionary<double, decimal>? c2 = null;
+                var norm = obj["data"];
+                if (norm is JsonObject) {
+                    c1 = GetCurveData(norm.AsObject(), cMode);
+                } else if (norm?.AsValue().TryGetValue(out decimal v) == true) {
+                    c1 = new() { { quw, v } };
+                } else {
+                    throw new InvalidOperationException();
+                }
+                var geb = obj["geb"];
+                if (geb is JsonObject) {
+                    c2 = GetCurveData(geb.AsObject(), cMode);
+                } else if (geb?.AsValue().TryGetValue(out decimal v) == true) {
+                    var splitVal = GetCurveValueAt(c1, quw);
+                    c2 = c1.ToDictionary(e => e.Key, e => e.Value + (e.Key >= quw ? v : 0));
+                    c2[quw] = splitVal + v;
+                    c2[Math.BitDecrement(quw)] = splitVal;
+                }
+                dict.Add(id, new(cMode, c1, c2));
+            }
+            return dict;
+        }
+
+        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<RawVaribute, JsonValue> dict;
+            if (data["default"] is JsonValue def) {
+                dict = vaributes.ToDictionary(e => e, _ => def);
+            } else {
+                dict = [];
+            }
+
+            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 =>
+                        (idx.SortId == null || idx.SortId == e.SortId) &&
+                        (idx.AttrId == null || idx.AttrId == e.AttrId) &&
+                        (idx.CultId == null || idx.CultId == e.CultId))) {
+                    dict[i] = curve;
+                }
+            }
+
+            return dict;
+        }
+
+        public static decimal GetCurveValueAt(Dictionary<double, decimal> curve, double key) {
+            if (curve.Count == 1) return curve.First().Value;
+
+            var lt = curve.Keys.Where(v => v <= key);
+            var gt = curve.Keys.Where(v => v >= key);
+            if (!lt.Any()) {
+                return curve[gt.Min()];
+            } else if (!gt.Any()) {
+                return curve[lt.Max()];
+            }
+
+            var max = lt.Max();
+            var min = gt.Min();
+            if (max == min) return curve[key];
+
+            var p1 = ((decimal)key - (decimal)min) / ((decimal)max - (decimal)min);
+            var p2 = 1 - p1;
+            return curve[min] * p2 + curve[max] * p1;
+        }
+
+        protected static JsonObject GraphToJson(Graph graph, string mode) {
+            var x = graph.DataX;
+            var y = graph.DataY;
+            var prec = graph.Precision;
+
+            try {
+                return new JsonObject() {
+                    ["15kmw"] = Math.Round(y.Distinct().Single(), prec)
+                };
+            } catch { }
+
+            var data = new JsonObject();
+            if (y[0] != y[1]) {
+                data[$"{x[0]}{mode}"] = Math.Round(y[0], prec);
+            }
+            for (int i = 1; i < x.Length - 1; i++) {
+                var d1 = Math.Round(y[i] - y[i - 1], prec);
+                var d2 = Math.Round(y[i + 1] - y[i], prec);
+                if (d1 != d2) {
+                    data[$"{x[i]}{mode}"] = Math.Round(y[i], prec);
+                }
+            }
+            if (y[^1] != y[^2]) {
+                data[$"{x[^1]}{mode}"] = Math.Round(y[^1], prec);
+            }
+            return data;
+        }
+
+        protected static JsonNode GraphEntryToJson(GraphEntry entry) {
+            try {
+                if (entry.GebundenFlatBonus == null) {
+                    return JsonValue.Create((decimal)entry.DataGraph.DataY.Distinct().Single());
+                }
+            } catch { }
+
+            var curve = new JsonObject {
+                ["id"] = entry.Id,
+                ["mode"] = entry.Mode.ToString().ToLower(),
+            };
+
+            curve["data"] = GraphToJson(entry.DataGraph, entry.Mode.ToString().ToLower());
+
+            if (entry.GebundenFlatBonus != null) {
+                curve["geb"] = (decimal)entry.GebundenFlatBonus;
+            } else if (entry.GebundenGraph != null) {
+                curve["geb"] = GraphToJson(entry.GebundenGraph, entry.Mode.ToString().ToLower());
+            }
+
+            return curve;
+        }
+
+        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" || (strict && (k.StartsWith('/') || !k.Contains('/'))) || v is not JsonValue val) {
+                    continue;
+                } else if (val.TryGetValue<decimal>(out var dec)) {
+                    rev2[dec] = rev2.GetValueOrDefault(dec) ?? [];
+                    rev2[dec].Add(k);
+                } else if (val.TryGetValue<string>(out var cur)) {
+                    rev1[cur] = rev1.GetValueOrDefault(cur) ?? [];
+                    rev1[cur].Add(k);
+                }
+            }
+            return (rev1, rev2);
+        }
+
+        protected static void CollapsePaymentData(JsonObject data, JsonObject originalData, 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()) {
+                        foreach (var k in ks) {
+                            if (!(originalData[$"{k[..2]}/"]?.AsValue().TryGetValue<string>(out var o) ?? false) || o == v)
+                                if (!(originalData[k.Split('-')[0]]?.AsValue().TryGetValue<string>(out var o2) ?? false) || o2 == v)
+                                    data.Remove(k);
+                        }
+                        data["default"] = v;
+                        CollapsePaymentData(data, originalData, vaributes, useDefault);
+                        return;
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    if ((ks.Count > vaributes.Count() * 0.5 && useDefault) || ks.Count == vaributes.Count()) {
+                        foreach (var k in ks) {
+                            if (!(originalData[$"{k[..2]}/"]?.AsValue().TryGetValue<decimal>(out var o) ?? false) || o == v)
+                                if (!(originalData[k.Split('-')[0]]?.AsValue().TryGetValue<decimal>(out var o2) ?? false) || o2 == v)
+                                    data.Remove(k);
+                        }
+                        data["default"] = v;
+                        CollapsePaymentData(data, originalData, vaributes, useDefault);
+                        return;
+                    }
+                }
+            }
+
+            var attributes = data
+                .Select(e => e.Key)
+                .Where(k => k.Length > 3 && k.Contains('/'))
+                .Select(k => k.Split('/')[1])
+                .Distinct()
+                .ToList();
+            foreach (var idx in attributes) {
+                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();
+                    if (myKs.Count > 1 && ((myKs.Count > len * 0.5 && useDefault) || myKs.Count == len)) {
+                        foreach (var k in myKs) data.Remove(k);
+                        var discr = (idx.StartsWith('-') && !useDefault ? "" : "/") + idx;
+                        data[discr] = v;
+                        foreach (var (k, o) in originalData) {
+                            if (o!.AsValue().TryGetValue<string>(out var o2) && o2 != v && k.Contains(discr))
+                                data[k] = o2;
+                        }
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    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);
+                        var discr = (idx.StartsWith('-') && !useDefault ? "" : "/") + idx;
+                        data[discr] = v;
+                        foreach (var (k, o) in originalData) {
+                            if (o!.AsValue().TryGetValue<decimal>(out var o2) && o2 != v && k.Contains(discr))
+                                data[k] = o2;
+                        }
+                    }
+                }
+            }
+
+            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);
+                    if (k[0] == '/' || k.Contains('-')) {
+                        foreach (var (k2, o) in originalData) {
+                            if (!data.ContainsKey(k2) && k2.Contains('-') && k2.Contains("-" + k.Split('-')[1]) && !k2.Contains("/-")
+                                && (!k2.Contains('/') || k2.Length <= 4 || !data.ContainsKey(k2[2..])))
+                            {
+                                data[k2] = o?.DeepClone();
+                            }
+                        }
+                    }
+                }
+            }
+
+            (rev1, rev2) = GetReverseKeys(data, false);
+            var keyVaributes = data
+                .Select(e => e.Key)
+                .Where(e => e.Length > 0 && !e.Contains('-') && 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);
+                        }
+                    }
+                }
+            }
+        }
+
+        public static JsonObject FromGraphEntries(
+            IEnumerable<GraphEntry> graphEntries,
+            BillingData? origData = null,
+            IEnumerable<RawVaribute>? vaributes = null,
+            bool useDefaultPayment = true,
+            bool useDefaultQuality = true
+        ) {
+            var payment = new JsonObject();
+            var qualityWei = new JsonObject();
+            var curves = new JsonArray();
+            int curveId = 0;
+            foreach (var entry in graphEntries) {
+                var curve = GraphEntryToJson(entry);
+                JsonValue node;
+                if (curve is JsonObject obj) {
+                    obj["id"] = ++curveId;
+                    node = JsonValue.Create($"curve:{curveId}");
+                    curves.Add(obj);
+                } else if (curve is JsonValue val && val.TryGetValue<decimal>(out var flat)) {
+                    node = JsonValue.Create(flat);
+                } else {
+                    continue;
+                }
+                foreach (var c in entry.Vaributes) {
+                    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[v.ToString()] = node.DeepClone();
+                    }
+                }
+            }
+
+            CollapsePaymentData(payment, payment.DeepClone().AsObject(), vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
+            CollapsePaymentData(qualityWei, qualityWei.DeepClone().AsObject(), vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
+
+            var data = new JsonObject {
+                ["mode"] = "elwig",
+                ["version"] = 1,
+            };
+
+            if (origData?.ConsiderDelieryModifiers == true)
+                data["consider_delivery_modifiers"] = true;
+            if (origData?.ConsiderContractPenalties == true)
+                data["consider_contract_penalties"] = true;
+            if (origData?.ConsiderTotalPenalty == true)
+                data["consider_total_penalty"] = true;
+            if (origData?.ConsiderAutoBusinessShares == true)
+                data["consider_auto_business_shares"] = true;
+
+            if (payment.Count == 0) {
+                data["payment"] = 0;
+            } else if (payment.Count == 1 && payment.First().Key == "default") {
+                data["payment"] = payment.Single().Value?.DeepClone();
+            } else {
+                data["payment"] = payment;
+            }
+            if (qualityWei.Count == 1 && qualityWei.First().Key == "default") {
+                data["quality"] = new JsonObject() {
+                    ["WEI"] = qualityWei.Single().Value?.DeepClone()
+                };
+            } else if (qualityWei.Count >= 1) {
+                data["quality"] = new JsonObject() {
+                    ["WEI"] = qualityWei
+                };
+            }
+            data["curves"] = curves;
+
+            return data;
+        }
+    }
+}

Elwig/Helpers/Billing/BillingVariant.cs

@@ -1,41 +1,228 @@
+using Elwig.Models.Entities;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Billing {
     public class BillingVariant : Billing {
 
-        private readonly int AvNr;
+        protected readonly int AvNr;
+        protected readonly PaymentVar PaymentVariant;
+        protected readonly PaymentBillingData Data;
 
         public BillingVariant(int year, int avnr) : base(year) {
             AvNr = avnr;
+            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));
         }
 
-        protected async Task DeleteInDb() {
+        public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             using var cnx = await AppDbContext.ConnectAsync();
-            using (var cmd = cnx.CreateCommand()) {
+            using var tx = await cnx.BeginTransactionAsync();
-                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+            await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
-                await cmd.ExecuteNonQueryAsync();
+            await DeleteInDb(cnx);
+            await SetCalcTime(cnx);
+            KeyNotFoundException? exception = null;
+            try {
+                await CalculatePrices(cnx, strictPrices);
+            } catch (KeyNotFoundException e) {
+                if (strictPrices) throw;
+                exception = e;
             }
-            using (var cmd = cnx.CreateCommand()) {
+            if (Data.ConsiderDelieryModifiers) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                await CalculateDeliveryModifiers(cnx);
-                await cmd.ExecuteNonQueryAsync();
             }
+            if (Data.ConsiderCustomModifiers) {
+                await CalculateMemberModifiers(cnx);
+            }
+            await tx.CommitAsync();
+            if (exception != null)
+                throw exception;
         }
 
-        public async Task CalculatePrices() {
+        public async Task Commit() {
-            await DeleteInDb();
+            await Revert();
-            var tasks = new List<Task>();
+            using var cnx = await AppDbContext.ConnectAsync();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
-                tasks.Add(Task.Run(() => CalculateMemberPrices(mgnr)));
+                    INSERT INTO credit (year, tgnr, mgnr, avnr, net_amount, prev_net_amount, vat, modifiers, prev_modifiers)
-            }
+                    SELECT s.year,
-            await Task.WhenAll(tasks);
+                           COALESCE(t.tgnr, 0) + ROW_NUMBER() OVER(ORDER BY m.mgnr) AS tgnr,
+                           m.mgnr,
+                           v.avnr,
+                           ROUND(p.amount / POW(10, s.precision - 2)) AS net_amount,
+                           IIF(lc.amount >= 0, ROUND(lp.amount / POW(10, s.precision - 2)), 0) AS prev_net_amount,
+                           IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
+                           ROUND(IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) / POW(10, s.precision - 2)) +
+                           ROUND(IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0), 0) / POW(10, 4 - 2)) +
+                           ROUND(IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.total_amount, 0), 0) / POW(10, s.precision - 2)) +
+                           IIF({Data.ConsiderCustomModifiers}, COALESCE(x.amount, 0), 0)
+                           AS modifiers,
+                           IIF(lc.amount >= 0, lc.modifiers, 0) AS prev_modifiers
+                    FROM season s
+                        JOIN payment_variant v ON v.year = s.year
+                        LEFT JOIN payment_variant l ON l.year = s.year
+                            AND l.avnr = (SELECT avnr
+                                          FROM payment_variant
+                                          WHERE year = s.year AND NOT test_variant
+                                          ORDER BY COALESCE(transfer_date, date) DESC, avnr DESC
+                                          LIMIT 1)
+                        LEFT JOIN (SELECT year, MAX(tgnr) AS tgnr FROM credit GROUP BY year) t ON t.year = s.year
+                        JOIN (SELECT DISTINCT year, mgnr FROM delivery) d ON d.year = s.year
+                        JOIN member m ON m.mgnr = d.mgnr
+                        LEFT JOIN payment_member lp ON (lp.year, lp.avnr, lp.mgnr) = (l.year, l.avnr, m.mgnr)
+                        LEFT JOIN payment_member p ON (p.year, p.avnr, p.mgnr) = (v.year, v.avnr, m.mgnr)
+                        LEFT JOIN credit lc ON (lc.year, lc.avnr, lc.mgnr) = (l.year, l.avnr, m.mgnr)
+                        LEFT JOIN v_penalty_business_shares b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
+                    WHERE s.year = {Year} AND v.avnr = {AvNr};
+                    """);
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
         }
 
-        protected async Task CalculateMemberPrices(int mgnr) {
+        public async Task Revert() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                DELETE FROM credit WHERE (year, avnr) = ({Year}, {AvNr});
+                UPDATE payment_variant SET test_variant = TRUE WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
+        }
 
+        protected async Task SetCalcTime(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                UPDATE payment_variant SET calc_time = UNIXEPOCH() WHERE (year, avnr) = ({Year}, {AvNr})
+                """);
+        }
+
+        protected async Task DeleteInDb(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                DELETE FROM payment_delivery_part_bucket WHERE (year, avnr) = ({Year}, {AvNr});
+                DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr});
+                DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr});
+                UPDATE payment_variant SET calc_time = NULL WHERE (year, avnr) = ({Year}, {AvNr});
+                """);
+        }
+
+        protected async Task CalculateMemberModifiers(SqliteConnection cnx) {
+            if (App.Client.IsMatzen) {
+                var lastYears = 3;
+                var multiplier = 0.50;
+                var includePredecessor = true;
+                var modName = "Treue%";
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
+                    SELECT c.year, {AvNr}, s.mgnr, 0,
+                           ROUND(s.sum * COALESCE(m.abs, 0)),
+                           COALESCE(m.rel, 0)
+                    FROM (SELECT {Year} AS year, m.mgnr,
+                                 ROUND(AVG(COALESCE(a.sum, b.sum)) * {multiplier}) AS baseline,
+                                 COUNT(*) = {lastYears} AND MIN(COALESCE(a.sum, b.sum)) > 0 AS allowed
+                          FROM member m
+                              LEFT JOIN v_stat_member a ON a.mgnr = m.mgnr
+                              FULL OUTER JOIN v_stat_member b ON b.mgnr = m.predecessor_mgnr AND b.year = a.year AND {(includePredecessor ? "TRUE" : "FALSE")}
+                          WHERE a.year > {Year} - {lastYears}
+                          GROUP BY m.mgnr
+                          HAVING allowed) c
+                        JOIN v_stat_member s ON (s.year, s.mgnr) = (c.year, c.mgnr)
+                        LEFT JOIN modifier m ON m.year = c.year AND m.name LIKE '{modName}'
+                    WHERE sum >= baseline
+                    ON CONFLICT DO UPDATE
+                    SET mod_abs = mod_abs + excluded.mod_abs,
+                        mod_rel = mod_rel + excluded.mod_rel
+                    """);
+            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_member (year, avnr, mgnr, net_amount, mod_abs, mod_rel)
+                SELECT x.year, {AvNr}, x.mgnr, 0, COALESCE(x.mod_abs * POW(10, s.precision - 2), 0), COALESCE(x.mod_rel, 0)
+                FROM payment_custom x
+                    JOIN season s ON s.year = x.year
+                WHERE x.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_abs = mod_abs + excluded.mod_abs,
+                    mod_rel = mod_rel + excluded.mod_rel
+                """);
+        }
+
+        protected async Task CalculatePrices(SqliteConnection cnx, bool strict = true) {
+            var invalid = new HashSet<string>();
+            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, 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.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.AttrAreaCom ? payAttrId : part.AttrId;
+                var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
+                decimal price = 0;
+                try {
+                    price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
+                } catch (KeyNotFoundException e) {
+                    invalid.Add(e.Message.Split('\'')[1]);
+                }
+                var priceL = PaymentVariant.Season.DecToDb(price);
+                inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
+            }
+
+            var msg = invalid.Count == 0 ? null : "Für folgende Sorten wurde noch keine Preiskurve festgelegt: " + string.Join(", ", invalid);
+            if (msg != null && strict)
+                throw new KeyNotFoundException(msg);
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO payment_delivery_part_bucket (year, did, dpnr, bktnr, avnr, price, amount)
+                VALUES {string.Join(",\n       ", inserts.Select(i => $"({i.Year}, {i.DId}, {i.DPNr}, {i.BktNr}, {AvNr}, {i.Price}, {i.Amount})"))};
+                """);
+            if (msg != null)
+                throw new KeyNotFoundException(msg);
+        }
+
+        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
+                    LEFT JOIN delivery_part_modifier p ON (p.year, p.did, p.dpnr) = (d.year, d.did, d.dpnr)
+                    LEFT JOIN modifier m ON (m.year, m.modid) = (d.year, p.modid)
+                WHERE d.year = {Year}
+                ON CONFLICT DO UPDATE
+                SET mod_abs = mod_abs + excluded.mod_abs,
+                    mod_rel = mod_rel + excluded.mod_rel;
+                """);
         }
     }
 }

Elwig/Helpers/Billing/EditBillingData.cs

@@ -0,0 +1,107 @@
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class EditBillingData : BillingData {
+
+        protected readonly IEnumerable<RawVaribute> Vaributes;
+
+        public EditBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) :
+            base(data) {
+            Vaributes = vaributes;
+        }
+
+        public static EditBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) {
+            return new(ParseJson(json), vaributes);
+        }
+
+        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) {
+                foreach (var (selector, node) in paymentObj) {
+                    var val = node?.AsValue();
+                    if (val == null) {
+                        continue;
+                    } else if (val.TryGetValue<decimal>(out var price)) {
+                        if (!dict2.ContainsKey(price)) dict2[price] = [];
+                        dict2[price].Add(selector);
+                    } else if (val.TryGetValue<string>(out var curve)) {
+                        var idx = int.Parse(curve.Split(":")[1] ?? "0");
+                        if (!dict1.ContainsKey(idx)) dict1[idx] = [];
+                        dict1[idx].Add(selector);
+                    }
+                }
+            } else if (root is JsonValue paymentVal) {
+                if (paymentVal.TryGetValue<decimal>(out var price)) {
+                    if (!dict2.ContainsKey(price)) dict2[price] = [];
+                    dict2[price].Add("default");
+                } else if (paymentVal.TryGetValue<string>(out var curve)) {
+                    var idx = int.Parse(curve.Split(":")[1] ?? "0");
+                    if (!dict1.ContainsKey(idx)) dict1[idx] = [];
+                    dict1[idx].Add("default");
+                }
+            }
+
+            var virtOffset = dict1.Count > 0 ? dict1.Max(e => e.Key) + 1 : 1;
+            Dictionary<int, Curve> curves = GetCurves();
+            decimal[] virtCurves = [.. dict2.Keys.Order()];
+            for (int i = 0; i < virtCurves.Length; i++) {
+                var idx = virtCurves[i];
+                dict1[i + virtOffset] = dict2[idx];
+                curves[i + virtOffset] = new Curve(CurveMode.Oe, new() { { 73, idx } }, null);
+            }
+
+            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)) {
+                    idx = Array.IndexOf(virtCurves, val) + virtOffset;
+                } else if (value.TryGetValue<string>(out var str)) {
+                    idx = int.Parse(str.Split(":")[1]);
+                }
+                if (idx != null)
+                    dict3[(int)idx].Add(selector);
+            }
+
+            return (curves, dict3);
+        }
+
+        private static List<GraphEntry> CreateGraphEntries(
+            AppDbContext ctx, int precision,
+            Dictionary<int, Curve> curves,
+            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(s, vars, attrs, cults))
+                    .ToList()))
+                .ToList();
+        }
+
+        public IEnumerable<GraphEntry> GetPaymentGraphEntries(AppDbContext ctx, Season season) {
+            var root = GetPaymentEntry();
+            var (curves, entries) = GetGraphEntries(root);
+            return CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
+        }
+
+        public IEnumerable<GraphEntry> GetQualityGraphEntries(AppDbContext ctx, Season season, int idOffset = 0) {
+            var root = GetQualityEntry();
+            if (root == null || root["WEI"] is not JsonNode qualityWei)
+                return [];
+            var (curves, entries) = GetGraphEntries(qualityWei);
+            var list = CreateGraphEntries(ctx, season.Precision, curves, entries).Where(e => e.Vaributes.Count > 0);
+            foreach (var e in list) {
+                e.Id += idOffset;
+                e.Abgewertet = true;
+            }
+            return list;
+        }
+    }
+}

Elwig/Helpers/Billing/Graph.cs

@@ -1,119 +1,107 @@
-using ScottPlot;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json.Nodes;
 
 namespace Elwig.Helpers.Billing {
     public class Graph : ICloneable {
 
-        public string Type { get; set; }
+        public readonly int Precision;
-        public int Num { get; set; }
-        private int MinX { get; set; }
-        private int MaxX { get; set; }
-        public string Contracts { get; set; }
         public double[] DataX { get; set; }
         public double[] DataY { get; set; }
+        public int MinX { get; set; }
+        public int MaxX { get; set; }
 
-        public Graph(int num, int minX, int maxX) {
+        public Graph(int precision, int minX, int maxX) {
-            Type = "oe";
+            Precision = precision;
-            Num = num;
-            Contracts = "";
             MinX = minX;
             MaxX = maxX;
-
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
-            DataX = DataGen.Range(MinX, MaxX + 1);
+            DataY = new double[DataX.Length];
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
         }
 
-        public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
+        public Graph(Dictionary<double, decimal> data, int precision, int minX, int maxX) {
-            Type = type;
+            Precision = precision;
-            Num = num;
-            Contracts =  contracts;
             MinX = minX;
             MaxX = maxX;
-
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
-            DataX = DataGen.Range(MinX, MaxX + 1);
+            DataY = DataX.Select(i => (double)BillingData.GetCurveValueAt(data, i)).ToArray();
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
-            ParseGraphData(graphData);
         }
 
-        public Graph(string type, int num, int minX, int maxX, string contracts, double[] dataX, double[] dataY) {
+        public Graph(double[] values, int precision, int minX, int maxX) {
-            Type = type;
+            Precision = precision;
-            Num = num;
+            MinX = minX;
+            MaxX = maxX;
+            DataX = Enumerable.Range(MinX, MaxX - MinX + 1).Select(i => (double)i).ToArray();
+            DataY = values;
+        }
+
+        private Graph(double[] dataX, double[] dataY, int precision, int minX, int maxX) {
+            Precision = precision;
             MinX = minX;
             MaxX = maxX;
-            Contracts = contracts;
             DataX = dataX;
             DataY = dataY;
         }
 
-        private void ParseGraphData(JsonObject graphData) {
+        public double GetOechsleAt(int index) {
-            var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
+            return DataX[index];
+        }
 
-            if (GraphPoints.Keys.Count < 1) {
+        public void SetOechsleAt(int index, double oechsle) {
-                return;
+            DataX[index] = oechsle;
-            }
+        }
 
-            var minKey = GraphPoints.Keys.Order().First();
+        public void SetPriceAt(int index, double price) {
-            var maxKey = GraphPoints.Keys.OrderDescending().First();
+            DataY[index] = price;
+        }
 
-            if (!GraphPoints.ContainsKey(MinX)) {
+        public double GetPriceAt(int index) {
-                GraphPoints.Add(MinX, GraphPoints.GetValueOrDefault(minKey));
+            return DataY[index];
-            }
+        }
-            if (!GraphPoints.ContainsKey(MaxX)) {
-                GraphPoints.Add(MaxX, GraphPoints.GetValueOrDefault(maxKey));
-            }
 
-            var keys = GraphPoints.Keys.Order().ToArray();
+        public double GetPriceAtOe(double oe) {
+            return DataY[Array.IndexOf(DataX, oe)];
+        }
 
-            for (int i = 0; i < keys.Length; i++) {
+        private void FlattenGraph(int begin, int end, double value) {
-                double point1Value = GraphPoints[keys[i]];
+            for (int i = begin; i <= end; i++) {
-                if (i + 1 < keys.Length) {
+                DataY[i] = value;
-                    double point2Value = GraphPoints[keys[i + 1]];
-                    if (point1Value == point2Value) {
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX; j++) {
-                            DataY[j] = point1Value;
-                        }
-                    } else {
-                        int steps = Math.Abs(keys[i + 1] - keys[i]);
-                        double step = (point2Value - point1Value) / steps;
-
-                        DataY[keys[i] - MinX] = point1Value;
-                        DataY[keys[i + 1] - MinX] = point2Value;
-
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX - 1; j++) {
-                            DataY[j + 1] = Math.Round(DataY[j] + step, 4); // TODO richtig runden
-                        }
-                    }
-                }
-                else {
-                    for (int j = keys[i] - MinX; j < DataX.Length; j++) {
-                        DataY[j] = point1Value;
-                    }
-                }
             }
         }
 
-        public JsonObject ToJson() {
+        public void FlattenGraphLeft(int pointIndex) {
-            JsonObject graph = new();
+            FlattenGraph(0, pointIndex, DataY[pointIndex]);
+        }
 
-            if (DataY[0] != DataY[1]) {
+        public void FlattenGraphRight(int pointIndex) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
+            FlattenGraph(pointIndex, DataY.Length - 1, DataY[pointIndex]);
+        }
+
+        private void LinearIncreaseGraph(int begin, int end, double inc) {
+            for (int i = begin; i < end; i++) {
+                DataY[i + 1] = Math.Round(DataY[i] + inc, Precision);
             }
-            for (int i = 1; i < DataX.Length - 1; i++) {
+        }
-                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
+
-                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
+        public void LinearIncreaseGraphToEnd(int begin, double inc) {
-                }
+            LinearIncreaseGraph(begin, DataY.Length - 1, inc);
+        }
+
+        public void InterpolateGraph(int firstPoint, int secondPoint) {
+            int steps = Math.Abs(firstPoint - secondPoint);
+            if (firstPoint == -1 || secondPoint == -1 || steps < 2) {
+                return;
             }
-            if (DataY[^1] != DataY[^2]) {
+            var (lowIndex, highIndex) = firstPoint < secondPoint ? (firstPoint, secondPoint) : (secondPoint, firstPoint);
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
+            double step = (DataY[highIndex] - DataY[lowIndex]) / steps;
+
+            for (int i = lowIndex; i < highIndex - 1; i++) {
+                DataY[i + 1] = Math.Round(DataY[i] + step, Precision);
             }
-            return graph;
         }
 
         public object Clone() {
-            return new Graph(Type, Num, MinX, MaxX, Contracts, (double[])DataX.Clone(), (double[])DataY.Clone());
+            return new Graph((double[])DataX.Clone(), (double[])DataY.Clone(), Precision, MinX, MaxX);
         }
     }
 }

Elwig/Helpers/Billing/GraphEntry.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
+
+namespace Elwig.Helpers.Billing {
+    public class GraphEntry {
+
+        public const int MinX = 50;
+        public const int MinXGeb = 73;
+        public const int MaxX = 120;
+
+        public int Id { get; set; }
+        public BillingData.CurveMode Mode { get; set; }
+        public bool Abgewertet { get; set; }
+
+        public Graph DataGraph { get; set; }
+        public Graph? GebundenGraph { get; set; }
+        public double? GebundenFlatBonus {
+            get {
+                try {
+                    var val = GebundenGraph?.DataX.Zip(GebundenGraph.DataY)
+                        .Select(e => Math.Round(e.Second - DataGraph.GetPriceAtOe(e.First), Precision))
+                        .Distinct()
+                        .Single();
+                    return (val == 0) ? null : val;
+                } catch {
+                    return null;
+                }
+            }
+            set {
+                if (value is not double v) return;
+                var values = Enumerable.Range(MinXGeb, MaxX - MinXGeb + 1)
+                    .Select(i => Math.Round(DataGraph.GetPriceAtOe(i) + v, Precision))
+                    .ToArray();
+                GebundenGraph = new Graph(values, Precision, MinXGeb, MaxX);
+            }
+        }
+
+        public List<Varibute> Vaributes { get; set; }
+        public string VaributeStringSimple => (Abgewertet ? "Abgew.: " : "") + (Vaributes.Count != 0 ? (Vaributes.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Vaributes.Select(c => c.Listing))) : "-");
+        public string VaributeString => Vaributes.Count != 0 ? string.Join("\n", Vaributes.Select(c => c.FullName)) : "-";
+        public string VaributeStringChange => (Abgewertet ? "A." : "") + string.Join(",", Vaributes.Select(c => c.Listing));
+        public Brush? Color => Vaributes.Select(v => v.Variety?.Color).Distinct().SingleOrDefault();
+        private readonly int Precision;
+
+        public GraphEntry(int id, int precision, BillingData.CurveMode mode) {
+            Id = id;
+            Precision = precision;
+            Mode = mode;
+            DataGraph = new Graph(precision, MinX, MaxX); ;
+            Vaributes = [];
+        }
+
+        public GraphEntry(int id, int precision, BillingData.CurveMode mode, Dictionary<double, decimal> data, Dictionary<double, decimal>? gebunden) :
+            this(id, precision, mode) {
+            DataGraph = new Graph(data, precision, MinX, MaxX);
+            if (gebunden != null) GebundenGraph = new Graph(gebunden, precision, MinXGeb, MaxX);
+        }
+
+        public GraphEntry(int id, int precision, BillingData.Curve curve, List<Varibute> vaributes) :
+            this(id, precision, curve.Mode) {
+            DataGraph = new Graph(curve.Normal, precision, MinX, MaxX);
+            if (curve.Gebunden != null)
+                GebundenGraph = new Graph(curve.Gebunden, precision, MinXGeb, MaxX);
+            Vaributes = vaributes;
+        }
+
+        private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph, List<Varibute> vaributes) {
+            Id = id;
+            Precision = precision;
+            Mode = mode;
+            DataGraph = dataGraph;
+            GebundenGraph = gebundenGraph;
+            Vaributes = vaributes;
+        }
+
+        public void AddGebundenGraph() {
+            GebundenGraph ??= new Graph(Precision, MinXGeb, MaxX);
+        }
+
+        public void RemoveGebundenGraph() {
+            GebundenGraph = null;
+        }
+
+        public GraphEntry Copy(int id) {
+            return new GraphEntry(id, Precision, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), []);
+        }
+    }
+}

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class PaymentBillingData : BillingData {
+
+        protected readonly Dictionary<int, Curve> Curves;
+        protected readonly Dictionary<RawVaribute, Curve> PaymentData;
+        protected readonly Dictionary<RawQualVaribute, Curve> QualityData;
+        protected readonly IEnumerable<RawVaribute> Vaributes;
+
+        public PaymentBillingData(JsonObject data, IEnumerable<RawVaribute> vaributes) :
+            base(data) {
+            Vaributes = vaributes;
+            Curves = GetCurves();
+            PaymentData = GetPaymentData();
+            QualityData = GetQualityData();
+        }
+
+        public static PaymentBillingData FromJson(string json, IEnumerable<RawVaribute> vaributes) {
+            return new(ParseJson(json), vaributes);
+        }
+
+        private Dictionary<RawVaribute, Curve> GetData(JsonNode data) {
+            return GetSelection(data, Vaributes).ToDictionary(e => e.Key, e => LookupCurve(e.Value));
+        }
+
+        protected Dictionary<RawVaribute, Curve> GetPaymentData() {
+            return GetData(GetPaymentEntry());
+        }
+
+        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[new(qualid, idx.SortId, idx.AttrId, idx.CultId)] = d;
+                }
+            }
+
+            return dict;
+        }
+
+        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);
+        }
+
+        private Curve LookupCurve(JsonValue val) {
+            if (val.TryGetValue(out string? curve)) {
+                var curveId = int.Parse(curve.Split(":")[1]);
+                return Curves[curveId];
+            } else if (val.TryGetValue(out decimal value)) {
+                return new(CurveMode.Oe, new() { { 73, value } }, null);
+            }
+            throw new InvalidOperationException();
+        }
+
+        protected Curve GetCurve(string sortid, string? attrid, string? cultid) {
+            return PaymentData[new(sortid, attrid ?? "", cultid ?? "")];
+        }
+
+        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/Transaction.cs

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

Elwig/Helpers/Billing/Varibute.cs

@@ -0,0 +1,91 @@
+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 != 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(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() {
+            return Listing;
+        }
+
+        public int CompareTo(Varibute? other) {
+            return Listing.CompareTo(other?.Listing);
+        }
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -1,26 +1,23 @@
 using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 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 IsWeinland => Client == Type.Weinland;
-        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
+        public bool IsBaden => Client == Type.Baden;
-        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
+        public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W";
-
+        public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H";
-        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
-        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
+        public bool IsGrInzersdorf => IsWeinland;
-        public bool HasRebler() => HasRebler(App.ZwstId);
-        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
-        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
-        public bool HasKisten() => HasKisten(App.ZwstId);
 
         public string NameToken;
         public string NameShort;
@@ -36,8 +33,8 @@ namespace Elwig.Helpers {
 
         public PostalDest PostalDest {
             set {
-                Plz = value.AtPlz.Plz;
+                Plz = value.AtPlz!.Plz;
-                Ort = value.AtPlz.Ort.Name;
+                Ort = value.AtPlz!.Ort.Name;
             }
         }
         public int Plz;
@@ -50,6 +47,7 @@ namespace Elwig.Helpers {
         public string? Bic;
         public string? UstIdNr;
         public string? LfbisNr;
+        public string? OrganicAuthority;
 
         public string? PhoneNr;
         public string? FaxNr;
@@ -57,9 +55,25 @@ 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 bool MailIncludeNonDeliverers;
+        public bool MailDoublePaged;
+        public int MailSendPostal;
+        public int MailSendEmail;
+        public int MailOrdering;
+
+        public int ExportEbicsVersion;
+        public int ExportEbicsAddress;
+
+        public (int? AllowanceKg, double? AllowanceBs, int? AllowanceKgPerBs, double? AllowancePercent, int? MinBs) AutoAdjustBs;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -71,8 +85,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 "Winzergenossenschaft für Matzen und Umgebung":
-                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
+                        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"] ?? "");
@@ -86,6 +106,7 @@ namespace Elwig.Helpers {
                 UstIdNr = parameters.GetValueOrDefault("CLIENT_USTIDNR");
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
+                OrganicAuthority = parameters.GetValueOrDefault("CLIENT_ORGANIC_AUTHORITY");
 
                 switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
                     case "NONE": ModeDeliveryNoteStats = 0; break;
@@ -93,12 +114,71 @@ 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", "MGNR")?.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");
                 if (TextDeliveryNote == "") TextDeliveryNote = null;
                 TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
                 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;
+
+                MailIncludeNonDeliverers = (parameters.GetValueOrDefault("MAIL_INCLUDE_NON_DELIVERERS")?.ToUpper()) switch {
+                    "1" or "TRUE" or "YES" or "JA" => true,
+                    _ => false,
+                };
+                MailDoublePaged = (parameters.GetValueOrDefault("MAIL_DOUBLE_PAGED")?.ToUpper()) switch {
+                    "1" or "TRUE" or "YES" or "JA" => true,
+                    _ => false,
+                };
+                switch (parameters.GetValueOrDefault("MAIL_SEND_POSTAL", "WISH")?.ToUpper()) {
+                    case "ALL": MailSendPostal = 3; break;
+                    case "WISH": MailSendPostal = 2; break;
+                    case "NO_EMAIL": MailSendPostal = 1; break;
+                    case "NONE": MailSendPostal = 0; break;
+                }
+                switch (parameters.GetValueOrDefault("MAIL_SEND_EMAIL", "WISH")?.ToUpper()) {
+                    case "ALL": MailSendEmail = 2; break;
+                    case "WISH": MailSendEmail = 1; break;
+                    case "NONE": MailSendEmail = 0; break;
+                }
+                switch (parameters.GetValueOrDefault("MAIL_ORDERING", "MGNR")?.ToUpper()) {
+                    case "MGNR": MailOrdering = 0; break;
+                    case "NAME": MailOrdering = 1; break;
+                    case "PLZ": MailOrdering = 2; break;
+                }
+
+                ExportEbicsVersion = int.TryParse(parameters.GetValueOrDefault("EXPORT_EBICS_VERSION"), out var v) ? v : 9;
+                switch (parameters.GetValueOrDefault("EXPORT_EBICS_ADDRESS", "FULL")?.ToUpper()) {
+                    case "OMIT": ExportEbicsAddress = 0; break;
+                    case "LINES": ExportEbicsAddress = 1; break;
+                    case "FULL": ExportEbicsAddress = 2; break;
+                }
+
+                var autoAdjust = (parameters.GetValueOrDefault("AUTOADJUST_BUSINESSSHARES") ?? "").Split(';');
+                AutoAdjustBs = autoAdjust.Length == 5 ? (
+                    int.TryParse(autoAdjust[0], out var v1) ? v1 : null,
+                    double.TryParse(autoAdjust[1], out var v2) ? v2 : null,
+                    int.TryParse(autoAdjust[2], out var v3) ? v3 : null,
+                    double.TryParse(autoAdjust[3], out var v4) ? v4 : null,
+                    int.TryParse(autoAdjust[4], out var v5) ? v5 : null
+                    ) : (null, null, null, null, null);
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -112,7 +192,49 @@ 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;
+            }
+            string mailSendPostal = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailSendPostal = "NONE"; break;
+                case 1: mailSendPostal = "NO_EMAIL"; break;
+                case 2: mailSendPostal = "WISH"; break;
+                case 3: mailSendPostal = "ALL"; break;
+            }
+            string mailSendEmail = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailSendEmail = "NONE"; break;
+                case 1: mailSendEmail = "WISH"; break;
+                case 2: mailSendEmail = "ALL"; break;
+            }
+            string mailOrdering = "MGNR";
+            switch (MailOrdering) {
+                case 0: mailOrdering = "MGNR"; break;
+                case 1: mailOrdering = "NAME"; break;
+                case 2: mailOrdering = "PLZ"; break;
+            }
+            string exportEbicsAddress = "FULL";
+            switch (ExportEbicsAddress) {
+                case 0: exportEbicsAddress = "OMIT"; break;
+                case 1: exportEbicsAddress = "LINES"; break;
+                case 2: exportEbicsAddress = "FULL"; break;
+            }
+            string autoAdjust = $"{AutoAdjustBs.AllowanceKg};{AutoAdjustBs.AllowanceBs?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.AllowanceKgPerBs};{AutoAdjustBs.AllowancePercent?.ToString(CultureInfo.InvariantCulture)};" +
+                                $"{AutoAdjustBs.MinBs}";
+            return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
                 ("CLIENT_NAME", Name),
@@ -129,11 +251,25 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
+                ("CLIENT_ORGANIC_AUTHORITY", OrganicAuthority),
                 ("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),
+                ("MAIL_INCLUDE_NON_DELIVERERS", MailIncludeNonDeliverers ? "YES" : "NO"),
+                ("MAIL_DOUBLE_PAGED", MailDoublePaged ? "YES" : "NO"),
+                ("MAIL_SEND_POSTAL", mailSendPostal),
+                ("MAIL_SEND_EMAIL", mailSendEmail),
+                ("MAIL_ORDERING", mailOrdering),
+                ("EXPORT_EBICS_VERSION", ExportEbicsVersion.ToString()),
+                ("EXPORT_EBICS_ADDRESS", exportEbicsAddress),
+                ("AUTOADJUST_BUSINESSSHARES", autoAdjust),
+            ];
         }
 
         public async Task UpdateValues() {

Elwig/Helpers/Config.cs

@@ -1,19 +1,68 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using IniParser;
+using Microsoft.Extensions.Configuration;
-using IniParser.Model;
 
 namespace Elwig.Helpers {
+
+    public enum WeighingMode { Gross, Net, Box }
+
+    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 bool Required;
+        public string? Log;
+        public string? _Log;
+
+        public ScaleConfig(string id, string? type, string? model, string? cnx, string? empty, string? filling, string? limit, bool? required, string? log) {
+            Id = id;
+            Type = type;
+            Model = model;
+            Connection = cnx;
+            Empty = empty;
+            Filling = filling;
+            Limit = limit;
+            Required = required ?? true;
+            _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;
+        public WeighingMode? WeighingMode;
-        private readonly List<string?[]> ScaleList = new();
+        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;
@@ -22,73 +71,38 @@ namespace Elwig.Helpers {
         }
 
         public void Read() {
-            var parser = new FileIniDataParser();
+            var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
-            IniData? ini = null;
-            try {
-                ini = parser.ReadFile(FileName, Utils.UTF8);
-            } catch {}
 
-            if (ini == null || !ini.TryGetKey("database.file", out string db)) {
+            DatabaseFile = Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, config["database:file"] ?? "database.sqlite3");
-                DatabaseFile = App.DataPath + "database.sqlite3";
+            var log = config["database:log"];
-            } else if (db.Length > 1 && (db[1] == ':' || db[0] == '/' || db[0] == '\\')) {
+            DatabaseLog = log != null ? Path.Combine(Path.GetDirectoryName(FileName) ?? App.DataPath, log) : null;
-                DatabaseFile = db;
+            Branch = config["general:branch"];
-            } else {
+            Debug = TrueValues.Contains(config["general:debug"]?.ToLower());
-                DatabaseFile = App.DataPath + db;
+            var weighing = config["general:weighing"];
-            }
+            WeighingMode = weighing != null && Enum.TryParse<WeighingMode>(weighing, true, out var w) ? w : null;
+            UpdateUrl = config["update:url"];
+            UpdateAuto = TrueValues.Contains(config["update:auto"]?.ToLower());
+            SyncUrl = config["sync:url"];
+            SyncUsername = config["sync:username"] ?? "";
+            SyncPassword = config["sync:password"] ?? "";
 
-            if (ini == null || !ini.TryGetKey("database.log", out string log)) {
+            SmtpHost = config["smtp:host"];
-                DatabaseLog = null;
+            SmtpPort = config["smtp:port"]?.All(char.IsAsciiDigit) == true && config["smtp:port"]?.Length > 0 ? int.Parse(config["smtp:port"]!) : null;
-            } else if (log.Length > 1 && (log[1] == ':' || log[0] == '/' || log[0] == '\\')) {
+            SmtpMode = config["smtp:mode"];
-                DatabaseLog = log;
+            SmtpUsername = config["smtp:username"];
-            } else {
+            SmtpPassword = config["smtp:password"];
-                DatabaseLog = App.DataPath + log;
+            SmtpFrom = config["smtp:from"];
-            }
-
-            if (ini == null || !ini.TryGetKey("general.branch", out string branch)) {
-                Branch = null;
-            } else {
-                Branch = branch;
-            }
-
-            if (ini == null || !ini.TryGetKey("general.debug", out string debug)) {
-                Debug = false;
-            } else {
-                debug = debug.ToLower();
-                Debug = debug == "1" || debug == "true" || debug == "yes" || debug == "on";
-            }
 
+            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key).Order();
             ScaleList.Clear();
             Scales = ScaleList;
-            if (ini != null) {
+            foreach (var s in scales) {
-                foreach (var s in ini.Sections.Where(s => s.SectionName.StartsWith("scale."))) {
+                ScaleList.Add(new(
-                    string? scaleLog = null;
+                    s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
-                    if (s.Keys["log"] != null) {
+                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"],
-                        scaleLog = s.Keys["log"];
+                    config[$"scale.{s}:required"] != null ? TrueValues.Contains(config[$"scale.{s}:required"]?.ToLower()) : null,
-                        if (scaleLog.Length <= 1 || (scaleLog[1] != ':' && scaleLog[0] != '/' && scaleLog[0] != '\\')) {
+                    config[$"scale.{s}:log"]
-                            scaleLog = App.DataPath + scaleLog;
+                ));
-                        }
-                    }
-                    ScaleList.Add(new string?[] {
-                        s.SectionName[6..], s.Keys["type"], s.Keys["model"], s.Keys["connection"],
-                        s.Keys["empty"], s.Keys["filling"], s.Keys["limit"], 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");
             }
         }
     }

Elwig/Helpers/ControlUtils.cs

@@ -5,18 +5,16 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Media;
+using System.Windows.Threading;
+using Brush = System.Windows.Media.Brush;
+using Brushes = System.Windows.Media.Brushes;
 
 namespace Elwig.Helpers {
     public class ControlUtils {
 
-        public enum RenewSourceDefault {
+        public enum RenewSourceDefault { None, IfOnly, First }
-            None,
-            IfOnly,
-            First
-        }
 
-        private static void SetControlBrush(Control input, Brush brush) {
+        private static void SetControlBorderBrush(Control input, Brush brush) {
             if (input is ComboBox cb) {
                 var border = GetComboBoxBorder(cb);
                 if (border != null) border.BorderBrush = brush;
@@ -26,15 +24,15 @@ namespace Elwig.Helpers {
         }
 
         public static void SetInputNotDefault(Control input) {
-            SetControlBrush(input, Brushes.Gold);
+            SetControlBorderBrush(input, Brushes.Gold);
         }
 
         public static void SetInputChanged(Control input) {
-            SetControlBrush(input, Brushes.Orange);
+            SetControlBorderBrush(input, Brushes.Orange);
         }
 
         public static void SetInputInvalid(Control input) {
-            SetControlBrush(input, Brushes.Red);
+            SetControlBorderBrush(input, Brushes.Red);
         }
 
         public static void ClearInputState(Control input) {
@@ -83,13 +81,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)
+            if (selectedId != 0 && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+                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();
@@ -101,28 +99,16 @@ 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(DataGrid dataGrid, IEnumerable? source, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
-            if (selector.ItemsSource == source)
-                return;
-            var selectedIds = selector.SelectedItems.Cast<object>().Select(i => getId(i)).ToList();
-            selector.ItemsSource = source;
-            if (source != null) {
-                selector.SelectedItems.Clear();
-                foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(getId(i))))
-                    selector.SelectedItems.Add(i);
-            }
-        }
-
-        public static void RenewItemsSource(DataGrid dataGrid, IEnumerable? source, Func<object?, object?> getId, SelectionChangedEventHandler? handler = null, RenewSourceDefault def = RenewSourceDefault.None, bool keepSort = true) {
             if (dataGrid.ItemsSource == source)
                 return;
             var column = dataGrid.CurrentCell.Column;
             var sortColumns = dataGrid.Columns.Select(c => c.SortDirection).ToList();
             var sort = dataGrid.Items.SortDescriptions.ToList();
-            var selectedId = getId(dataGrid.SelectedItem);
+            var selectedId = Utils.GetEntityIdentifier(dataGrid.SelectedItem);
             object? selItem = null;
-            if (selectedId != null && source != null)
+            if (selectedId != 0 && source != null)
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+                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();
@@ -142,83 +128,128 @@ 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);
+            if (listBox.SelectionMode == SelectionMode.Single) {
-            object? selItem = null;
+                var selectedId = Utils.GetEntityIdentifier(listBox.SelectedItem);
-            if (selectedId != null && source != null)
+                object? selItem = null;
-                selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(getId(i)));
+                if (selectedId != 0 && source != null)
-            if (source != null && selItem == null) {
+                    selItem = source.Cast<object>().FirstOrDefault(i => selectedId.Equals(Utils.GetEntityIdentifier(i)));
-                if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                if (source != null && selItem == null) {
-                    selItem = source.Cast<object>().FirstOrDefault();
+                    if ((def == RenewSourceDefault.IfOnly && source.Cast<object>().Count() == 1) || def == RenewSourceDefault.First) {
+                        selItem = source.Cast<object>().FirstOrDefault();
+                    }
                 }
+                if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (handler != null && selItem != null) listBox.SelectionChanged += handler;
+                listBox.SelectedItem = selItem;
+            } else {
+                var selectedIds = listBox.SelectedItems.Cast<object>().Select(Utils.GetEntityIdentifier).ToList();
+                if (handler != null && selectedIds != null) listBox.SelectionChanged -= handler;
+                listBox.ItemsSource = source;
+                if (source != null && selectedIds != null) {
+                    listBox.SelectedItems.Clear();
+                    foreach (var i in source.Cast<object>().Where(i => selectedIds.Contains(Utils.GetEntityIdentifier(i))))
+                        listBox.SelectedItems.Add(i);
+                }
+                if (handler != null && selectedIds != null) listBox.SelectionChanged += handler;
             }
-            if (handler != null && selItem != null) listBox.SelectionChanged -= handler;
-            listBox.ItemsSource = source;
-            if (handler != null && selItem != null) listBox.SelectionChanged += handler;
-            listBox.SelectedItem = selItem;
         }
 
-        public static object? GetItemFromSource(IEnumerable source, Func<object?, object?> getId, object? id) {
+        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) {
+        public static T? GetItemFromSource<T>(IEnumerable source, T? item) {
-            return GetItemFromSource(source, getId, getId(item));
+            return (T?)GetItemFromSource(source, Utils.GetEntityIdentifier(item));
         }
 
-        public static void SelectComboBoxItem(ComboBox cb, Func<object?, object?> getId, object? id) {
+        public static object? GetItemFromSourceWithPk(IEnumerable source, params object?[] primaryKey) {
-            cb.SelectedItem = GetItemFromSource(cb.ItemsSource, getId, id);
+            return GetItemFromSource(source, (int?)Utils.GetEntityIdetifierForPk(primaryKey));
         }
 
-        public static void SelectComboBoxItem(ComboBox cb, object? item, Func<object?, object?> getId) {
+        public static void SelectItemWithHash(Selector input, int? hash) {
-            SelectComboBoxItem(cb, getId, getId(item));
+            if (hash == null) {
+                input.SelectedItem = null;
+            } else {
+                input.SelectedItem = GetItemFromSource(input.ItemsSource, 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 IEnumerable<object?> GetItemsFromSource(IEnumerable source, Func<object?, object?> getId, IEnumerable<object?> ids) {
+        public static void SelectItemWithPk(Selector input, params object?[] pk) {
+            SelectItemWithHash(input, Utils.GetEntityIdentifier(pk));
+        }
+
+        public static void SelectItem(Selector input, object? item) {
+            SelectItemWithHash(input, Utils.GetEntityIdentifier(item));
+        }
+
+        public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, IEnumerable<int?> ids) {
             if (source == null)
-                return Array.Empty<object>();
+                return [];
-            return source.Cast<object>().Where(i => ids.Any(c => c?.Equals(getId(i)) ?? false));
+            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 [];
-            return GetItemsFromSource(source, getId, items.Select(i => getId(i)));
+            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(ListBox lb, IEnumerable<int?>? ids) {
-            ccb.SelectedItems.Clear();
+            lb.SelectedItems.Clear();
             if (ids == null) return;
             foreach (var id in ids)
-                ccb.SelectedItems.Add(GetItemFromSource(ccb.ItemsSource, getId, id));
+                lb.SelectedItems.Add(GetItemFromSource(lb.ItemsSource, id));
         }
 
-        public static void SelectCheckComboBoxItems(Xceed.Wpf.Toolkit.CheckComboBox ccb, IEnumerable<object>? items, Func<object?, object?> getId) {
+        public static void SelectItems(ListBox lb, IEnumerable<object>? items) {
-            SelectCheckComboBoxItems(ccb, getId, items?.Select(i => getId(i)));
+            SelectItems(lb, 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) {
+            } else if (input is ListBox lb) {
-                return ccb.SelectedItems.Cast<object>().ToArray();
+                return Utils.GetEntityIdentifier(lb.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;
             }
         }
+
+        public static void InitializeDelayTimer(TextBox tb, Action<object, TextChangedEventArgs> handler) {
+            var timer = new DispatcherTimer {
+                Interval = TimeSpan.FromMilliseconds(250)
+            };
+            timer.Tick += (object? sender, EventArgs evt) => {
+                timer.Stop();
+                var (oSender, oEvent) = ((object, TextChangedEventArgs))timer.Tag;
+                handler(oSender, oEvent);
+            };
+            tb.TextChanged += (object sender, TextChangedEventArgs evt) => {
+                timer.Stop();
+                timer.Tag = (sender, evt);
+                timer.Start();
+            };
+        }
     }
 }

Elwig/Helpers/Export/Bki.cs

@@ -22,20 +22,20 @@ namespace Elwig.Helpers.Export {
                 """;
             var c = App.Client;
             var (a1, a2) = Utils.SplitAddress(c.Address);
-            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};{a2};{c.Plz};{c.Ort}";
+            _clientData = $"{c.LfbisNr};{c.NameFull};;{a1};\t{a2};{c.Plz};{c.Ort}";
         }
 
         public async Task ExportAsync(int year) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT lfbis_nr, family_name, name, billing_name, address, plz, ort, area,
+                SELECT lfbis_nr, name, other_names, billing_name, address, plz, ort, area,
                        date, weight, type, sortid, qualid, year, hkid, kmw, oe
                 FROM v_bki_delivery
                 WHERE year = {year}
                 """;
             var r = await cmd.ExecuteReaderAsync();
-            List<Row> rows = new();
+            List<Row> rows = [];
             while (await r.ReadAsync()) {
                 rows.Add(new(
                     (r.IsDBNull(0) ? null : r.GetString(0), r.IsDBNull(1) ? null : r.GetString(1), r.IsDBNull(2) ? null : r.GetString(2), r.IsDBNull(3) ? null : r.GetString(3), r.GetString(4), r.GetInt32(5), r.GetString(6), r.GetInt32(7)),
@@ -57,7 +57,7 @@ namespace Elwig.Helpers.Export {
 
             var (n1, n2) = billingName == null ? (familyName, name) : Utils.SplitName(billingName, familyName);
             var (a1, a2) = Utils.SplitAddress(address);
-            var memberData = $"{lfBisNr};{n1};{n2};{a1};{a2};{plz};{ort}";
+            var memberData = $"{lfBisNr};{n1};{n2};{a1};\t{a2};{plz};{ort}";
             var deliveryData = $"{string.Join(".", date.Split("-").Reverse())};{weight};TB;{(type == "W" ? "J" : "")};{(type == "R" ? "J" : "")};{sortid};;;{qualid};{year};{hkid};{kmw:0.0};{oe:0}";
             var vollData = $"N;;;{area / 10_000.0}";
 

Elwig/Helpers/Export/Database.cs

@@ -0,0 +1,243 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public static class Database {
+
+        private static async Task<(long? ApplicationId, string? UserVersion, long? SchemaVersion, long FileSize)> GetMeta() {
+            long size = new FileInfo(App.Config.DatabaseFile).Length;
+            using var cnx = await AppDbContext.ConnectAsync();
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id");
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version");
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version");
+            return (applId, userVers != null ? $"{userVers >> 24}.{(userVers >> 16) & 0xFF}.{(userVers >> 8) & 0xFF}.{userVers & 0xFF}" : null, schemaVers, size);
+        }
+
+        public static async Task ExportSqlite(string filename, bool zipFile) {
+            if (zipFile) {
+                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 (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var db = zip.CreateEntryFromFile(App.Config.DatabaseFile, "database.sqlite3", CompressionLevel.SmallestSize);
+            } else {
+                File.Copy(App.Config.DatabaseFile, filename, true);
+            }
+        }
+
+        public static async Task ExportSql(string filename, bool zipFile) {
+            if (zipFile) {
+                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 (applId, userVers, schemaVers, size) = await GetMeta();
+                var meta = zip.CreateEntry("meta.json", CompressionLevel.NoCompression);
+                using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                        ["database"] = new JsonObject {
+                            ["application_id"] = applId,
+                            ["user_version"] = userVers,
+                            ["schema_version"] = schemaVers,
+                            ["file_size"] = size,
+                        },
+                    };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                var sql = zip.CreateEntry("database.sql", CompressionLevel.SmallestSize);
+                using (var writer = new StreamWriter(sql.Open(), Utils.UTF8)) {
+                    await ExportSql(writer);
+                }
+            } else {
+                using var stream = File.OpenWrite(filename);
+                using var writer = new StreamWriter(stream, Utils.UTF8);
+                await ExportSql(writer);
+            }
+        }
+
+        public static async Task ExportSql(StreamWriter writer) {
+            using var cnx = await AppDbContext.ConnectAsync();
+
+            var tables = new List<(string Name, string Sql)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT name, sql FROM sqlite_schema WHERE type = 'table'";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    tables.Add((reader.GetString(0), reader.GetString(1)));
+                }
+            }
+
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+
+            await writer.WriteLineAsync($"-- Elwig database dump, {DateTime.Now:yyyy-MM-dd, HH:mm:ss}");
+            await writer.WriteLineAsync($"-- {Environment.MachineName}, Zwst. {App.BranchName}, {App.Client.Name}");
+            await writer.WriteLineAsync("BEGIN TRANSACTION;");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=OFF;");
+            await writer.WriteLineAsync($"PRAGMA application_id=0x{applId:X8};");
+            await writer.WriteLineAsync($"PRAGMA user_version=0x{userVers:X8};");
+
+            foreach (var t in tables) {
+                await writer.WriteAsync(t.Sql);
+                await writer.WriteLineAsync(";");
+
+                var columnNames = new List<string>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"PRAGMA table_info({t.Name})";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        columnNames.Add(reader.GetString(1));
+                    }
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"SELECT {string.Join(',', columnNames)} FROM {t.Name}";
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    var columns = await reader.GetColumnSchemaAsync();
+                    var values = new object[reader.FieldCount];
+                    while (await reader.ReadAsync()) {
+                        await writer.WriteAsync($"INSERT INTO {t.Name} VALUES (");
+
+                        reader.GetValues(values);
+                        for (int i = 0; i < columns.Count; i++) {
+                            var c = columns[i];
+                            var v = values[i];
+                            if (i > 0) await writer.WriteAsync(",");
+                            if (v == null || v is DBNull) {
+                                await writer.WriteAsync("NULL");
+                            } else if (c.DataTypeName == "TEXT") {
+                                await writer.WriteAsync($"'{v.ToString()?.Replace("'", "''")}'");
+                            } else {
+                                await writer.WriteAsync(v.ToString()?.Replace(',', '.'));
+                            }
+                        }
+
+                        await writer.WriteLineAsync(");");
+                    }
+                }
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = "SELECT sql FROM sqlite_schema WHERE type != 'table' AND sql IS NOT NULL";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    await writer.WriteAsync(reader.GetString(0));
+                    await writer.WriteLineAsync(";");
+                }
+            }
+
+            await writer.WriteLineAsync($"PRAGMA schema_version={schemaVers};");
+            await writer.WriteLineAsync("PRAGMA foreign_keys=ON;");
+            await writer.WriteLineAsync("COMMIT;");
+            await writer.WriteLineAsync("VACUUM;");
+        }
+
+        public static async Task Import(string filename) {
+            if (filename.EndsWith(".sql")) {
+                await ImportSql(filename, false);
+            } else if (filename.EndsWith(".sql.zip")) {
+                await ImportSql(filename, true);
+            } else if (filename.EndsWith(".sqlite3")) {
+                await ImportSqlite(filename, false);
+            } else if (filename.EndsWith(".sqlite3.zip")) {
+                await ImportSqlite(filename, true);
+            } else {
+                throw new ArgumentException($"Unknown file extension for importing: '{filename}'");
+            }
+        }
+
+        public static async Task ImportSql(string filename, bool zipFile = false) {
+            if (zipFile) {
+                using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                await zip.CheckIntegrity();
+                foreach (var entry in zip.Entries) {
+                    if (entry.Name.EndsWith(".sql")) {
+                        using var stream = entry.Open();
+                        using var reader = new StreamReader(stream, Utils.UTF8);
+                        await ImportSql(reader);
+                        return;
+                    }
+                }
+                throw new FileFormatException("ZIP archive has to contain at least one .sql file");
+            } else {
+                using var stream = File.Open(filename, FileMode.Open);
+                using var reader = new StreamReader(stream, Utils.UTF8);
+                await ImportSql(reader);
+            }
+        }
+
+        public static async Task ImportSqlite(string filename, bool zipFile = false) {
+            if (zipFile) {
+                var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+                try {
+                    using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                    await zip.CheckIntegrity();
+                    foreach (var entry in zip.Entries) {
+                        if (entry.Name.EndsWith(".sqlite3")) {
+                            entry.ExtractToFile(newName);
+                            await ImportSqlite(newName);
+                            return;
+                        }
+                    }
+                    throw new FileFormatException("ZIP archive has to contain at least one .sqlite3 file");
+                } finally {
+                    if (File.Exists(newName)) File.Delete(newName);
+                }
+            }
+
+            var oldName = Path.ChangeExtension(App.Config.DatabaseFile, ".old.sqlite3");
+            File.Move(App.Config.DatabaseFile, oldName, true);
+            File.Move(filename, App.Config.DatabaseFile, false);
+
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, "VACUUM");
+        }
+
+        public static async Task ImportSql(StreamReader reader) {
+            var newName = Path.ChangeExtension(App.Config.DatabaseFile, ".new.sqlite3");
+            File.Delete(newName);
+            try {
+                using (var cnx = await AppDbContext.ConnectAsync($"Data Source=\"{newName}\"; Mode=ReadWriteCreate; Foreign Keys=False; Cache=Default; Pooling=False")) {
+                    await AppDbContext.ExecuteBatch(cnx, await reader.ReadToEndAsync());
+                }
+                await ImportSqlite(newName);
+            } finally {
+                if (File.Exists(newName)) File.Delete(newName);
+            }
+        }
+    }
+}

Elwig/Helpers/Export/Ebics.cs

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

Elwig/Helpers/Export/Elba.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
 using System;
 
 namespace Elwig.Helpers.Export {

Elwig/Helpers/Export/ElwigData.cs

@@ -0,0 +1,841 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Text.Json.Nodes;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace Elwig.Helpers.Export {
+    public static class ElwigData {
+
+        public enum ImportMode { Auto, Interactively, FromBranches }
+
+        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(params string[] filenames) {
+            await File.AppendAllLinesAsync(ImportedTxt, filenames, Utils.UTF8);
+        }
+
+        public static Task Import(string filename, ImportMode mode) => Import([filename], mode);
+
+        public static async Task Import(IEnumerable<string> filenames, ImportMode mode) {
+            try {
+                Dictionary<string, Branch> branches;
+                Dictionary<int, int> currentDids;
+                Dictionary<string, int> currentLsNrs;
+                Dictionary<int, List<WbRd>> currentWbRde;
+                Dictionary<int, AT_Kg> kgs;
+                List<WbGl> currentWbGls;
+
+                using (var ctx = new AppDbContext()) {
+                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
+                    currentDids = await ctx.Deliveries
+                        .GroupBy(d => d.Year)
+                        .ToDictionaryAsync(g => g.Key, g => g.Max(d => d.DId));
+                    currentLsNrs = await ctx.Deliveries
+                        .ToDictionaryAsync(d => d.LsNr, d => d.DId);
+                    currentWbRde = await ctx.WbRde
+                        .GroupBy(r => r.KgNr)
+                        .ToDictionaryAsync(g => g.Key, g => g.ToList());
+                    currentWbGls = await ctx.WbGls.ToListAsync();
+                    kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
+                }
+
+                var data = new List<(
+                    List<Member> Members,
+                    List<BillingAddr> BillingAddresses,
+                    List<MemberTelNr> TelephoneNumbers,
+                    List<MemberEmailAddr> EmailAddresses,
+                    List<AreaCom> AreaCommitments,
+                    List<WbRd> Riede,
+                    List<WbKg> WbKgs,
+                    List<WbGl> WbGls,
+                    List<Delivery> Deliveries,
+                    List<DeliveryPart> DeliveryParts,
+                    List<DeliveryPartModifier> Modifiers,
+                    Dictionary<string, List<(int Id1, int Id2, DateTime CreatedAt, DateTime ModifiedAt)>> Timestamps)>();
+
+                var metaData = new List<(string FileName, string ZwstId, string Device,
+                    int? MemberNum, string? MemberFilters,
+                    int? AreaComNum, string? AreaComFilters,
+                    int? DeliveryNum, string? DeliveryFilters)>();
+
+                foreach (var filename in filenames) {
+                    try {
+                        data.Add(new([], [], [], [], [], [], [], new([], [], [], [], new() {
+                            ["member"] = [],
+                            ["area_commitment"] = [],
+                            ["delivery"] = [],
+                        })));
+                        var r = data[^1];
+
+                        // TODO read encrypted files
+                        using var zip = ZipFile.Open(filename, ZipArchiveMode.Read);
+                        await zip.CheckIntegrity();
+
+                        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 Elwig-Export-Datei ({filename})");
+                        }
+
+                        var metaJson = zip.GetEntry("meta.json");
+                        var meta = await JsonNode.ParseAsync(metaJson!.Open());
+                        var memberCount = meta!["members"]?["count"]?.AsValue().GetValue<int>();
+                        var memberFilters = meta!["members"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var areaComCount = meta!["area_commitments"]?["count"]?.AsValue().GetValue<int>();
+                        var areaComFilters = meta!["area_commitments"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        var deliveryCount = meta!["deliveries"]?["count"]?.AsValue().GetValue<int>();
+                        var deliveryFilters = meta!["deliveries"]?["filters"]?.AsArray().Select(f => f!.AsValue().GetValue<string>()).ToArray();
+                        metaData.Add((Path.GetFileName(filename),
+                            meta["zwstid"]!.AsValue().GetValue<string>(), meta["device"]!.AsValue().GetValue<string>(),
+                            memberCount, memberFilters != null ? string.Join(" / ", memberFilters) : null,
+                            areaComCount, areaComFilters != null ? string.Join(" / ", areaComFilters) : null,
+                            deliveryCount, deliveryFilters != null ? string.Join(" / ", deliveryFilters) : null));
+
+                        var wbKgsJson = zip.GetEntry("wb_kgs.json");
+                        if (wbKgsJson != null) {
+                            using var reader = new StreamReader(wbKgsJson.Open(), Utils.UTF8);
+                            string? line;
+                            while ((line = await reader.ReadLineAsync()) != null) {
+                                var obj = JsonNode.Parse(line)!.AsObject();
+                                var (k, g) = obj.ToWbKg(currentWbGls);
+                                r.WbKgs.Add(k);
+                                if (g != null) {
+                                    currentWbGls[g.GlNr] = g;
+                                    r.WbGls.Add(g);
+                                }
+                            }
+                        }
+
+                        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();
+                                var (m, b, telNrs, emailAddrs, timestamps) = obj.ToMember(kgs);
+                                r.Members.Add(m);
+                                if (b != null) r.BillingAddresses.Add(b);
+                                r.TelephoneNumbers.AddRange(telNrs);
+                                r.EmailAddresses.AddRange(emailAddrs);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["member"].Add((m.MgNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        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();
+                                var (areaCom, wbrd, timestamps) = obj.ToAreaCom(currentWbRde);
+                                r.AreaCommitments.Add(areaCom);
+                                if (wbrd != null) {
+                                    r.Riede.Add(wbrd);
+                                }
+                                if (timestamps.HasValue)
+                                    r.Timestamps["area_commitment"].Add((areaCom.FbNr, 0, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+
+                        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, rde, timestamps) = obj.ToDelivery(currentLsNrs, currentDids, kgs, currentWbRde);
+                                r.Deliveries.Add(d);
+                                r.DeliveryParts.AddRange(parts);
+                                r.Modifiers.AddRange(mods);
+                                r.Riede.AddRange(rde);
+                                if (timestamps.HasValue)
+                                    r.Timestamps["delivery"].Add((d.Year, d.DId, timestamps.Value.CreatedAt, timestamps.Value.ModifiedAt));
+                            }
+                        }
+                    } catch (Exception exc) when (
+                            exc is InvalidDataException ||
+                            exc is FileFormatException ||
+                            exc is FileNotFoundException ||
+                            exc is IOException) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden und wird übersprungen.\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                        await AddImportedFiles(Path.GetFileName(filename));
+                    } catch (Exception exc) {
+                        data.RemoveAt(data.Count - 1);
+                        var str = $"Die Elwig-Export-Datei '{Path.GetFileName(filename)}' konnte nicht verarbeitet werden. Soll sie in Zukunft übersprungen werden?\n\n" + exc.Message;
+                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                        var r = MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.YesNo, MessageBoxImage.Error, MessageBoxResult.No);
+                        if (r == MessageBoxResult.Yes) {
+                            await AddImportedFiles(Path.GetFileName(filename));
+                        }
+                    }
+                }
+
+                var importedMembers = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+                var importedAreaComs = new List<(string FileName, string ZwstId, string Device, int Imported, int NotImported, string Filters)>();
+                var importedDeliveries = new List<(string FileName, string ZwstId, string Device, int New, int Overwritten, int NotImported, string Filters)>();
+
+                foreach (var ((members, billingAddresses, telephoneNumbers, emailAddresses, areaCommitments, riede, wbKgs, wbGls, deliveries, deliveryParts, modifiers, timestamps), meta) in data.Zip(metaData)) {
+                    var branch = branches[meta.ZwstId];
+                    var device = meta.Device;
+
+                    using var ctx = new AppDbContext();
+
+                    var kgnrs = wbKgs.Select(k => k.KgNr).ToList();
+                    var duplicateKgNrs = await ctx.WbKgs
+                        .Where(k => kgnrs.Contains(k.KgNr))
+                        .Select(k => k.KgNr)
+                        .ToListAsync();
+
+                    var mgnrs = members.Select(m => m.MgNr).ToList();
+                    var duplicateMgNrs = await ctx.Members
+                        .Where(m => mgnrs.Contains(m.MgNr))
+                        .Select(m => m.MgNr)
+                        .ToListAsync();
+                    bool importNewMembers = false, importDuplicateMembers = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (mgnrs.Count - duplicateMgNrs.Count > 0)
+                            importNewMembers = ImportQuestion(branch.Name, device, "Mitglieder", false, mgnrs.Count - duplicateMgNrs.Count);
+                    } else {
+                        importNewMembers = true;
+                    }
+                    if (duplicateMgNrs.Count > 0)
+                        importDuplicateMembers = ImportQuestion(branch.Name, device, "Mitglieder", true, duplicateMgNrs.Count);
+
+                    var fbnrs = areaCommitments.Select(c => c.FbNr).ToList();
+                    var duplicateFbNrs = await ctx.AreaCommitments
+                        .Where(c => fbnrs.Contains(c.FbNr))
+                        .Select(c => c.FbNr)
+                        .ToListAsync();
+
+                    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();
+                    var allowedDuplicateLsNrs = new List<string>();
+                    bool importNewDeliveries = false, importDuplicateDeliveries = false;
+                    if (mode == ImportMode.Interactively) {
+                        if (lsnrs.Count - duplicateLsNrs.Count > 0)
+                            importNewDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", false, lsnrs.Count - duplicateLsNrs.Count);
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    } else if (mode == ImportMode.FromBranches) {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0) {
+                            allowedDuplicateLsNrs = await ctx.Deliveries
+                                .Where(d => lsnrs.Contains(d.LsNr) && d.ZwstId == branch.ZwstId)
+                                .Select(d => d.LsNr)
+                                .ToListAsync();
+                            if (duplicateLsNrs.Count - allowedDuplicateLsNrs.Count > 0)
+                                importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count - allowedDuplicateLsNrs.Count);
+                        }
+                    } else {
+                        importNewDeliveries = true;
+                        if (duplicateLsNrs.Count > 0)
+                            importDuplicateDeliveries = ImportQuestion(branch.Name, device, "Lieferungen", true, duplicateLsNrs.Count);
+                    }
+
+                    if (importDuplicateMembers || importNewMembers || importDuplicateDeliveries || importNewDeliveries) {
+                        ctx.AddRange(wbGls);
+                        ctx.UpdateRange(wbKgs.Where(k => duplicateKgNrs.Contains(k.KgNr)));
+                        ctx.AddRange(wbKgs.Where(k => !duplicateKgNrs.Contains(k.KgNr)));
+                    }
+
+                    if (importDuplicateMembers) {
+                        ctx.RemoveRange(ctx.BillingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.RemoveRange(ctx.MemberEmailAddrs.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(members.Where(m => duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (importNewMembers) {
+                        ctx.AddRange(members.Where(m => !duplicateMgNrs.Contains(m.MgNr)));
+                        ctx.AddRange(billingAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.AddRange(telephoneNumbers.Where(n => !duplicateMgNrs.Contains(n.MgNr)));
+                        ctx.AddRange(emailAddresses.Where(a => !duplicateMgNrs.Contains(a.MgNr)));
+                        ctx.UpdateRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && duplicateFbNrs.Contains(c.FbNr)));
+                        ctx.AddRange(areaCommitments.Where(c => !duplicateMgNrs.Contains(c.MgNr) && !duplicateFbNrs.Contains(c.FbNr)));
+                    }
+                    if (members.Count > 0) {
+                        var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0;
+                        var o = importDuplicateMembers ? duplicateMgNrs.Count : 0;
+                        importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
+                    }
+                    if (areaCommitments.Count > 0) {
+                        ctx.AddRange(riede);
+                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
+                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
+                    }
+
+                    if (allowedDuplicateLsNrs.Count > 0) {
+                        var dids = deliveries
+                            .Where(d => allowedDuplicateLsNrs.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => allowedDuplicateLsNrs.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importDuplicateDeliveries) {
+                        var l = duplicateLsNrs.Except(allowedDuplicateLsNrs).ToList();
+                        var dids = deliveries
+                            .Where(d => l.Contains(d.LsNr))
+                            .Select(d => (d.Year, d.DId))
+                            .ToList();
+                        ctx.RemoveRange(ctx.DeliveryParts
+                            .Where(p => l.Contains(p.Delivery.LsNr))
+                            .SelectMany(p => p.PartModifiers));
+                        ctx.RemoveRange(ctx.DeliveryParts.Where(p => l.Contains(p.Delivery.LsNr)));
+                        ctx.UpdateRange(deliveries.Where(d => dids.Contains((d.Year, d.DId))));
+                        ctx.AddRange(deliveryParts.Where(p => dids.Contains((p.Year, p.DId))));
+                        ctx.AddRange(modifiers.Where(m => dids.Contains((m.Year, m.DId))));
+                    }
+                    if (importNewDeliveries) {
+                        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))));
+                    }
+                    if (deliveries.Count > 0) {
+                        var n = importNewDeliveries ? deliveries.Count - duplicateDIds.Count : 0;
+                        var o = allowedDuplicateLsNrs.Count + (importDuplicateDeliveries ? duplicateDIds.Count - allowedDuplicateLsNrs.Count : 0);
+                        importedDeliveries.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, deliveries.Count - n - o, meta.DeliveryFilters));
+                    }
+
+                    await ctx.SaveChangesAsync();
+
+                    var primaryKeys = new Dictionary<string, string>() {
+                        ["member"] = "mgnr, 0",
+                        ["area_commitment"] = "fbnr, 0",
+                        ["delivery"] = "year, did",
+                    };
+                    var updateStmts = timestamps
+                        .SelectMany(e => e.Value.Select(m => $"UPDATE {e.Key} " +
+                                                             $"SET ctime = {((DateTimeOffset)m.CreatedAt.ToUniversalTime()).ToUnixTimeSeconds()}, " +
+                                                                 $"mtime = {((DateTimeOffset)m.ModifiedAt.ToUniversalTime()).ToUnixTimeSeconds()} " +
+                                                             $"WHERE ({primaryKeys[e.Key]}) = ({m.Id1}, {m.Id2});"));
+                    using var cnx = AppDbContext.Connect();
+                    await AppDbContext.ExecuteBatch(cnx, $"""
+                        BEGIN;
+                        UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        {string.Join("\n", updateStmts)}
+                        UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';
+                        COMMIT;
+                        """);
+
+                    await AddImportedFiles(Path.GetFileName(meta.FileName));
+                }
+                App.HintContextChange();
+
+                MessageBox.Show(
+                    $"Das importieren der Daten war erfolgreich!\n" +
+                    $"Folgendes wurde importiert:\n" +
+                    string.Join("\n", [
+                        $"Mitglieder: {importedMembers.Sum(d => d.New + d.Overwritten)}",
+                        ..importedMembers.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschrieben, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Flächenbindungen: {importedAreaComs.Sum(d => d.Imported)}",
+                        ..importedAreaComs.Select(d =>
+                            $"  {d.FileName} ({d.Imported})\n" +
+                            $"    ({d.Imported} importiert, {d.NotImported} nicht importiert)\n" +
+                            $"    Zweigstelle: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}"),
+                        $"Lieferungen: {importedDeliveries.Sum(d => d.New + d.Overwritten)}",
+                        ..importedDeliveries.Select(d =>
+                            $"  {d.FileName} ({d.New + d.Overwritten})\n" +
+                            $"    ({d.New} neu, {d.Overwritten} überschr., {d.NotImported} nicht importiert)\n" +
+                            $"    Zwst.: {branches[d.ZwstId].Name} (Gerät {d.Device})\n" +
+                            $"    Filter: {d.Filters}")
+                    ]),
+                    "Importieren erfolgreich",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\nEvtl. muss die Datenbank manuell auf dieses Gerät kopieren werden.\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Fehler beim Importieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+        }
+
+        private static bool ImportQuestion(string branch, string device, string subject, bool duplicate, int number) {
+            return MessageBox.Show(
+                $"Sollen {number} {(duplicate ? "" : "neue ")}{subject} durch die Zweigstelle\n" +
+                $"{branch} (Gerät {device}) {(duplicate ? "überschrieben" : "importiert")} werden?",
+                $"{subject} importieren",
+                MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.Yes
+            ) == MessageBoxResult.Yes;
+        }
+
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern"]),
+            }.Export(filename);
+        }
+
+        public static Task Export(string filename, IEnumerable<Member> members, IEnumerable<AreaCom> areaComs, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Members = (members, filters),
+                AreaComs = (areaComs, ["von exportierten Mitgliedern"]),
+                WbKgs = (wbKgs, ["von exportierten Mitgliedern und Flächenbindungen"]),
+            }.Export(filename);
+        }
+
+        public static Task Export(string filename, IEnumerable<Delivery> deliveries, IEnumerable<WbKg> wbKgs, IEnumerable<string> filters) {
+            return new ElwigExport {
+                Deliveries = (deliveries, filters),
+                WbKgs = (wbKgs, ["von exportierten Lieferungen"]),
+            }.Export(filename);
+        }
+
+        public class ElwigExport {
+            public (IEnumerable<WbKg> WbKgs, IEnumerable<string> Filters)? WbKgs { get; set; }
+            public (IEnumerable<Member> Members, IEnumerable<string> Filters)? Members { get; set; }
+            public (IEnumerable<AreaCom> AreaComs, IEnumerable<string> Filters)? AreaComs { get; set; }
+            public (IEnumerable<Delivery> Deliveries, IEnumerable<string> Filters)? Deliveries { get; set; }
+
+            public async Task Export(string filename) {
+                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)) {
+                    var obj = new JsonObject {
+                        ["timestamp"] = $"{DateTime.UtcNow:yyyy-MM-ddTHH:mm:ssZ}",
+                        ["zwstid"] = App.ZwstId,
+                        ["device"] = Environment.MachineName,
+                    };
+                    if (WbKgs != null) {
+                        obj["wb_kgs"] = new JsonObject {
+                            ["count"] = WbKgs.Value.WbKgs.Count(),
+                            ["filters"] = new JsonArray(WbKgs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    }
+                    if (Members != null)
+                        obj["members"] = new JsonObject {
+                            ["count"] = Members.Value.Members.Count(),
+                            ["filters"] = new JsonArray(Members.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (AreaComs != null)
+                        obj["area_commitments"] = new JsonObject {
+                            ["count"] = AreaComs.Value.AreaComs.Count(),
+                            ["filters"] = new JsonArray(AreaComs.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    if (Deliveries != null)
+                        obj["deliveries"] = new JsonObject {
+                            ["count"] = Deliveries.Value.Deliveries.Count(),
+                            ["parts"] = Deliveries.Value.Deliveries.Sum(d => d.Parts.Count),
+                            ["filters"] = new JsonArray(Deliveries.Value.Filters.Select(f => (JsonNode)f).ToArray()),
+                        };
+                    await writer.WriteAsync(obj.ToJsonString(Utils.JsonOpts));
+                }
+
+                // TODO encrypt files
+                if (WbKgs != null) {
+                    var json = zip.CreateEntry("wb_kgs.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var k in WbKgs.Value.WbKgs) {
+                        await writer.WriteLineAsync(k.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (Members != null) {
+                    var json = zip.CreateEntry("members.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var m in Members.Value.Members) {
+                        await writer.WriteLineAsync(m.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (AreaComs != null) {
+                    var json = zip.CreateEntry("area_commitments.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var c in AreaComs.Value.AreaComs) {
+                        await writer.WriteLineAsync(c.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+                if (Deliveries != null) {
+                    var json = zip.CreateEntry("deliveries.json", CompressionLevel.SmallestSize);
+                    using var writer = new StreamWriter(json.Open(), Utils.UTF8);
+                    foreach (var d in Deliveries.Value.Deliveries) {
+                        await writer.WriteLineAsync(d.ToJson().ToJsonString(Utils.JsonOpts));
+                    }
+                }
+            }
+        }
+
+        public static JsonObject ToJson(this WbKg k) {
+            return new JsonObject {
+                ["kgnr"] = k.KgNr,
+                ["großlage"] = k.Gl?.Name,
+            };
+        }
+
+        public static (WbKg, WbGl?) ToWbKg(this JsonNode json, List<WbGl> gls) {
+            var grosslage = json["großlage"]?.AsValue().GetValue<string>();
+            WbGl? gl = null;
+            bool newGl = false;
+            if (grosslage != null) {
+                gl = gls.FirstOrDefault(g => g.Name == grosslage);
+                if (gl == null) {
+                    newGl = true;
+                    gl = new WbGl {
+                        GlNr = (gls.Count == 0 ? 1 : gls.Max(g => g.GlNr)) + 1,
+                        Name = grosslage,
+                    };
+                    gls[gl.GlNr] = gl;
+                }
+            }
+            return (new WbKg {
+                KgNr = json["kgnr"]!.AsValue().GetValue<int>(),
+                GlNr = gl?.GlNr,
+            }, newGl ? gl : null);
+        }
+
+        public static JsonObject ToJson(this Member m) {
+            return new JsonObject {
+                ["mgnr"] = m.MgNr,
+                ["predecessor_mgnr"] = m.PredecessorMgNr,
+                ["name"] = m.Name,
+                ["prefix"] = m.Prefix,
+                ["given_name"] = m.GivenName,
+                ["middle_names"] = m.MiddleName,
+                ["suffix"] = m.Suffix,
+                ["attn"] = m.ForTheAttentionOf,
+                ["birthday"] = m.Birthday,
+                ["entry_date"] = m.EntryDate != null ? $"{m.EntryDate:yyyy-MM-dd}" : null,
+                ["exit_date"] = m.ExitDate != null ? $"{m.ExitDate:yyyy-MM-dd}" : null,
+                ["business_shares"] = m.BusinessShares,
+                ["accounting_nr"] = m.AccountingNr,
+                ["zwstid"] = m.ZwstId,
+                ["lfbis_nr"] = m.LfbisNr,
+                ["ustid_nr"] = m.UstIdNr,
+                ["juridical_pers"] = m.IsJuridicalPerson,
+                ["volllieferant"] = m.IsVollLieferant,
+                ["buchführend"] = m.IsBuchführend,
+                ["organic"] = m.IsOrganic,
+                ["funktionär"] = m.IsFunktionär,
+                ["active"] = m.IsActive,
+                ["deceased"] = m.IsDeceased,
+                ["iban"] = m.Iban,
+                ["bic"] = m.Bic,
+                ["default_kgnr"] = m.DefaultKgNr,
+                ["contact_postal"] = m.ContactViaPost,
+                ["contact_email"] = m.ContactViaEmail,
+                ["address"] = new JsonObject {
+                    ["address"] = m.Address,
+                    ["postal_dest"] = m.PostalDestId,
+                    ["country"] = m.CountryNum,
+                },
+                ["billing_address"] = m.BillingAddress != null ? new JsonObject {
+                    ["name"] = m.BillingAddress.FullName,
+                    ["address"] = m.BillingAddress.Address,
+                    ["postal_dest"] = m.BillingAddress.PostalDestId,
+                    ["country"] = m.BillingAddress.CountryNum,
+                } : null,
+                ["telephone_numbers"] = new JsonArray(m.TelephoneNumbers.OrderBy(n => n.Nr).Select(n => {
+                    var obj = new JsonObject {
+                        ["number"] = n.Number,
+                        ["type"] = n.Type,
+                    };
+                    if (n.Comment != null) obj["comment"] = n.Comment;
+                    return obj;
+                }).ToArray()),
+                ["email_addresses"] = new JsonArray(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => {
+                    var obj = new JsonObject {
+                        ["address"] = a.Address,
+                    };
+                    if (a.Comment != null) obj["comment"] = a.Comment;
+                    return obj;
+                }).ToArray()),
+                ["comment"] = m.Comment,
+                ["created_at"] = $"{m.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{m.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
+            var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
+            var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
+            if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
+                throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+            }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            return (new Member {
+                MgNr = mgnr,
+                PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
+                Name = json["name"]?.AsValue().GetValue<string>() ?? json["family_name"]!.AsValue().GetValue<string>(),
+                Prefix = json["prefix"]?.AsValue().GetValue<string>(),
+                GivenName = json["given_name"]?.AsValue().GetValue<string>(),
+                MiddleName = json["middle_names"]?.AsValue().GetValue<string>(),
+                Suffix = json["suffix"]?.AsValue().GetValue<string>(),
+                ForTheAttentionOf = json["attn"]?.AsValue().GetValue<string>(),
+                Birthday = json["birthday"]?.AsValue().GetValue<string>(),
+                EntryDateString = json["entry_date"]?.AsValue().GetValue<string>(),
+                ExitDateString = json["exit_date"]?.AsValue().GetValue<string>(),
+                BusinessShares = json["business_shares"]?.AsValue().GetValue<int>() ?? 0,
+                AccountingNr = json["accounting_nr"]?.AsValue().GetValue<string>(),
+                ZwstId = json["zwstid"]?.AsValue().GetValue<string>(),
+                LfbisNr = json["lfbis_nr"]?.AsValue().GetValue<string>(),
+                UstIdNr = json["ustid_nr"]?.AsValue().GetValue<string>(),
+                IsJuridicalPerson = json["juridical_pers"]?.AsValue().GetValue<bool>() ?? false,
+                IsVollLieferant = json["volllieferant"]?.AsValue().GetValue<bool>() ?? false,
+                IsBuchführend = json["buchführend"]?.AsValue().GetValue<bool>() ?? false,
+                IsOrganic = json["organic"]?.AsValue().GetValue<bool>() ?? false,
+                IsFunktionär = json["funktionär"]?.AsValue().GetValue<bool>() ?? false,
+                IsActive = json["active"]?.AsValue().GetValue<bool>() ?? false,
+                IsDeceased = json["deceased"]?.AsValue().GetValue<bool>() ?? false,
+                Iban = json["iban"]?.AsValue().GetValue<string>(),
+                Bic = json["bic"]?.AsValue().GetValue<string>(),
+                CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = json["address"]!["address"]!.AsValue().GetValue<string>(),
+                DefaultKgNr = kgnr,
+                ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
+                ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, json["billing_address"] is JsonObject a ? new BillingAddr {
+                MgNr = mgnr,
+                FullName = a["name"]!.AsValue().GetValue<string>(),
+                CountryNum = a["country"]!.AsValue().GetValue<int>(),
+                PostalDestId = a["postal_dest"]!.AsValue().GetValue<string>(),
+                Address = a["address"]!.AsValue().GetValue<string>(),
+            } : null, json["telephone_numbers"]!.AsArray().Select(n => n!.AsObject()).Select((n, i) => new MemberTelNr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Type = n["type"]!.AsValue().GetValue<string>(),
+                Number = n["number"]!.AsValue().GetValue<string>(),
+                Comment = n["comment"]?.AsValue().GetValue<string>(),
+            }).ToList(), json["email_addresses"]!.AsArray().Select(a => a!.AsObject()).Select((a, i) => new MemberEmailAddr {
+                MgNr = mgnr,
+                Nr = i + 1,
+                Address = a["address"]!.AsValue().GetValue<string>(),
+                Comment = a["comment"]?.AsValue().GetValue<string>(),
+            }).ToList(),
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+
+        public static JsonObject ToJson(this AreaCom c) {
+            return new JsonObject {
+                ["fbnr"] = c.FbNr,
+                ["mgnr"] = c.MgNr,
+                ["vtrgid"] = c.VtrgId,
+                ["cultid"] = c.CultId,
+                ["area"] = c.Area,
+                ["kgnr"] = c.KgNr,
+                ["gstnr"] = c.GstNr,
+                ["ried"] = c.Rd?.Name,
+                ["year_from"] = c.YearFrom,
+                ["year_to"] = c.YearTo,
+                ["comment"] = c.Comment,
+                ["created_at"] = $"{c.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{c.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (AreaCom, WbRd?, (DateTime CreatedAt, DateTime ModifiedAt)?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
+            var ried = json["ried"]?.AsValue().GetValue<string>();
+            WbRd? rd = null;
+            bool newRd = false;
+            if (ried != null) {
+                var rde = riede.GetValueOrDefault(kgnr, []);
+                rd = rde.FirstOrDefault(r => r.Name == ried);
+                if (rd == null) {
+                    newRd = true;
+                    rd = new WbRd {
+                        KgNr = kgnr,
+                        RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                        Name = ried,
+                    };
+                    rde.Add(rd);
+                    riede[rd.KgNr] = rde;
+                }
+            }
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            return (new AreaCom {
+                FbNr = json["fbnr"]!.AsValue().GetValue<int>(),
+                MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
+                VtrgId = json["vtrgid"]!.AsValue().GetValue<string>(),
+                CultId = json["cultid"]?.AsValue().GetValue<string>(),
+                Area = json["area"]!.AsValue().GetValue<int>(),
+                KgNr = kgnr,
+                GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
+                RdNr = rd?.RdNr ?? json["rdnr"]?.AsValue().GetValue<int>(),
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
+                YearTo = json["year_to"]?.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, newRd ? rd : null,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+
+        public static JsonObject ToJson(this 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,
+                        ["ried"] = p.Rd?.Name,
+                        ["net_weight"] = p.IsNetWeight,
+                        ["manual_weighing"] = p.IsManualWeighing,
+                        ["modids"] = new JsonArray(p.Modifiers.Select(m => (JsonNode)m.ModId).ToArray()),
+                        ["comment"] = p.Comment,
+                        ["created_at"] = $"{p.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                        ["modified_at"] = $"{p.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+                    };
+                    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.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData);
+                    if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason;
+                    return obj;
+                }).ToArray()),
+                ["comment"] = d.Comment,
+                ["created_at"] = $"{d.CreatedAt:yyyy-MM-ddTHH:mm:ssK}",
+                ["modified_at"] = $"{d.ModifiedAt:yyyy-MM-ddTHH:mm:ssK}",
+            };
+        }
+
+        public static (Delivery, List<DeliveryPart>, List<DeliveryPartModifier>, List<WbRd>, (DateTime CreatedAt, DateTime ModifiedAt)?) ToDelivery(this JsonNode json, Dictionary<string, int> currentLsNrs, Dictionary<int, int> currentDids, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
+            var year = json["year"]!.AsValue().GetValue<int>();
+            var lsnr = json["lsnr"]!.AsValue().GetValue<string>();
+            var did = currentLsNrs.GetValueOrDefault(lsnr, -1);
+            if (did == -1) {
+                if (!currentDids.ContainsKey(year)) currentDids[year] = 0;
+                did = ++currentDids[year];
+            }
+            currentLsNrs[lsnr] = did;
+            var createdAt = json["created_at"]?.AsValue().GetValue<string>();
+            var modifiedAt = json["modified_at"]?.AsValue().GetValue<string>();
+            var wbRde = new List<WbRd>();
+            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 = lsnr,
+                MgNr = json["mgnr"]!.AsValue().GetValue<int>(),
+                Comment = json["comment"]?.AsValue().GetValue<string>(),
+                ImportedAt = DateTime.Now,
+            }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
+                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
+                var ried = p["ried"]?.AsValue().GetValue<string>();
+                WbRd? rd = null;
+                if (ried != null) {
+                    var rde = riede.GetValueOrDefault(kgnr, []);
+                    rd = rde.FirstOrDefault(r => r.Name == ried);
+                    if (rd == null) {
+                        rd = new WbRd {
+                            KgNr = kgnr,
+                            RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
+                            Name = ried,
+                        };
+                        rde.Add(rd);
+                        riede[rd.KgNr] = rde;
+                        wbRde.Add(rd);
+                    }
+                }
+                return 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 = rd?.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>(),
+                    WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts),
+                    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(),
+            wbRde,
+            createdAt == null || modifiedAt == null ? null :
+            (DateTime.ParseExact(createdAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None),
+             DateTime.ParseExact(modifiedAt, "yyyy-MM-ddTHH:mm:ssK", CultureInfo.InvariantCulture, DateTimeStyles.None)));
+        }
+    }
+}

Elwig/Helpers/Export/IBankingExporter.cs

@@ -1,4 +1,4 @@
-using Elwig.Helpers.Billing;
+using Elwig.Models.Dtos;
 
 namespace Elwig.Helpers.Export {
     /// <summary>

Elwig/Helpers/Export/Ods.cs

@@ -1,10 +1,12 @@
-using Elwig.Models.Dtos;
+using Elwig.Models.Dtos;
 using System;
 using System.Collections.Generic;
 using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
@@ -19,7 +21,7 @@ namespace Elwig.Helpers.Export {
             FileName = filename;
             File.Delete(filename);
             ZipArchive = ZipFile.Open(FileName, ZipArchiveMode.Create);
-            _tables = new();
+            _tables = [];
         }
 
         public void Dispose() {
@@ -93,24 +95,51 @@ namespace Elwig.Helpers.Export {
                 """);
 
             for (int i = 1; i <= 100; i++) {
-                await Content.WriteAsync($"  <style:style style:name=\"colw{i}\" style:family=\"table-column\"><style:table-column-properties style:column-width=\"{i}mm\"/></style:style>\r\n");
+                await Content.WriteAsync($"  <style:style style:name=\"col{i}mm\" style:family=\"table-column\"><style:table-column-properties style:column-width=\"{i}mm\"/></style:style>\r\n");
             }
 
             await Content.WriteAsync("""
                   <style:style style:name="header" style:family="table-cell" style:parent-style-name="default">
                    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
                    <style:paragraph-properties fo:text-align="center"/>
-                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"  fo:font-size="16pt"/>
+                   <style: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"/>
                    <style:paragraph-properties fo:text-align="center"/>
                    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
                   </style:style>
-                  <number:number-style style:name="nperc">
+                  <number:number-style style:name="NN0"><number:number number:decimal-places="0" number:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
-                   <number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1"/>
+                  <style:style style:name="N0" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN0"/>
-                  </number:number-style>
+                  <number:number-style style:name="NN1"><number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
-                  <style:style style:name="perc" style:family="table-cell" style:parent-style-name="default" style:data-style-name="nperc"/>
+                  <style:style style:name="N1" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN1"/>
+                  <number:number-style style:name="NN2"><number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
+                  <style:style style:name="N2" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN2"/>
+                  <number:number-style style:name="NN3"><number:number number:decimal-places="3" number:min-decimal-places="3" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
+                  <style:style style:name="N3" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN3"/>
+                  <number:number-style style:name="NN4"><number:number number:decimal-places="4" number:min-decimal-places="4" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
+                  <style:style style:name="N4" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN4"/>
+                  <number:number-style style:name="NN5"><number:number number:decimal-places="5" number:min-decimal-places="5" number:min-integer-digits="1" number:grouping="true"/></number:number-style>
+                  <style:style style:name="N5" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN5"/>
+                  <number:number-style style:name="NN6"><number:number number:decimal-places="6" number:min-decimal-places="6" number:min-integer-digits="1" number: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>
@@ -150,8 +179,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="VerticalSplitPosition" config:type="int">5</config:config-item>
-                               <config:config-item config:name="PositionBottom" config:type="int">4</config:config-item>
+                               <config:config-item config:name="PositionBottom" config:type="int">5</config:config-item>
                               </config:config-item-map-entry>
 
                         """);
@@ -169,7 +198,7 @@ namespace Elwig.Helpers.Export {
             }
         }
 
-        public async Task AddTable<T>(DataTable<T> table) {
+        public async Task AddTable<T>(DataTable<T> table, bool mergeSubRowCells = true) {
             if (Content == null) await AddHeader();
             if (Content == null) return;
             var totalSpan = table.ColumnSpans.Sum();
@@ -178,7 +207,7 @@ namespace Elwig.Helpers.Export {
             await Content.WriteAsync($"    <table:table table:name=\"{table.Name}\" table:default-cell-style-name=\"default\">\r\n");
             foreach (var (s, w) in table.ColumnSpans.Zip(table.ColumnWidths)) {
                 for (int i = 0; i < s; i++) {
-                    await Content.WriteAsync("     <table:table-column" + (w != null ? $" table:style-name=\"colw{w / s}\"" : "") + "/>\r\n");
+                    await Content.WriteAsync("     <table:table-column" + (w != null ? $" table:style-name=\"col{(int)(w / s)}mm\"" : "") + "/>\r\n");
                 }
             }
 
@@ -187,6 +216,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");
@@ -207,13 +239,13 @@ namespace Elwig.Helpers.Export {
             await Content.WriteAsync("     </table:table-row>\r\n");
 
             foreach (var row in table.GetData()) {
-                await FormatRow(row, table.ColumnUnits);
+                await FormatRow(row, table.ColumnUnits, mergeSubRowCells);
             }
 
             await Content.WriteAsync("    </table:table>\r\n");
         }
 
-        protected async Task FormatRow(IEnumerable<object?> row, IEnumerable<string?[]?> colUnits) {
+        protected async Task FormatRow(IEnumerable<object?> row, IEnumerable<string?[]?> colUnits, bool mergeSubRowCells) {
             if (Content == null) throw new InvalidOperationException();
             var arrays = row.Where(c => c is Array).Cast<Array>().Select(c => c.Length).ToArray();
             int rowNum = Math.Max(1, arrays.Length > 0 ? arrays.Max() : 0);
@@ -222,6 +254,8 @@ namespace Elwig.Helpers.Export {
                 foreach (var (data, units) in row.Zip(colUnits)) {
                     if (data is Array a) {
                         await Content.WriteAsync(i < a.Length ? FormatCell(a.GetValue(i), units: units) : $"      <table:table-cell table:number-columns-repeated=\"{GetSubCols(a.GetType().GetElementType())}\"/>\r\n");
+                    } else if (!mergeSubRowCells) {
+                        await Content.WriteAsync(FormatCell(data, units: units));
                     } else {
                         await Content.WriteAsync(FormatCell(data, rowSpan: i == 0 ? rowNum : 1, isCovered: i > 0, units: units));
                     }
@@ -238,8 +272,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?>())
+                return string.Join("", data.GetType().GetFields().Zip(units ?? [])
-                    .Select(p => FormatCell(p.First.GetValue(data), rowSpan, colSpan, style, isCovered, new[] { p.Second }))
+                    .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}\"" : "");
@@ -249,20 +283,41 @@ namespace Elwig.Helpers.Export {
             string c;
             if (data == null) {
                 c = $"<{ct}{add}/>";
-            } else if (data is float || data is double || data is byte || data is char ||
+            } 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()!
-                double v = double.Parse(data?.ToString() ?? "0");
+                if (units != null && units.Length > 0) {
-                if (isPercent) {
+                    int n = -1;
-                    data = $"{v:N1}";
+                    switch (units[0]) {
-                    add = string.Join(" ", add.Split(" ").Select(p => p.StartsWith("table:style-name=") ? "table:style-name=\"perc\"" : p));
+                        case "#": n = 0; data = $"{v:N0}"; break;
+                        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));
                 }
-                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString()?.Replace(",", ".")}\"{add}><text:p>{data}</text:p></{ct}>";
+                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
             } else {
-                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
+                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{SecurityElement.Escape(data.ToString())}</text:p></{ct}>";
             }
 
-            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-columns-repeated=\"{colSpan - 1}\"/>\r\n" : "");
         }
     }
 }