MemberAdminWindow: Add feature to export .vcf files

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,12 +1,12 @@
-<Application x:Class="Elwig.App"
+<Application
+        x:Class="Elwig.App"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Elwig"
+        xmlns:ctrl="clr-namespace:Elwig.Controls"
-             xmlns:controls="clr-namespace:Elwig.Controls"
+        Exit="Application_Exit">
-             StartupUri="Windows\MainWindow.xaml"
-             xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
-        <controls:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:WidthToMarginConverter x:Key="WidthToMarginConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
@@ -28,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">
@@ -62,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,39 +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.Billing;
+using Elwig.Helpers.Export;
+using Elwig.Helpers.Printing;
 using Elwig.Helpers.Weighing;
+using Elwig.Models.Entities;
+using Elwig.Windows;
+using System;
 using System.Collections.Generic;
-using System.Windows.Threading;
+using System.Data;
-using System.Globalization;
+using System.IO;
-using System.Threading;
+using System.Linq;
-using System.Windows.Markup;
+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; }
@@ -43,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 => Documents.Html.IsReady && Documents.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]));
             }
 
-        protected override void OnStartup(StartupEventArgs evt) {
+            ContextTimer.Tick += (object? sender, EventArgs evt) => {
-            var locale = new CultureInfo("de-AT");
+                var ch = CurrentLastWrite;
-            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
+                if (ch > LastChanged) {
-            locale.NumberFormat.NumberGroupSeparator = "\u202f";
+                    LastChanged = ch;
-            locale.NumberFormat.PercentGroupSeparator = "\u202f";
+                    OnContextChanged();
-            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 ?? "";
+        private static void OnContextChanged() {
+            MainDispatcher.BeginInvoke(HintContextChange);
+        }
+
+        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 {
@@ -90,30 +113,39 @@ namespace Elwig {
                     Shutdown();
                     return;
                 }
+                BranchNum = branches.Count;
             }
 
-            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("Temp File Cleanup", () => {
-            Utils.RunBackground("PDF Initialization", () => Documents.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;
@@ -123,44 +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;
-                    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;
-                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();
             }
 
+            if (Config.WeighingMode == null) {
+                if (Client.IsMatzen || Client.IsWolkersdorf) {
+                    Config.WeighingMode = WeighingMode.Net;
+                } else if (Client.IsHaugsdorf || Client.IsSitzendorf) {
+                    Config.WeighingMode = WeighingMode.Box;
+                } else if (Client.IsBaden || Client.IsGrInzersdorf) {
+                    Config.WeighingMode = WeighingMode.Gross;
+                }
+            }
+
             base.OnStartup(evt);
+
+            var window = new MainWindow();
+            window.Show();
         }
 
-        private void PrintingReadyChanged() {
+        private async void Application_Exit(object sender, ExitEventArgs evt) {
-            Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
+            foreach (var s in EventScales) {
+                s.Dispose();
+            }
+            await Pdf.Cleanup();
         }
 
-        protected void OnPrintingReadyChanged(EventArgs evt) {
+        public static void SetBranch(Branch b) {
-            foreach (Window w in Windows) {
+            SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
-                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) {
+        }
-                    b.IsEnabled = IsPrintingReady;
+
+        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/BoolToValueConverter.cs

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

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

@@ -0,0 +1,42 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:ctrl="clr-namespace:Elwig.Controls">
+    <Style TargetType="ctrl:UnitTextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ctrl:UnitTextBox">
+                    <Border x:Name="Border"
+                            BorderThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
+                            BorderBrush="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
+                        <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/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

@@ -0,0 +1,16 @@
+using System;
+using System.Windows;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Elwig.Controls {
+    public class WidthToMarginConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return new Thickness(0, 0, 2 + (double)value, 0);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            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

@@ -0,0 +1,182 @@
+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 Member Member;
+        public string? Location;
+        public bool IncludeSender = false;
+        public bool UseBillingAddress = false;
+        public bool ShowDateAndLocation = false;
+        public string Aside;
+
+        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
+            Member = m;
+            Location = App.BranchLocation;
+            IncludeSender = includeSender;
+            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
+            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
+                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
+                $"</tbody></table>";
+        }
+
+        public string Address {
+            get {
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
+                var plz = addr.PostalDest.AtPlz;
+                return 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\style-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.cshtml.cs

@@ -1,40 +0,0 @@
-using Elwig.Models;
-
-namespace Elwig.Documents {
-    public abstract class BusinessDocument : Document {
-
-        public bool ShowDateAndLocation = false;
-
-        public Member Member;
-        public bool IncludeSender = false;
-        public bool UseBillingAddress = false;
-        public string Aside;
-        public string? Location;
-
-        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
-            Member = m;
-            Location = App.BranchLocation;
-            IncludeSender = includeSender;
-            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
-            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
-                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
-                $"</tbody></table>";
-        }
-
-        public string Address {
-            get {
-                var b = Member.BillingAddress;
-                if (b != null && UseBillingAddress) {
-                    var plz = b.PostalDest.AtPlz;
-                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Ort.Name}\n{b.Country.Name}";
-                } else {
-                    var plz = Member.PostalDest.AtPlz;
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Ort.Name}\n{Member.PostalDest.Country.Name}";
-                }
-            }
-        }
-    }
-}

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

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class BusinessLetter : BusinessDocument {

Elwig/Documents/CreditNote.cs

@@ -0,0 +1,98 @@
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class CreditNote : BusinessDocument {
+
+        public new static string Name => "Traubengutschrift";
+
+        public PaymentMember? Payment;
+        public Credit? Credit;
+        public CreditNoteDeliveryData Data;
+        public string? Text;
+        public string CurrencySymbol;
+        public int Precision;
+        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(
+            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;
+            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>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
+                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"</tbody></table>";
+            Text = App.Client.TextCreditNote;
+            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
+            CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
+            Precision = season.Precision;
+
+            if (considerTotalPenalty) {
+                var total = data.Rows.SelectMany(r => r.Buckets).Sum(b => b.Value);
+                var totalUnderDelivery = total - p.Member.BusinessShares * season.MinKgPerBusinessShare;
+                MemberTotalUnderDelivery = totalUnderDelivery < 0 ? totalUnderDelivery * (season.PenaltyPerKg ?? 0) - (season.PenaltyAmount ?? 0) - (season.PenaltyPerBsAmount * Math.Floor(-(decimal)totalUnderDelivery / season.MinKgPerBusinessShare) ?? 0) : 0;
+                if (total == 0)
+                    MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0) + (season.PenaltyPerBsNone * p.Member.BusinessShares ?? 0);
+            }
+            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,85 +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\style-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: 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(e)</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) {
+                            <td rowspan="@rows">@p.LsNr</td>
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
+                            <td class="small">@p.Variety</td>
+                            <td class="small">
+                                @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation
+                                @((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI" ? " / " : "")@Raw(p.QualId == "WEI" ? "<i>abgew.</i>" : "")
+                            </td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }
-                string? last = null;
+                        @if (i > 0 && i <= p.Modifiers.Length) {
+                            <td colspan="4" class="small mod">@p.Modifiers[i - 1]</td>
+                        } else if (i > 0) {
+                            <td colspan="4"></td>
+                        }
+                        @if (i < p.Buckets.Length) {
+                            var bucket = p.Buckets[i];
+                            <td class="small">@bucket.Name:</td>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
+                            <td class="number">@($"{bucket.Price:N4}")</td>
+                        } else {
+                            <td></td>
+                        }
+                        @if (i == p.Buckets.Length - 1) {
+                            var rebelMod = p.WeighingModifier * 100;
+                            var totalMod = p.TotalModifiers ?? 0;
+                            <td class="tiny center">@(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"))</td>
+                            <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
+                            <td class="number">@($"{p.Amount:N2}")</td>
+                        } else {
+                            <td colspan="2"></td>
                         }
-            @foreach (var part in Model.Parts) {
-                var pmt = part.Payment;
-                var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
-                var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
-                </tr>
-                @for (int i = 1; i < bucketNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
                     </tr>
                 }
-                last = part.SortId;
             }
         </tbody>
     </table>
+    <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.cshtml.cs

@@ -1,40 +0,0 @@
-using Elwig.Helpers;
-using Elwig.Models;
-using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Elwig.Documents {
-    public class CreditNote : BusinessDocument {
-
-        public Credit Credit;
-        public string? Text;
-        public string CurrencySymbol;
-        public string[] BucketNames;
-        public int Precision;
-        public IEnumerable<DeliveryPart> Parts;
-
-        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
-            UseBillingAddress = true;
-            ShowDateAndLocation = true;
-            Credit = c;
-            Aside = Aside.Replace("</table>", "") +
-                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{c.TgId}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{c.Payment.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{c.ModifiedTimestamp:dd.MM.yyyy} / {c.ModifiedTimestamp:HH:mm}</td></tr>" +
-                $"</tbody></table>";
-            Text = App.Client.TextDeliveryNote;
-            DocumentId = $"Tr.-Gutschr. {c.TgId}";
-            CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
-            BucketNames = c.Payment.Variant.BucketNames;
-            Precision = c.Payment.Variant.Season.Precision;
-            Parts = ctx.DeliveryParts.FromSql($"""
-                SELECT p.*
-                FROM v_delivery v
-                JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
-                WHERE (v.year, v.mgnr) = ({c.Year}, {c.Member.MgNr})
-                ORDER BY sortid, LENGTH(attributes) DESC, attributes, kmw DESC, date, time, dpnr
-                """).ToList();
-        }
-    }}

Elwig/Documents/CreditNote.css

@@ -0,0 +1,48 @@
+
+table.credit {
+    margin-bottom: 0;
+}
+
+table.credit .mod {
+    padding-left: 5mm;
+}
+
+table.credit tbody tr:not(.first) {
+    break-before: avoid;
+}
+
+table.credit tbody tr:not(.last) {
+    break-after: avoid;
+}
+
+table.credit tr:not(.first) td {
+    padding-top: 0;
+}
+
+table.credit tr.last td {
+    padding-bottom: 0;
+}
+
+table.credit-sum {
+    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

@@ -0,0 +1,29 @@
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+using System;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryConfirmation : BusinessDocument {
+
+        public new static string Name => "Anlieferungsbestätigung";
+
+        public Season Season;
+        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;
+            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

@@ -0,0 +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.DocumentsPath)\DeliveryConfirmation.css" />
+<main>
+    <h1>@Model.Title</h1>
+    <table class="delivery-confirmation">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width:  6mm;"/>
+            <col style="width: 23mm;"/>
+            <col style="width: 16mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 14mm;"/>
+            <col style="width:  3mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">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>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 class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit" colspan="2">[kg]</th>
+                <th class="unit">[kg]</th>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                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.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
+                        @if (first) {
+                            <td rowspan="@rows">@p.LsNr</td>
+                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
+                            <td class="small">@p.Variety</td>
+                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
+                            <td class="small">@p.QualityLevel</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
+                        }
+                        @if (i > 0 && i <= p.Modifiers.Length) {
+                            <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="small">@bucket.Name:</td>
+                            <td class="number">@($"{bucket.Value:N0}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                        @if (i == p.Buckets.Length - 1) {
+                            <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="number"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastVariety = p.Variety;
+                }
+            }
+            <tr class="sum bold">
+                <td colspan="8">Gesamt:</td>
+                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
+                <td></td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table>
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
+    <div style="margin-top: 2em;">
+        @if (Model.Text != null) {
+            <p class="custom comment">@Model.Text</p>
+        }
+    </div>
+</main>

Elwig/Documents/DeliveryConfirmation.css

@@ -0,0 +1,32 @@
+
+table.delivery-confirmation .mod {
+    padding-left: 5mm;
+}
+
+table.delivery-confirmation tr:not(.first) {
+    break-before: avoid;
+}
+
+table.delivery-confirmation tr:not(.first) td {
+    padding-top: 0;
+}
+
+table.delivery-confirmation tr.last td {
+    padding-bottom: 0;
+}
+
+table.delivery-confirmation tr.sum {
+    font-size: 12pt;
+}
+
+table.delivery-confirmation tr.sum td {
+    padding-top: 1mm;
+}
+
+table.sortenaufteilung {
+    break-after: avoid;
+}
+
+table.buckets {
+    break-before: avoid;
+}

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

@@ -0,0 +1,22 @@
+using Elwig.Models.Dtos;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryJournal : Document {
+
+        public new static string Name => "Lieferjournal";
+
+        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, DeliveryJournalData data) :
+            this(filter, data.Rows) {
+        }
+    }
+}

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\style-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: 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.cshtml.cs

@@ -1,25 +0,0 @@
-using Elwig.Helpers;
-using Elwig.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Elwig.Documents {
-    public class DeliveryJournal : Document {
-
-        public string Filter;
-        public IEnumerable<DeliveryPart> Deliveries;
-
-        public DeliveryJournal(string filter, IEnumerable<DeliveryPart> deliveries) : base($"Lieferjournal {filter}") {
-            Filter = filter;
-            Deliveries = deliveries;
-        }
-
-        public DeliveryJournal(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.LsNr)
-                .ThenBy(p => p.DPNr)
-                .ToList()) { }
-    }
-}

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

@@ -0,0 +1,35 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+
+namespace Elwig.Documents {
+    public class DeliveryNote : BusinessDocument {
+
+        public new static string Name => "Traubenübernahmeschein";
+
+        public Delivery Delivery;
+        public string? Text;
+        public Dictionary<string, MemberBucket> MemberBuckets;
+
+        // 0 - none
+        // 1 - GA only
+        // 2 - GA only and area commitments of varieties from delivery note
+        // 3 - full
+        public int DisplayStats = App.Client.ModeDeliveryNoteStats;
+
+        public DeliveryNote(Delivery d, AppDbContext? ctx = 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>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
+                $"</tbody></table>";
+            Text = App.Client.TextDeliveryNote;
+            DocumentId = d.LsNr;
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
+        }
+    }
+}

Elwig/Documents/DeliveryNote.cshtml

@@ -2,54 +2,16 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
-@{
+<table class="delivery large">
-    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-}
-<script>
-    document.addEventListener("DOMContentLoaded", () => {
-        const hidden = document.getElementsByClassName("hidden")[0];
-        const table = document.getElementsByClassName("delivery")[0];
-        const stats = document.getElementById("delivery-stats");
-        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
-        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
-
-        if (mm >= heightA4 - heightFooter) {
-            if (heightTable + 10 >= heightMain) {
-                // force page break in table
-                const tblOff = px2mm(0, table.offsetTop);
-                let last = null;
-                for (const tr of table.getElementsByTagName("tr")) {
-                    if (!tr.classList.contains("main")) continue;
-                    const mm2 = tblOff + px2mm(0, tr.offsetTop);
-                    if (mm2 >= heightA4 - heightFooter) {
-                        last.classList.add("page-break");
-                        break;
-                    }
-                    last = tr;
-                }
-            } else {
-                // force page break
-                const hr = document.createElement("hr");
-                hr.classList.add("page-break");
-                table.before(hr);
-
-                const p = document.createElement("p");
-                p.innerText = "Siehe nächste Seite."
-                hr.before(p);
-            }
-        }
-    });
-</script>
-<table class="delivery">
     <colgroup>
         <col style="width: 10.00mm;"/>
-        <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;"/>
@@ -57,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(e)</th>
+            <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
-            <th>Gewicht</th>
+            <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">@string.Join(" / ", part.Attributes)</td>
+                <td colspan="2">@part.Attribute?.Name</td>
                 <td>@part.Quality.Name</td>
-                <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
+                <td class="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;
@@ -90,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>
@@ -101,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>
@@ -113,61 +93,17 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
+@if (Model.DisplayStats > 0) {
-    <div id="delivery-stats">
+    @Raw(Model.PrintBucketTable(
-        <table class="delivery-stats">
+        Model.Delivery.Season, Model.MemberBuckets, isTiny: true,
-            <colgroup>
+        filter: Model.DisplayStats > 2 ? null :
-                <col style="width: 45mm;"/>
+                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;"/>
-                <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 zu liefern</th>
-                    <th>Überliefert</th>
-                    <th>Geliefert</th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    string FormatRow(int obligation, int right, int sum) {
-                        return $"<td>{obligation:N0}</td>" +
-                            $"<td>{right:N0}</td>" +
-                            $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                            $"<td>{sum:N0}</td>";
-                    }
-                    var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                    var buckets = Model.MemberBuckets.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
-                }
-                <tr>
-                    <th>Gesamtlieferung</th>
-                    @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
-                </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
-                    }
-                }
-            </tbody>
-        </table>
-    </div>
 }
 </main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "hidden" : "bottom")">
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

Elwig/Documents/DeliveryNote.cshtml.cs

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

Elwig/Documents/DeliveryNote.css

@@ -0,0 +1,46 @@
+
+main h1 {
+    margin-bottom: 1.5em !important;
+}
+
+table.delivery {
+    margin-bottom: 5mm;
+}
+
+table.delivery tr:not(.main) {
+    break-before: avoid;
+}
+
+table.delivery th.main {
+    text-align: left;
+}
+
+table.delivery tr.main td {
+    font-weight: bold;
+    padding-top: 2mm;
+}
+
+table.delivery tbody tr:not(.main) td {
+    font-size: 8pt;
+}
+
+table.delivery tr.tight:not(.first) td {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
+table.delivery tr.tight.first td {
+    padding-bottom: 0;
+}
+
+table.delivery tr.tight:has(+ tr:not(.tight)) td {
+    padding-bottom: 0.5mm !important;
+}
+
+table.delivery tr.sum td {
+    padding-top: 1mm;
+}
+
+table.delivery-note-stats {
+    break-after: avoid;
+}

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

@@ -0,0 +1,187 @@
+using System;
+using System.Threading.Tasks;
+using System.IO;
+using Elwig.Helpers;
+using System.Collections.Generic;
+using System.Linq;
+using Elwig.Helpers.Printing;
+using MimeKit;
+
+namespace Elwig.Documents {
+    public abstract partial class Document : IDisposable {
+
+        public static string Name => "Dokument";
+
+        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 DoublePaged = false;
+
+        public string DocumentsPath;
+        public int CurrentNextSeason;
+        public string? DocumentId;
+        public string Title;
+        public string Author;
+        public string Header;
+        public string Footer;
+        public DateOnly Date;
+
+        public Document(string title) {
+            var c = App.Client;
+            DocumentsPath = App.DocumentsPath;
+            CurrentNextSeason = Utils.CurrentNextSeason;
+            Title = title;
+            Author = c.NameFull;
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
+            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
+                .Item(c.NameFull).NextLine()
+                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
+                .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
+                    .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 = DateOnly.FromDateTime(Utils.Today);
+        }
+
+        ~Document() {
+            Dispose();
+        }
+
+        public void Dispose() {
+            _pdfFile?.Dispose();
+            _pdfFile = null;
+            GC.SuppressFinalize(this);
+        }
+
+        public static Document Merge(IEnumerable<Document> docs) {
+            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) {
+                name = "BusinessLetter";
+            } else if (this is DeliveryNote) {
+                name = "DeliveryNote";
+            } else if (this is CreditNote) {
+                name = "CreditNote";
+            } else if (this is DeliveryJournal) {
+                name = "DeliveryJournal";
+            } else if (this is 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");
+            }
+            return await Render(name);
+        }
+
+        private async Task<string> Render(string name) {
+            return await Html.CompileRenderAsync(name, this); ;
+        }
+
+        public async Task Generate(IProgress<double>? progress = null) {
+            if (_pdfFile != null)
+                return;
+            progress?.Report(0.0);
+            if (this is PdfDocument) {
+                // nothing to do
+            } else if (this is MergedDocument m) {
+                var pdf = new TempFile("pdf");
+                var tmpHtmls = new List<TempFile>();
+                var tmpFiles = new List<string>();
+                var n = m.Documents.Count();
+                int i = 0;
+                foreach (var doc in m.Documents) {
+                    if (doc is PdfDocument) {
+                        tmpFiles.Add(doc.PdfPath!);
+                        continue;
+                    }
+                    var tmpHtml = new TempFile("html");
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
+                    tmpHtmls.Add(tmpHtml);
+                    tmpFiles.Add((doc is Letterhead ? "#" : "") + tmpHtml.FileName);
+                    i++;
+                    progress?.Report(GenerationProportion * 100 * i / n);
+                }
+                progress?.Report(GenerationProportion * 100);
+                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();
+                }
+                _pdfFile = pdf;
+            } else {
+                var pdf = new TempFile("pdf");
+                using (var tmpHtml = new TempFile("html")) {
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
+                    progress?.Report(50.0);
+                    var pages = await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, DoublePaged);
+                    TotalPages = pages.Pages;
+                }
+                _pdfFile = pdf;
+            }
+            progress?.Report(100.0);
+        }
+
+        public void SaveTo(string pdfPath) {
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            File.Copy(PdfPath, pdfPath, true);
+        }
+
+        public async Task Print(int copies = 1) {
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            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.FullName}" : ""));
+        }
+
+        public MimePart AsEmailAttachment(string filename) {
+            if (PdfPath == null) throw new InvalidOperationException("Pdf file has not been generated yet");
+            return new("application", "pdf") {
+                Content = new MimeContent(File.OpenRead(PdfPath)),
+                ContentDisposition = new ContentDisposition(ContentDisposition.Attachment),
+                ContentTransferEncoding = ContentEncoding.Base64,
+                FileName = filename
+            };
+        }
+
+        private class MergedDocument(IEnumerable<Document> docs) : Document("Mehrere Dokumente") {
+            public IEnumerable<Document> Documents = docs;
+        }
+
+        private class PdfDocument : Document {
+            public PdfDocument(string pdfPath) :
+                base(Path.GetFileNameWithoutExtension(pdfPath)) {
+                _pdfPath = pdfPath;
+            }
+        }
+    }
+}

Elwig/Documents/Document.cshtml

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

Elwig/Documents/Document.cshtml.cs

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

Elwig/Documents/Document.css

@@ -2,6 +2,7 @@
 :root {
     font-family: "Times New Roman", serif;
     line-height: 1;
+    --border-thickness: 0.5pt;
 }
 
 * {
@@ -40,18 +41,29 @@ header {
 
 header .name {
     font-size: 18pt;
-    margin-top: 10mm;
+    margin-top: 8mm;
     font-weight: bold;
 }
 
 header .suffix {
-    font-size: 12pt;
+    font-size: 14pt;
     font-weight: bold;
 }
 
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
+}
+
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;
+    /* for some reason the position without the following statement changes on the second page */
+    border: var(--border-thickness) solid #00000000;
+}
+
+.footer-wrapper.left {
+    position: running(page-footer-left);
 }
 
 .pre-footer {
@@ -64,16 +76,16 @@ header .suffix {
     width: 33%;
 }
 
-.pre-footer .date {
+.pre-footer > *:first-child {
     text-align: left;
 }
 
-.pre-footer .doc-id {
+.pre-footer > *:nth-child(2) {
     text-align: center;
     font-style: italic;
 }
 
-.pre-footer .page {
+.pre-footer > *:last-child {
     text-align: right;
     float: right;
 }
@@ -84,7 +96,7 @@ header .suffix {
 
 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;
@@ -96,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

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

Elwig/Documents/Letterhead.cshtml

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

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

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

Elwig/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/Documents/style-creditnote.css

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

Elwig/Documents/style-deliveryjournal.css

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

Elwig/Documents/style-deliverynote.css

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

Elwig/Elwig.csproj

@@ -2,39 +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>elwig.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.3.3</Version>
+    <Version>1.0.1.5</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
+    <Resource Include="Resources\Images\Elwig.png" />
+    <Content Include="Resources\Images\Elwig.ico" />
+    <EmbeddedResource Include="Resources\Schemas\PaymentVariantData.json" />
+    <EmbeddedResource Include="Resources\Sql\*" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="LinqKit" Version="1.3.8" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="MailKit" Version="4.13.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.22" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
+    <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.67" />
+    <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>
 
-  <ItemGroup>
-    <Resource Include="elwig.png" />
-  </ItemGroup>
-
-  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call fetch-resources.bat" />
-  </Target>
-
 </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

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Linq;
 using System.Threading.Tasks;
 using System.IO;
@@ -9,8 +9,18 @@ using Microsoft.Extensions.Logging;
 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; }
@@ -26,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; }
@@ -35,23 +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<DeliveryPartAttr> DeliveryPartAttributes { get; private set; }
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
+        public DbSet<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, AreaComBucket>>> _memberAreaCommitmentBuckets = [];
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = [];
+        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) {
@@ -68,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();
@@ -119,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;
         }
@@ -155,76 +227,275 @@ 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 UpdateDeliveryPartAttributes(DeliveryPart part, IEnumerable<WineAttr> attributes) {
+        public async Task<int> NextAvNr(int year) {
-            foreach (var a in WineAttributes) {
+            int c = 0;
-                var attr = part.PartAttributes.Where(pa => pa.AttrId == a.AttrId).FirstOrDefault();
+            (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync())
-                if (attributes.Contains(a)) {
+                .ForEach(a => { if (a <= c + 100) c = a; });
-                    DeliveryPartAttr dpa = attr ?? this.CreateProxy<DeliveryPartAttr>();
+            return c + 1;
-                    dpa.Year = part.Year;
-                    dpa.DId = part.DId;
-                    dpa.DPNr = part.DPNr;
-                    dpa.AttrId = a.AttrId;
-                    if (attr == null) {
-                        await AddAsync(dpa);
-                    } else {
-                        Update(dpa);
-                    }
-                } else {
-                    if (attr != null) {
-                        Remove(attr);
-                    }
-                }
-            }
         }
 
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        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);
                     }
                 }
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
+        public void UpdateDeliveryScheduleWineVarieties(DeliverySchedule schedule, IEnumerable<(WineVar, int)> oldVarieties, IEnumerable<(WineVar, int)> newVarieties) {
-            using var cnx = await ConnectAsync();
+            foreach (var v in WineVarieties) {
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
+                var e = new DeliveryScheduleWineVar {
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
+                    Year = schedule.Year,
-
+                    DsNr = schedule.DsNr,
-            var list = new List<(string, string, int, int, int)>();
+                    SortId = v.SortId,
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
+                    Priority = 1,
-                var s = await WineVarieties.FindAsync(id[..2]);
+                };
-                var attrIds = id[2..];
+                var o = oldVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
-                var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var n = newVarieties.Where(x => x.Item1.SortId == e.SortId).Select(x => x.Item2).FirstOrDefault(-1);
-                var name = (s?.Name ?? "") + (a.Count > 0 ? $" ({string.Join(" / ", a.Select(a => a.Name))})" : "");
+                if (n != -1) {
-                list.Add((
+                    e.Priority = n;
-                    id, name,
+                    if (o == -1) {
-                    rights.TryGetValue(id, out var v1) ? v1 : 0,
+                        Add(e);
-                    obligations.TryGetValue(id, out var v2) ? v2 : 0,
+                    } else {
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
+                        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, AreaComBucket>>();
+            using (var cmd = cnx.CreateCommand()) {
+                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] = [];
+                    buckets[mgnr][vtrgid] = new(reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberAreaCommitmentBuckets[year] = buckets;
+        }
+
+        private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _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();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_payment_bucket WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberPaymentBuckets[year] = buckets;
+        }
+
+        private async Task FetchMemberUnderDelivery(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            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, []);
+        }
+
+        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, []);
+        }
+
+        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 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, MemberBucket>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
+                var variety = await WineVarieties.FindAsync(id[..2]);
+                var attribute = await WineAttributes.FindAsync(id[2..]);
+                var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
+                buckets[id] = new(
+                    name,
+                    rightsAndObligations.GetValueOrDefault(id).Area,
+                    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,85 +1,90 @@
 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 = 2;
+        // 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
-        };
 
-        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, "BEGIN EXCLUSIVE");
+            (int From, int To, string Name)[] scripts = asm.GetManifestResourceNames()
-            for (int i = fromVersion; i < toVersion; i++) {
+                .Where(n => n.StartsWith("Elwig.Resources.Sql."))
-                _updaters[i - 1](cnx);
+                .Select(n => {
+                    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, "COMMIT");
+            if (toExecute.Count == 0)
-            ExecuteNonQuery(cnx, "VACUUM");
+                return;
-            ExecuteNonQuery(cnx, $"PRAGMA schema_version = {toVersion * 100 + _versionOffset}");
+
+            await AppDbContext.ExecuteBatch(cnx, """
+                PRAGMA locking_mode = EXCLUSIVE;
+                BEGIN EXCLUSIVE;
+                """);
+            foreach (var script in toExecute) {
+                await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script);
+            }
+            var violations = await AppDbContext.ForeignKeyCheck(cnx);
+            if (violations.Length > 0) {
+                throw new Exception($"Foreign key violations ({violations.Length}):\n" + string.Join("\n", violations
+                    .Select(v => $"{v.Table} - {v.RowId} - {v.Parent} - {v.FkId}")));
             }
 
-        private static void UpdateDbSchema_1_To_2(SqliteConnection cnx) {
+            await AppDbContext.ExecuteBatch(cnx, $"""
-            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment");
+                COMMIT;
-            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part DROP COLUMN weighing_reason");
+                VACUUM;
-            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL))");
+                PRAGMA schema_version = {toVersion * 100 + VersionOffset};
-        }
+                """);
-
+        }
-        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) { }
     }
 }

Elwig/Helpers/Billing/Billing.cs

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

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

@@ -0,0 +1,228 @@
+using Elwig.Models.Entities;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingVariant : Billing {
+
+        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));
+        }
+
+        public async Task Calculate(bool strictPrices = true, bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using var tx = await cnx.BeginTransactionAsync();
+            await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
+            await DeleteInDb(cnx);
+            await SetCalcTime(cnx);
+            KeyNotFoundException? exception = null;
+            try {
+                await CalculatePrices(cnx, strictPrices);
+            } catch (KeyNotFoundException e) {
+                if (strictPrices) throw;
+                exception = e;
+            }
+            if (Data.ConsiderDelieryModifiers) {
+                await CalculateDeliveryModifiers(cnx);
+            }
+            if (Data.ConsiderCustomModifiers) {
+                await CalculateMemberModifiers(cnx);
+            }
+            await tx.CommitAsync();
+            if (exception != null)
+                throw exception;
+        }
+
+        public async Task Commit() {
+            await Revert();
+            using var cnx = await AppDbContext.ConnectAsync();
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO credit (year, tgnr, mgnr, avnr, net_amount, prev_net_amount, vat, modifiers, prev_modifiers)
+                    SELECT s.year,
+                           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});
+                """);
+        }
+
+        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) {
+            DataX[index] = oechsle;
+        }
+
+        public void SetPriceAt(int index, double price) {
+            DataY[index] = price;
+        }
+
+        public double GetPriceAt(int index) {
+            return DataY[index];
+        }
+
+        public double GetPriceAtOe(double oe) {
+            return DataY[Array.IndexOf(DataX, oe)];
+        }
+
+        private void FlattenGraph(int begin, int end, double value) {
+            for (int i = begin; i <= end; i++) {
+                DataY[i] = value;
+            }
+        }
+
+        public void FlattenGraphLeft(int pointIndex) {
+            FlattenGraph(0, pointIndex, DataY[pointIndex]);
+        }
+
+        public void FlattenGraphRight(int pointIndex) {
+            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);
+            }
+        }
+
+        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;
             }
+            var (lowIndex, highIndex) = firstPoint < secondPoint ? (firstPoint, secondPoint) : (secondPoint, firstPoint);
+            double step = (DataY[highIndex] - DataY[lowIndex]) / steps;
 
-            var minKey = GraphPoints.Keys.Order().First();
+            for (int i = lowIndex; i < highIndex - 1; i++) {
-            var maxKey = GraphPoints.Keys.OrderDescending().First();
+                DataY[i + 1] = Math.Round(DataY[i] + step, Precision);
-
-            if (!GraphPoints.ContainsKey(MinX)) {
-                GraphPoints.Add(MinX, GraphPoints.GetValueOrDefault(minKey));
             }
-            if (!GraphPoints.ContainsKey(MaxX)) {
-                GraphPoints.Add(MaxX, GraphPoints.GetValueOrDefault(maxKey));
-            }
-
-            var keys = GraphPoints.Keys.Order().ToArray();
-
-            for (int i = 0; i < keys.Length; i++) {
-                double point1Value = GraphPoints[keys[i]];
-                if (i + 1 < keys.Length) {
-                    double point2Value = GraphPoints[keys[i + 1]];
-                    if (point1Value == point2Value) {
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX; j++) {
-                            DataY[j] = point1Value;
-                        }
-                    } else {
-                        int steps = Math.Abs(keys[i + 1] - keys[i]);
-                        double step = (point2Value - point1Value) / steps;
-
-                        DataY[keys[i] - MinX] = point1Value;
-                        DataY[keys[i + 1] - MinX] = point2Value;
-
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX - 1; j++) {
-                            DataY[j + 1] = Math.Round(DataY[j] + step, 4); // TODO richtig runden
-                        }
-                    }
-                }
-                else {
-                    for (int j = keys[i] - MinX; j < DataX.Length; j++) {
-                        DataY[j] = point1Value;
-                    }
-                }
-            }
-        }
-
-        public JsonObject ToJson() {
-            JsonObject graph = new();
-
-            if (DataY[0] != DataY[1]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
-            }
-            for (int i = 1; i < DataX.Length - 1; i++) {
-                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
-                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
-                }
-            }
-            if (DataY[^1] != DataY[^2]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
-            }
-            return graph;
         }
 
         public object Clone() {
-            return new Graph(Type, Num, MinX, MaxX, Contracts, (double[])DataX.Clone(), (double[])DataY.Clone());
+            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;
-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}";
-    }
-}