ChartWindow: Round PriceInput text

.gitignore

@@ -3,3 +3,4 @@ bin/
 *.user
 .vs
 .idea
+Tests/Resources/Create.sql

Elwig/App.xaml

@@ -2,11 +2,12 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Elwig"
-             xmlns:controls="clr-namespace:Elwig.Controls"
+             xmlns:ctrl="clr-namespace:Elwig.Controls"
              StartupUri="Windows\MainWindow.xaml"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
-        <controls:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>
+        <ctrl:WidthToPaddingConverter x:Key="WidthToPaddingConverter"/>
 
         <DataTemplate x:Key="PostalDestTemplate">
             <StackPanel Orientation="Horizontal">
@@ -83,6 +84,12 @@
             </DataTemplate.Triggers>
         </DataTemplate>
 
+        <DataTemplate x:Key="WineOriginTemplate">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="{Binding HkIdLevel}" MinWidth="70" Margin="0,0,10,0"/>
+                <TextBlock Text="{Binding Name}"/>
+            </StackPanel>
+        </DataTemplate>
         <ControlTemplate x:Key="WineOriginTemplateSimple">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="{Binding Name}"/>
@@ -94,7 +101,7 @@
                 <TextBlock Text="{Binding Name}"/>
             </StackPanel>
         </ControlTemplate>
-        <DataTemplate x:Key="WineOriginTemplate">
+        <DataTemplate x:Key="WineOriginComboTemplate">
             <Control x:Name="Control" Focusable="False" Template="{StaticResource WineOriginTemplateExtended}"/>
             <DataTemplate.Triggers>
                 <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ComboBoxItem}}, Path=IsSelected}" Value="{x:Null}">
@@ -102,5 +109,31 @@
                 </DataTrigger>
             </DataTemplate.Triggers>
         </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

@@ -11,19 +11,43 @@ using System.Windows.Threading;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Markup;
+using System.Reflection;
+using Elwig.Helpers.Printing;
+using Elwig.Windows;
+using Elwig.Dialogs;
+using System.Threading.Tasks;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
 
 namespace Elwig {
     public partial class App : Application {
 
+        protected static App CurrentApp;
+        public static int NumWindows => CurrentApp.Windows.Count;
+
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
         public static readonly Config Config = new(DataPath + "config.ini");
 
+        public static int VersionMajor { get; private set; }
+        public static int VersionMinor { get; private set; }
+        public static int VersionPatch { get; private set; }
+        public static string Version {
+            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
+            private set {
+                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
+                VersionMajor = p.ElementAtOrDefault(0);
+                VersionMinor = p.ElementAtOrDefault(1);
+                VersionPatch = p.ElementAtOrDefault(2);
+            }
+        }
+
+        public static 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; }
-        public static string? BranchOrt { get; private set; }
+        public static string? BranchLocation { get; private set; }
         public static string? BranchAddress { get; private set; }
         public static string? BranchPhoneNr { get; private set; }
         public static string? BranchFaxNr { get; private set; }
@@ -31,61 +55,68 @@ namespace Elwig {
         public static IList<IScale> Scales { get; private set; }
         public static ClientParameters Client { get; private set; }
 
-        public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
+        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
 
         public App() : base() {
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-            Directory.CreateDirectory(App.TempPath);
+            Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
+            CurrentApp = this;
+            OverrideCulture();
         }
 
-        protected override void OnStartup(StartupEventArgs evt) {
+        private static void OverrideCulture() {
-            var locale = new CultureInfo("de-AT");
+            var locale = new CultureInfo("de-AT", false);
-            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
+            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.NumberGroupSeparator = "\u202f";
+            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
-            locale.NumberFormat.PercentGroupSeparator = "\u202f";
+            locale.NumberFormat.PercentGroupSeparator = Utils.GroupSeparator;
+            CultureInfo.CurrentCulture = locale;
+            CultureInfo.CurrentUICulture = locale;
             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))
+                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.Name))
             );
+        }
+
+        protected override async void OnStartup(StartupEventArgs evt) {
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
+
+            try {
+                await AppDbUpdater.CheckDb();
+            } catch (Exception e) {
+                MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                Shutdown();
+                return;
+            }
 
             Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
             using (var ctx = new AppDbContext()) {
+                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 {
-                    if (!ctx.Database.CanConnect()) {
+                    Client = new(ctx);
-                        MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
-                        Shutdown();
-                        return;
-                    } else {
-                        branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Dest, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
-                        try {
-                            Client = new(ctx);
-                        } catch (Exception e) {
-                            MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                            Shutdown();
-                            return;
-                        }
-                    }
                 } catch (Exception e) {
-                    MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show($"Fehler beim Laden der Mandantendaten:\n\n{e.Message}", "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                     return;
                 }
+                BranchNum = branches.Count;
             }
-            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
+
-            Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
+                var id = s[0];
                 try {
-                    var id = s[0];
                     var type = s[1]?.ToLower();
                     var model = s[2];
                     var cnx = s[3];
@@ -99,6 +130,7 @@ namespace Elwig {
                         throw new ArgumentException($"Invalid scale type: \"{type}\"");
                     }
                 } catch (Exception e) {
+                    list.Add(new InvalidScale(id));
                     MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
@@ -113,7 +145,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchOrt = entry.Item4;
+                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -124,7 +156,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchOrt = entry.Item4;
+                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;
@@ -137,21 +169,95 @@ namespace Elwig {
             base.OnStartup(evt);
         }
 
-        protected override void OnExit(ExitEventArgs evt) {
-            Utils.RunBackground("PDF Close", () => Documents.Pdf.Close());
-            base.OnExit(evt);
-        }
-
         private void PrintingReadyChanged() {
             Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
         }
 
         protected void OnPrintingReadyChanged(EventArgs evt) {
             foreach (Window w in Windows) {
-                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => "Print".Equals(b.Tag))) {
+                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
                     b.IsEnabled = IsPrintingReady;
                 }
+                foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
+                    i.IsEnabled = IsPrintingReady;
+                }
             }
         }
+
+        public static async Task HintContextChange() {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is not ContextWindow c) continue;
+                await c.HintContextChange();
+            }
+        }
+
+        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.IsReceipt);
+        }
+
+        public static DeliveryAdminWindow FocusMemberDeliveries(int mgnr) {
+            return FocusWindow<DeliveryAdminWindow>(() => new(mgnr), w => w.MgNr == mgnr);
+        }
+
+        public static AreaComAdminWindow FocusMemberAreaComs(int mgnr) {
+            return FocusWindow<AreaComAdminWindow>(() => new(mgnr), w => w.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.SelectListBoxItem(w.SeasonList, s => (s as Season)?.Year, year);
+            return w;
+        }
+
+        public static SeasonFinishWindow FocusSeasonFinish() {
+            return FocusWindow<SeasonFinishWindow>(() => new());
+        }
+
+        public static DeliveryConfirmationsWindow FocusDeliveryConfirmations(int year) {
+            return FocusWindow<DeliveryConfirmationsWindow>(() => new(year), w => w.Year == year);
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchy() {
+            return FocusWindow<OriginHierarchyWindow>(() => new());
+        }
+
+        public static OriginHierarchyWindow FocusOriginHierarchyKg(int kgnr) {
+            var w = FocusOriginHierarchy();
+            w.FocusKgNr(kgnr);
+            return w;
+        }
+
+        public static PaymentVariantsWindow FocusPaymentVariantsWindow(int year) {
+            return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
+        }
+
+        public static ChartWindow FocusChartWindow(int year, int avnr) {
+            return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
+        }
     }
 }

Elwig/Controls/BoolToValueConverter.cs

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

Elwig/Controls/UnitTextBox.xaml

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

Elwig/Controls/UnitTextBox.xaml.cs

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

Elwig/Controls/WidthToPaddingConverter.cs

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

Elwig/Dialogs/AbwertenDialog.xaml.cs

@@ -12,7 +12,7 @@ namespace Elwig.Dialogs {
             InitializeComponent();
             TextLsNr.Text = lsnr;
             TextMember.Text = name;
-            TextWeight.Text = $"{weight:N0}\u202fkg";
+            TextWeight.Text = $"{weight:N0}{Utils.UnitSeparator}kg";
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

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

@@ -9,24 +9,21 @@ namespace Elwig.Dialogs {
         public int Weight = 0;
         public string? Reason = null;
 
-        public ManualWeighingDialog() {
+        public ManualWeighingDialog(string? reason = null) {
             InitializeComponent();
+            ReasonInput.Text = reason;
         }
 
         private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
             DialogResult = true;
             Weight = int.Parse(WeightInput.Text);
-            Reason = Regex.Replace(ReasonInput.Text, @"\s+", "").Trim();
+            Reason = Regex.Replace(ReasonInput.Text, @"\s+", " ").Trim();
-            if (Reason == "") {
+            if (Reason == "") Reason = null;
-                Reason = null;
-            } else if (!Reason.EndsWith(".") || !Reason.EndsWith("!") || !Reason.EndsWith("?")) {
-                Reason += ".";
-            }
             Close();
         }
 
         private void UpdateButtons() {
-            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0 && ReasonInput.Text.Trim().Length > 0;
+            ConfirmButton.IsEnabled = WeightInput.Text.Length > 0;
         }
 
         private void WeightInput_TextChanged(object sender, TextChangedEventArgs evt) {

Elwig/Documents/BusinessDocument.cs

@@ -0,0 +1,183 @@
+using Elwig.Helpers;
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public abstract class BusinessDocument : Document {
+
+        public bool ShowDateAndLocation = false;
+
+        public Member Member;
+        public bool IncludeSender = false;
+        public bool UseBillingAddress = false;
+        public string Aside;
+        public string? Location;
+
+        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
+            Member = m;
+            Location = App.BranchLocation;
+            IncludeSender = includeSender;
+            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
+            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
+                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
+                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"</tbody></table>";
+        }
+
+        public string Address {
+            get {
+                IAddress addr = (Member.BillingAddress != null && UseBillingAddress) ? Member.BillingAddress : Member;
+                var plz = addr.PostalDest.AtPlz;
+                return (addr is BillingAddr ? $"{addr.Name}\n" : "") + $"{Member.AdministrativeName}\n{addr.Address}\n{plz?.Plz} {plz?.Ort.Name.Split(",")[0]}\n{addr.PostalDest.Country.Name}";
+            }
+        }
+
+        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(Dictionary<string, MemberBucket> buckets) {
+            List<string> attributes = ["_", ""];
+            List<string> names = ["kein Qual.Wein", "ohne Attribut"];
+            List<(string, string)> bucketAttrs = [
+                .. buckets
+                .Where(b => b.Key.Length > 2 && b.Key[2] != '_' && b.Value.DeliveryStrict > 0)
+                .Select(b => (b.Key[2..], b.Value.Name.Split("(")[1][..^1]))
+                .Distinct()
+                .OrderBy(v => v.Item1)
+            ];
+            names.AddRange(bucketAttrs.Select(b => b.Item2));
+            names.Add("Gesamt");
+            attributes.AddRange(bucketAttrs.Select(b => b.Item1));
+
+            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", buckets
+                .GroupBy(b => (b.Key[..2], b.Value.Name.Split("(")[0].Trim()))
+                .Where(g => g.Sum(a => a.Value.DeliveryStrict) > 0)
+                .OrderBy(g => g.Key.Item1)
+                .Select(g => {
+                    var dict = g.ToDictionary(a => a.Key[2..], a => a.Value);
+                    var vals = attributes.Select(a => dict.TryGetValue(a, out MemberBucket value) ? value.DeliveryStrict : 0).ToList();
+                    return $"<tr><th>{g.Key.Item2}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
+                        $"<td class=\"number\">{dict.Values.Select(v => v.DeliveryStrict).Sum():N0}</td></tr>";
+                })
+            );
+            var totalDict = buckets.GroupBy(b => b.Key[2..]).ToDictionary(g => g.Key, g => g.Sum(a => a.Value.DeliveryStrict));
+            var totals = attributes.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
+            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? payment = null, int? area = null,
+            bool isGa = false, bool showPayment = false, bool showArea = false
+        ) {
+            payment ??= delivery;
+            var baseline = showPayment ? 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>{(baseline < obligation ? $"<b>{obligation - baseline:N0}</b>" : "-")}</td>" +
+                $"<td>{(baseline >= obligation && 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>{delivery: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.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,
+                    Member.Deliveries.Where(d => d.Year == season.Year).Sum(d => d.Weight),
+                    isGa: true, showPayment: includePayment, showArea: !includeDelivery
+                )}</tr>";
+            if (fbs.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    $"Flächenbindungen{(vtr.Any() ? " (inkl. Verträge)" : "")}:</th></tr>";
+                foreach (var (id, b) in fbs) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            if (vtr.Any()) {
+                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
+                    "Verträge:</th></tr>";
+                foreach (var (id, b) in vtr) {
+                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                }
+            }
+            tbl += "\n</tbody>\n";
+
+            return $"<table class=\"buckets {(isTiny ? "tiny" : "small")} number cohere\">\n" + tbl + "\n</table>";
+        }
+    }
+}

Elwig/Documents/BusinessDocument.cshtml

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

Elwig/Documents/BusinessDocument.cshtml.cs

@@ -1,36 +0,0 @@
-using Elwig.Models;
-
-namespace Elwig.Documents {
-    public abstract class BusinessDocument : Document {
-
-        public Member Member;
-        public bool IncludeSender = false;
-        public string Aside { get; set; }
-        public string? Location { get; set; }
-
-        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
-            Member = m;
-            Location = App.BranchName;
-            IncludeSender = includeSender;
-            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
-            Aside = $"<table><colgroup><col span='1' style='width: 2.25cm;'/><col span='1' style='width: 100%;'/></colgroup>" +
-                $"<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;
-                var plz = (b == null) ? Member.PostalDest.AtPlz : b.PostalDest.AtPlz;
-                if (b != null) {
-                    return $"{b.Name}\n{Member.AdministrativeName}\n{b.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                } else {
-                    return $"{Member.AdministrativeName}\n{Member.Address}\n{plz.Plz} {plz.Dest}\nÖsterreich";
-                }
-            }
-        }
-    }
-}

Elwig/Documents/BusinessDocument.css

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

Elwig/Documents/BusinessLetter.cs

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

Elwig/Documents/BusinessLetter.cshtml

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

Elwig/Documents/CreditNote.cs

@@ -0,0 +1,72 @@
+using Elwig.Helpers;
+using Elwig.Models.Dtos;
+using Elwig.Models.Entities;
+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 CreditNoteData 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 decimal MemberAutoBusinessShares;
+
+        public CreditNote(AppDbContext ctx, PaymentMember p, CreditNoteData data, Dictionary<string, UnderDelivery>? underDeliveries = null) :
+            base($"{Name} {(p.Credit != null ? $"Nr. {p.Credit.Year}/{p.Credit.TgNr:000}" : p.Member.Name)} – {p.Variant.Name}", p.Member) {
+            UseBillingAddress = true;
+            ShowDateAndLocation = true;
+            Data = data;
+            Payment = p;
+            Credit = p.Credit;
+            var season = p.Variant.Season;
+            var mod = App.Client.IsMatzen ? ctx.Modifiers.Where(m => m.Year == season.Year && m.Name.StartsWith("Treue")).FirstOrDefault() : null;
+            if (mod != null) {
+                MemberModifier = $"{mod.Name} ({mod.ValueStr})";
+            } else {
+                MemberModifier = "Sonstige Zu-/Abschläge";
+            }
+            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) : 0;
+            var fromDate = $"{season.Year}-06-01";
+            var toDate = $"{season.Year + 1}-06-01";
+            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) * (-season.BusinessShareValue ?? 0);
+            if (total == 0) MemberTotalUnderDelivery -= (season.PenaltyNone ?? 0);
+            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>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Datum/Zeit</th><td>{p.Credit?.ModifiedTimestamp:dd.MM.yyyy} / {p.Credit?.ModifiedTimestamp:HH:mm}</td></tr>" +
+                $"</tbody></table>";
+            Text = App.Client.TextDeliveryNote;
+            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;
+
+            var variants = 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 => (
+                    variants[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

@@ -0,0 +1,161 @@
+@using Elwig.Helpers
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.CreditNote>
+@model Elwig.Documents.CreditNote
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
+<main>
+    <h1>@Model.Title</h1>
+    <table class="credit">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width:  5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 16mm;"/>
+        </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;">Attribut</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Preis</th>
+                <th class="narrow">Zu-/Abschläge</th>
+                <th>Betrag</th>
+            </tr>
+            <tr>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit" colspan="2">[kg]</th>
+                <th class="unit">[@Model.CurrencySymbol/kg]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
+                <th class="unit">[@Model.CurrencySymbol]</th>
+            </tr>
+        </thead>
+        <tbody class="sum">
+            @foreach (var p in Model.Data.Rows) {
+                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")">
+                        @if (i == 0) {
+                            <td rowspan="@rows">@p.LsNr</td>
+                            <td rowspan="@rows">@p.DPNr</td>
+                            <td class="small">@p.Variant</td>
+                            <td class="small">@p.Attribute</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
+                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
+                        }
+                        @if (i > 0 && i <= p.Modifiers.Length) {
+                            <td colspan="2" class="small mod">@p.Modifiers[i - 1]</td>
+                        } else if (i > 0) {
+                            <td colspan="2"></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 colspan="3"></td>
+                        }
+                        @if (i == p.Buckets.Length - 1) {
+                            var totalMod = p.TotalModifiers ?? 0;
+                            <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
+                            <td class="number">@($"{p.Amount:N2}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                    </tr>
+                }
+            }
+        </tbody>
+    </table>
+    <div class="hint">
+        Hinweis:<br/>
+        Die Summe der Lieferungen und die Summe der anfallenden Pönalen werden mit
+        @Model.Payment?.Variant.Season.Precision Nachkommastellen berechnent,
+        erst das Ergebnis wird kaufmännisch auf 2 Nachkommastellen gerundet.
+    </div>
+    <table class="credit-sum">
+        @{
+            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" : "")}\" style=\"overflow: visible;\">{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; }
+
+            @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.MemberAutoBusinessShares != 0) {
+                @Raw(FormatRow("Autom. Nachz. von GA", Model.MemberAutoBusinessShares, add: true));
+                penalty += Model.MemberAutoBusinessShares;
+            }
+
+            @if (Model.Credit == null) {
+                @Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true))
+            } else {
+                if (Model.Credit.Modifiers - penalty != 0) {
+                    @Raw(FormatRow("Weitere Abzüge", Model.Credit.Modifiers - penalty, 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>
+</main>

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: 50%;
+    margin-left: 50%;
+}
+
+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: 74mm;
+    position: absolute;
+    left: 0;
+    margin: 2mm 4mm;
+}

Elwig/Documents/DeliveryConfirmation.cs

@@ -0,0 +1,28 @@
+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 DeliveryConfirmationData Data;
+        public string? Text = App.Client.TextDeliveryConfirmation;
+        public Dictionary<string, MemberBucket> MemberBuckets;
+
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, DeliveryConfirmationData data) :
+            base($"{Name} {year}", m) {
+            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
+            ShowDateAndLocation = true;
+            UseBillingAddress = true;
+            IncludeSender = true;
+            DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
+            Data = data;
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -0,0 +1,100 @@
+@using Elwig.Documents
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
+@model Elwig.Documents.DeliveryConfirmation
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
+<main>
+    <h1>@Model.Title</h1>
+    <table class="delivery-confirmation">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width:  5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 21mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 14mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" class="narrow">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attribut</th>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Gewicht</th>
+                <th>Davon<br/>abzuwerten</th>
+            </tr>
+            <tr>
+                <th 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 lastVariant = "";
+            }
+            @foreach (var p in Model.Data.Rows) {
+                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
+                var first = true;
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(first ? "first" : "") @(p.Variant != lastVariant && lastVariant != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
+                        @if (first) {
+                            <td rowspan="@rows">@p.LsNr</td>
+                            <td rowspan="@rows">@p.DPNr</td>
+                            <td class="small">@p.Variant</td>
+                            <td class="small">@p.Attribute</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>
+                        } else {
+                            <td></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="number"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastVariant = p.Variant;
+                }
+            }
+            <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>
+            </tr>
+        </tbody>
+    </table>
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberBuckets))
+    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
+    <div class="text" style="margin-top: 2em;">
+        @if (Model.Text != null) {
+            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+        }
+    </div>
+</main>

Elwig/Documents/DeliveryConfirmation.css

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

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

Elwig/Documents/DeliveryJournal.cshtml

@@ -0,0 +1,67 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryJournal>
+@model Elwig.Documents.DeliveryJournal
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
+<main>
+    <h1>Lieferjournal</h1>
+    <h2>@Model.Filter</h2>
+    <table class="journal">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 8mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 28mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2" 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" style="text-align: left;">Sorte</th>
+                <th colspan="2">Gradation</th>
+                <th>Gewicht</th>
+            </tr>
+            <tr>
+                <th class="unit">[°Oe]</th>
+                <th class="unit narrow">[°KMW]</th>
+                <th class="unit">[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var p in Model.Deliveries) {
+                <tr>
+                    <td>@p.Delivery.LsNr</td>
+                    <td>@p.DPNr</td>
+                    <td class="small">@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{p.Delivery.Time:HH:mm}")</td>
+                    <td class="number">@p.Delivery.Member.MgNr</td>
+                    <td class="small">@p.Delivery.Member.AdministrativeName</td>
+                    <td class="small">@p.Variant.Name</td>
+                    <td class="center">@($"{p.Oe:N0}")</td>
+                    <td class="center">@($"{p.Kmw:N1}")</td>
+                    <td class="number">@($"{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 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/DeliveryJournal.css

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

Elwig/Documents/DeliveryNote.cs

@@ -1,5 +1,5 @@
 using Elwig.Helpers;
-using Elwig.Models;
+using Elwig.Models.Entities;
 using System.Collections.Generic;
 
 namespace Elwig.Documents {
@@ -7,9 +7,17 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
+        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) : 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>" +
@@ -19,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Member, d.Year).GetAwaiter().GetResult();
+            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -2,73 +2,46 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
-<div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
+<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 bottom = hidden.offsetTop + hidden.offsetHeight;
-        const cm = bottom * 2.54 / 96 * window.devicePixelRatio;
-
-        if (cm > 25.75) {
-            // force page break
-            const table = document.getElementsByClassName("delivery")[0];
-
-            const hr = document.createElement("hr");
-            hr.classList.add("page-break");
-            table.before(hr);
-
-            const stats = document.getElementById("delivery-stats");
-            stats.getElementsByTagName("table")[0].classList.add("expanded");
-            hr.before(stats);
-
-            const p = document.createElement("p");
-            p.innerText = "Siehe nächste Seite."
-            stats.before(p);
-        }
-    });
-</script>
-<table class="delivery">
     <colgroup>
-        <col style="width: 1cm;"/>
+        <col style="width: 10.00mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 25%;"/>
+        <col style="width: 21.25mm;"/>
-        <col style="width: 3cm;"/>
+        <col style="width: 30.00mm;"/>
-        <col style="width: 1.25cm;"/>
+        <col style="width: 12.50mm;"/>
-        <col style="width: 1.25cm;"/>
+        <col style="width: 12.50mm;"/>
-        <col style="width: 1.5cm;"/>
+        <col style="width: 15.00mm;"/>
     </colgroup>
     <thead>
         <tr>
-            <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>
         </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">@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>
             <tr><td></td><td colspan="5" style="white-space: pre;"><i>Herkunft:</i> @part.OriginString</td></tr>
             @if (part.Modifiers.Count() > 0) {
@@ -79,7 +52,8 @@
                 }
             }
             <tr><td></td><td colspan="5">
-                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
+                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
             </td></tr>
             @if (part.Comment != null) {
                 <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
@@ -89,11 +63,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>
@@ -101,59 +75,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: 100%;"/>
+                Model.DisplayStats == 1 ? new List<string>() :
-                <col style="width: 2cm;"/>
+                Model.Delivery.Parts.Select(p => p.SortId).Distinct().ToList()
-                <col style="width: 2cm;"/>
+    ))
-                <col style="width: 2cm;"/>
-                <col style="width: 2cm;"/>
-                <col style="width: 2cm;"/>
-                <col style="width: 2cm;"/>
-            </colgroup>
-            <thead>
-                <tr>
-                    <th><b>Gesamtlieferung</b> [kg]</th>
-                    <th>Lieferpflicht</th>
-                    <th>Lieferrecht</th>
-                    <th>Unterliefert</th>
-                    <th>Noch zu liefern</th>
-                    <th>Überliefert</th>
-                    <th>Geliefert</th>
-                </tr>
-            </thead>
-            <tbody>
-                @{
-                    string FormatRow(int obligation, int right, int sum) {
-                        return $"<td>{obligation:N0}</td>" +
-                            $"<td>{right:N0}</td>" +
-                            $"<td>{(sum < obligation ? $"{obligation - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
-                            $"<td>{(sum > right ? $"{sum - right:N0}" : "-")}</td>" +
-                            $"<td>{sum:N0}</td>";
-                    }
-                    var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                }
-                <tr>
-                    <th>Geschäftsanteile</th>
-                    @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
-                </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 && obligation > 0) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
-                    }
-                }
-            </tbody>
-        </table>
-    </div>
 }
+</main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "hidden" : "bottom")">
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

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

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

Elwig/Documents/Document.Table.css

@@ -0,0 +1,153 @@
+
+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: 0.5pt 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.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: 0.5pt solid black;
+}
+
+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: 0.5pt 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 .lborder {border-left: 0.5pt solid black;}
+main table .rborder {border-right: 0.5pt solid black;}
+
+main table .fleft {
+    float: left;
+}
+
+main tbody.sum tr:last-child {
+    border-bottom: 0.5pt solid black;
+}

Elwig/Documents/Document.cs

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

Elwig/Documents/Document.cshtml

@@ -1,26 +1,35 @@
 @using RazorLight
 @inherits TemplatePage<Elwig.Documents.Document>
 @model Elwig.Documents.Document
-
 <!DOCTYPE html>
 <html lang="de-AT">
 <head>
     <title>@Model.Title</title>
+    <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <script>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
-        window.PagedConfig = { auto: false };
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
-        if (!navigator.webdriver) {
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Table.css"/>
-            window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); });
+    @if (Model.DoubleSided) {
-            window.addEventListener("afterprint", () => { location.reload(); });
+        <style>
-        }
+            @@page :left {
-    </script>
+                margin: 25mm 25mm 35mm 20mm;
-    <script src="@Raw(Model.DataPath)\resources\paged.polyfill.js"></script>
+                @@bottom-center {
-    <link rel="stylesheet" href="@Raw(Model.DataPath)\resources\style.css" />
+                    content: element(page-footer-left);
+                }
+            }
+        </style>
+    }
 </head>
 <body>
-    <div class="m1"></div>
+    @if (Model.ShowFoldMarks) {
-    <div class="m2"></div>
+        <div class="m1"></div>
-    <div class="m3"></div>
+        <div class="m2"></div>
+        <div class="m3"></div>
+        <div class="m1 r"></div>
+        <div class="m2 r"></div>
+        <div class="m3 r"></div>
+    }
     <div class="footer-wrapper">
         <div class="pre-footer">
             <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
@@ -29,6 +38,16 @@
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
+    @if (Model.DoubleSided) {
+        <div class="footer-wrapper left">
+            <div class="pre-footer">
+                <span class="page"></span>
+                <span class="doc-id">@Model.DocumentId</span>
+                <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
+            </div>
+            <footer>@Raw(Model.Footer)</footer>
+        </div>
+    }
     <header>@Raw(Model.Header)</header>
     <div class="spacing"></div>
     <div class="main-wrapper">

Elwig/Documents/Document.cshtml.cs

@@ -1,81 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
-using Elwig.Helpers;
-
-namespace Elwig.Documents {
-    public abstract class Document : IDisposable {
-
-        private TempFile? PdfFile = null;
-
-        public Document(string title) {
-            var c = App.Client;
-            DataPath = App.DataPath;
-            CurrentNextSeason = Utils.CurrentNextSeason;
-            Title = title;
-            Header = $"<h1>{c.Name}</h1>";
-            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
-                .Item(c.NameFull).NextLine()
-                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
-                .Item(c.EmailAddress).Item(c.Website).Item("Betriebs-Nr.", c.LfbisNr).Item("UID", c.UstIdNr).NextLine()
-                .Item("BIC", c.Bic).Item("IBAN", c.Iban)
-                .ToString();
-            Date = DateTime.Today;
-        }
-
-        ~Document() {
-            Dispose();
-        }
-
-        public void Dispose() {
-            PdfFile?.Dispose();
-            PdfFile = null;
-            GC.SuppressFinalize(this);
-        }
-
-        public string DataPath { get; set; }
-        public int CurrentNextSeason { get; set; }
-        public string Title { get; set; }
-        public string Header { get; set; }
-        public string Footer { get; set; }
-        public DateTime Date { get; set; }
-        public string? DocumentId { get; set; }
-
-        private async Task<string> Render() {
-            string name;
-            if (this is BusinessLetter) {
-                name = "BusinessLetter";
-            } else if (this is DeliveryNote) {
-                name = "DeliveryNote";
-            } else {
-                throw new InvalidOperationException("Invalid document object");
-            }
-            return await Html.CompileRenderAsync(name, this);
-        }
-
-        public async Task Generate() {
-            var pdf = new TempFile("pdf");
-            using (var tmpHtml = new TempFile("html")) {
-                await File.WriteAllTextAsync(tmpHtml.FilePath, await Render());
-                await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
-            }
-            Pdf.UpdateMetadata(pdf.FilePath, Title, App.Client.NameFull);
-            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

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

Elwig/Documents/Letterhead.cs

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

Elwig/Documents/Letterhead.cshtml

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

Elwig/Documents/MemberDataSheet.cs

@@ -0,0 +1,21 @@
+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 MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
+            DocumentId = $"{Name} {m.MgNr}";
+            Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/MemberDataSheet.cshtml

@@ -0,0 +1,213 @@
+@using RazorLight
+@using Elwig.Helpers
+@inherits TemplatePage<Elwig.Documents.MemberDataSheet>
+@model Elwig.Documents.MemberDataSheet
+@{
+    Layout = "BusinessDocument";
+}
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\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>
+                <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>
+                <td class="large">@Model.Member.Prefix</td>
+                <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
+                <td class="large" colspan="3">@Model.Member.FamilyName</td>
+                <td class="large">@Model.Member.Suffix</td>
+            </tr>
+            <tr>
+                <th>Mitglieds-Nr.:</th>
+                <td>@Model.Member.MgNr</td>
+                <th colspan="2">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?.Name</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")</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.Member.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) {
+        <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 ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
+                        </tr>
+                        lastContract = contractType.AreaComType.DisplayName;
+                    }
+                }
+                <tr class="sum bold">
+                    <td colspan="3">Gesamt:</td>
+                    <td class="number">@($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")</td>
+                    <td colspan="2"></td>
+                </tr>
+            </tbody>
+        </table>
+    }
+</main>

Elwig/Documents/MemberDataSheet.css

@@ -0,0 +1,24 @@
+
+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;
+}

Elwig/Documents/Pdf.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using System.Windows;
-using PdfSharp.Pdf.IO;
-using PuppeteerSharp;
-using Elwig.Helpers;
-using Elwig.Windows;
-using System.Diagnostics;
-
-namespace Elwig.Documents {
-    public static class Pdf {
-
-        private static readonly string Chromium = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe";
-        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static IBrowser? Browser = null;
-        public static bool IsReady => Browser != null;
-
-        public static async Task Init(Action evtHandler) {
-            Browser = await Puppeteer.LaunchAsync(new LaunchOptions {
-                Headless = true,
-                ExecutablePath = Chromium,
-                // paged.js uses XHRs to load styles, so this is needed
-                Args = new[] { "--allow-file-access-from-files" },
-            });
-            evtHandler();
-        }
-
-        public static async Task Close() {
-            if (Browser == null) return;
-            await Browser.CloseAsync();
-            Browser = null;
-        }
-
-        public static async Task Convert(string htmlPath, string pdfPath) {
-            if (Browser == null) throw new InvalidOperationException("The puppeteer engine has not been initialized yet");
-            using var page = await Browser.NewPageAsync();
-            page.Console += OnConsole;
-            await page.GoToAsync($"file://{htmlPath}");
-            await page.EvaluateFunctionAsync("async () => { await window.PagedPolyfill.preview(); }");
-            await page.PdfAsync(pdfPath, new() {
-                PreferCSSPageSize = true,
-                //Format = PaperFormat.A4,
-                DisplayHeaderFooter = false,
-                MarginOptions = new() {
-                    Top = "0mm",
-                    Right = "0mm",
-                    Bottom = "0mm",
-                    Left = "0mm",
-                },
-            });
-        }
-
-        private static void OnConsole(object? sender, ConsoleEventArgs e) {
-            MessageBox.Show(e.Message.Text);
-        }
-
-        public static void UpdateMetadata(string path, string title, string author) {
-            using var doc = PdfReader.Open(path);
-            doc.Info.Title = title;
-            doc.Info.Author = author;
-            doc.Save(path);
-        }
-
-        public static void Show(TempFile file, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, file);
-                w.Show();
-            });
-        }
-
-        public static void Show(string path, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, path);
-                w.Show();
-            });
-        }
-
-        public static 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/style.css

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

Elwig/Elwig.csproj

@@ -1,41 +1,40 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <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.0.2</Version>
+    <Version>0.6.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
+    <Resource Include="Resources\Images\Elwig.png" />
-  </ItemGroup>
+    <Content Include="Resources\Images\Elwig.ico" />
-
+    <EmbeddedResource Include="Resources\Schemas\PaymentVariantData.json" />
-  <ItemGroup>
+    <EmbeddedResource Include="Resources\Sql\*" />
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-    <PackageReference Include="PdfSharp" Version="1.50.5147" />
-    <PackageReference Include="PuppeteerSharp" Version="11.0.2" />
-    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="4.1.67" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="elwig.png" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="call fetch-resources.bat" />
   </Target>
 
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="LinqKit" Version="1.2.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2210.55" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0" />
+    <PackageReference Include="RazorLight" Version="2.3.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.19" />
+    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+  </ItemGroup>
+
 </Project>

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,15 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Data.Sqlite;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
+using Elwig.Models.Dtos;
+using System.Reflection;
 
 namespace Elwig.Helpers {
+
+    public record struct AreaComBucket(int Area, int Obligation, int Right);
+    public record struct UnderDelivery(int Weight, int Diff);
+    public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
+
     public class AppDbContext : DbContext {
 
         public DbSet<Country> Countries { get; private set; }
@@ -26,6 +33,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,21 +44,35 @@ 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<MemberHistory> MemberHistory { get; private set; }
         public DbSet<AreaCom> AreaCommitments { get; private set; }
         public DbSet<Season> Seasons { get; private set; }
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
-        public DbSet<DeliveryPartAttr> DeliveryPartAttributes { get; private set; }
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
+        public DbSet<PaymentMember> MemberPayments { get; private set; }
+        public DbSet<Credit> Credits { get; private set; }
+
+        public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
+        public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
+        public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<CreditNoteRowSingle> CreditNoteRows { 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";
+
+        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) {
@@ -80,6 +103,24 @@ namespace Elwig.Helpers {
             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();
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
             optionsBuilder.UseLazyLoadingProxies();
@@ -153,6 +194,20 @@ namespace Elwig.Helpers {
             return c + 1;
         }
 
+        public async Task<int> NextRdNr(int kgnr) {
+            int c = 0;
+            (await WbRde.Where(r => r.KgNr == kgnr).Select(r => r.RdNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
+        public async Task<int> NextAvNr(int year) {
+            int c = 0;
+            (await PaymentVariants.Where(v => v.Year == year).Select(v => v.AvNr).ToListAsync())
+                .ForEach(a => { if (a <= c + 100) c = a; });
+            return c + 1;
+        }
+
         public async Task<WineQualLevel> GetWineQualityLevel(double kmw) {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
@@ -160,28 +215,6 @@ namespace Elwig.Helpers {
                 .LastOrDefaultAsync();
         }
 
-        public async Task UpdateDeliveryPartAttributes(DeliveryPart part, IEnumerable<WineAttr> attributes) {
-            foreach (var a in WineAttributes) {
-                var attr = part.PartAttributes.Where(pa => pa.AttrId == a.AttrId).FirstOrDefault();
-                if (attributes.Contains(a)) {
-                    DeliveryPartAttr dpa = attr ?? this.CreateProxy<DeliveryPartAttr>();
-                    dpa.Year = part.Year;
-                    dpa.DId = part.DId;
-                    dpa.DPNr = part.DPNr;
-                    dpa.AttrId = a.AttrId;
-                    if (attr == null) {
-                        await AddAsync(dpa);
-                    } else {
-                        Update(dpa);
-                    }
-                } else {
-                    if (attr != null) {
-                        Remove(attr);
-                    }
-                }
-            }
-        }
-
         public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
@@ -204,26 +237,151 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
+        private async Task FetchMemberAreaCommitmentBuckets(int year, SqliteConnection? cnx = null) {
-            using var cnx = await ConnectAsync();
+            var ownCnx = cnx == null;
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
+            cnx ??= await ConnectAsync();
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
+            var buckets = new Dictionary<int, Dictionary<string, AreaComBucket>>();
-
+            using (var cmd = cnx.CreateCommand()) {
-            var list = new List<(string, string, int, int, int)>();
+                cmd.CommandText = $"SELECT mgnr, bucket, area, min_kg, max_kg FROM v_area_commitment_bucket WHERE year = {year}";
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
+                using var reader = await cmd.ExecuteReaderAsync();
-                var s = await WineVarieties.FindAsync(id[..2]);
+                while (await reader.ReadAsync()) {
-                var attrIds = id[2..];
+                    var mgnr = reader.GetInt32(0);
-                var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                    var vtrgid = reader.GetString(1);
-                var name = (s?.Name ?? "") + (a.Count > 0 ? $" ({string.Join(" / ", a.Select(a => a.Name))})" : "");
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = [];
-                list.Add((
+                    buckets[mgnr][vtrgid] = new(reader.GetInt32(2), reader.GetInt32(3), reader.GetInt32(4));
-                    id, name,
+                }
-                    rights.TryGetValue(id, out var v1) ? v1 : 0,
-                    obligations.TryGetValue(id, out var v2) ? v2 : 0,
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
-                ));
             }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberAreaCommitmentBuckets[year] = buckets;
+        }
 
-            return list;
+        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),
+                    paymentBuckets.GetValueOrDefault(id)
+                );
+            }
+            return buckets;
         }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -0,0 +1,91 @@
+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 {
+
+        // Don't forget to update value in Tests/fetch-resources.bat!
+        public static readonly int RequiredSchemaVersion = 13;
+
+        private static int VersionOffset = 0;
+
+        public static async Task<string> CheckDb() {
+            using var cnx = AppDbContext.Connect();
+
+            var applId = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
+
+            var schemaVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+            VersionOffset = (int)(schemaVers % 100);
+            if (VersionOffset != 0) {
+                // schema was modified manually/externally
+                // TODO issue warning
+            }
+            await UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
+
+            var userVers = (long?)await AppDbContext.ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var major = userVers >> 24;
+            var minor = (userVers >> 16) & 0xFF;
+            var patch = userVers & 0xFFFF;
+
+            if (App.VersionMajor > major ||
+                (App.VersionMajor == major && App.VersionMinor > minor) ||
+                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch)) {
+                long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
+                await AppDbContext.ExecuteBatch(cnx, $"PRAGMA user_version = {vers}");
+            }
+
+            return $"{major}.{minor}.{patch}";
+        }
+
+        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 (fromVersion <= 0) {
+                throw new Exception("schema_version of database is invalid");
+            }
+
+            var asm = Assembly.GetExecutingAssembly();
+            (int From, int To, string Name)[] scripts = asm.GetManifestResourceNames()
+                .Where(n => n.StartsWith("Elwig.Resources.Sql."))
+                .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;
+            }
+            if (toExecute.Count == 0)
+                return;
+
+            await AppDbContext.ExecuteBatch(cnx, """
+                PRAGMA locking_mode = EXCLUSIVE;
+                PRAGMA foreign_keys = OFF;
+                BEGIN EXCLUSIVE;
+                """);
+            foreach (var script in toExecute) {
+                await AppDbContext.ExecuteEmbeddedScript(cnx, asm, script);
+            }
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                PRAGMA foreign_key_check;
+                COMMIT;
+                PRAGMA foreign_keys = ON;
+                VACUUM;
+                PRAGMA schema_version = {toVersion * 100 + VersionOffset};
+                """);
+        }
+    }
+}

Elwig/Helpers/Billing/Billing.cs

@@ -1,4 +1,4 @@
-using Microsoft.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,125 +6,201 @@ 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 AppDbContext Context;
-        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;
             Context = new AppDbContext();
             Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
             Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
-            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId1, v.AttrId2, v.Discriminator, v.MinKgPerHa, v.MaxKgPerHa, v.PenaltyAmount));
+            AreaComTypes = Context.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})";
+                DELETE FROM delivery_part_bucket WHERE year = {Year};
-                await cmd.ExecuteNonQueryAsync();
+                """);
-            }
         }
 
-        public async Task Calculate() {
+        public async Task AutoAdjustBusinessShare() {
-            await DeleteInDb();
-            var tasks = new List<Task>();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMember(mgnr)));
-            }
-            await Task.WhenAll(tasks);
-        }
-
-        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(int mgnr, int year, SqliteConnection cnx) {
-            var rights = new Dictionary<string, int>();
-            var obligations = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT t.vtrgid,
-                       SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000 AS min_kg,
-                       SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000 AS max_kg
-                FROM area_commitment c
-                JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                WHERE mgnr = {mgnr} AND (year_from IS NULL OR year_from <= {year}) AND (year_to IS NULL OR year_to >= {year})
-                GROUP BY t.vtrgid
-                ORDER BY LENGTH(t.vtrgid) DESC, t.vtrgid
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var vtrgid = reader.GetString(0);
-                obligations[vtrgid] = reader.GetInt32(1);
-                rights[vtrgid] = reader.GetInt32(2);
-            }
-
-            return (rights, obligations);
-        }
-
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
-            var buckets = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT bucket, weight
-                FROM v_bucket
-                WHERE (year, mgnr) = ({year}, {mgnr})
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var bucket = reader.GetString(0);
-                buckets[bucket] = reader.GetInt32(1);
-            }
-
-            return buckets;
-        }
-
-        protected async Task CalculateMember(int mgnr) {
             using var cnx = await AppDbContext.ConnectAsync();
-            var (rights, obligations) = await GetMemberRightsObligations(mgnr, Year, cnx);
+            await AppDbContext.ExecuteBatch(cnx, $"""
+                INSERT INTO member_history (mgnr, date, business_shares, type)
+                SELECT u.mgnr, '{Utils.Today:yyyy-MM-dd}', u.diff / s.max_kg_per_bs AS bs, 'auto'
+                FROM v_total_under_delivery u
+                    JOIN season s ON s.year = u.year
+                WHERE s.year = {Year} AND bs > 0
+                ON CONFLICT DO NOTHING
+                """);
+        }
 
-            var deliveries = new List<(int, int, string, int, double, string, string[], string[])>();
+        public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
+            var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
+            using var cnx = await AppDbContext.ConnectAsync();
+            await Context.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) ? Array.Empty<string>() : 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 = new();
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    rightsAndObligations = await Context.GetMemberAreaCommitmentBuckets(Year, mgnr);
+                    used = new();
+                }
+                if ((honorGebunden && gebunden == false) ||
+                    rightsAndObligations == null || rightsAndObligations.Count == 0 ||
+                    qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
+                {
+                    // Explizit als ungebunden markiert,
+                    // Mitglied hat keine Flächenbindungen, oder
                     // Nicht mindestens Qualitätswein (QUW)
-                    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 ? Array.Empty<string>() : new string[] { attrid };
+                var isStrict = attrid != null && attrVals[attrid].IsStrict;
+                foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rightsAndObligations.ContainsKey(key)) {
+                        int i = (c == 0) ? 1 : 2;
+                        var u = used.GetValueOrDefault(key, 0);
+                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Right - u, w));
+                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].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, $"""
+                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 (!avoidUnderDeliveries)
+                return;
+
+            // FIXME avoidUnderDelivery-calculations not always right!
+
+            var underDeliveries = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 2 AND diff < 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    underDeliveries[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            var fittingBuckets = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 3 AND diff > 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    fittingBuckets[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            foreach (var item in fittingBuckets) {
+                var mgnr = item.Key.Item1;
+                var id = item.Key.Item2[..2];
+                var attr = item.Key.Item2[2..];
+                var available = item.Value;
+                var needed = -underDeliveries.GetValueOrDefault((mgnr, id), 0);
+                if (needed <= 0) continue;
+
+                var fittingDeliveries = new List<(int, int, int, int)>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        SELECT d.did, d.dpnr, d.weight, b.value
+                        FROM v_delivery d
+                            JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}'
+                        WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attrid = '{attr}'
+                        ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC
+                        """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        fittingDeliveries.Add((
+                            reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3)
+                        ));
+                    }
+                }
+
+                var negChanges = new List<(int, int, int, int)>();
+                var posChanges = new List<(int, int, int, int)>();
+                foreach (var (did, dpnr, _, w) in fittingDeliveries) {
+                    int v = Math.Min(needed, w);
+                    needed -= v;
+                    posChanges.Add((did, dpnr, 1, v));
+                    negChanges.Add((did, dpnr, 2, w - v));
+                    if (needed == 0) break;
+                }
+
+                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;
+                    """);
+            }
         }
     }
 }

Elwig/Helpers/Billing/BillingData.cs

@@ -0,0 +1,381 @@
+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");
+        }
+
+        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 ?? "");
+            }
+        }
+
+        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<string, JsonValue> GetSelection(JsonNode value, IEnumerable<string> attributeVariants) {
+            if (value is JsonValue flatRate) {
+                return attributeVariants.ToDictionary(e => e, _ => flatRate);
+            } if (value is not JsonObject data) {
+                throw new InvalidOperationException();
+            }
+            Dictionary<string, JsonValue> dict;
+            if (data["default"] is JsonValue def) {
+                dict = attributeVariants.ToDictionary(e => e, _ => def);
+            } else {
+                dict = [];
+            }
+
+            var variants = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length == 2);
+            var attributes = data.Where(p => p.Key.StartsWith('/'));
+            var others = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length > 2 && p.Key != "default");
+            foreach (var (idx, v) in variants) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                foreach (var i in attributeVariants.Where(e => e.StartsWith(idx[..^1]))) {
+                    dict[i] = curve;
+                }
+            }
+            foreach (var (idx, v) in attributes) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                foreach (var i in attributeVariants.Where(e => e[2..] == idx[1..])) {
+                    dict[i] = curve;
+                }
+            }
+            foreach (var (idx, v) in others) {
+                var curve = v?.AsValue() ?? throw new InvalidOperationException();
+                dict[idx.Replace("/", "")] = curve;
+            }
+
+            return dict;
+        }
+
+        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 void CollapsePaymentData(JsonObject data, IEnumerable<string> attributeVariants) {
+            Dictionary<string, List<string>> rev1 = [];
+            Dictionary<decimal, List<string>> rev2 = [];
+            foreach (var (k, v) in data) {
+                if (k == "default" || k.StartsWith('/') || !k.Contains('/') || v is not JsonValue val) {
+                    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);
+                }
+            }
+            if (!data.ContainsKey("default")) {
+                foreach (var (v, ks) in rev1) {
+                    if (ks.Count >= attributeVariants.Count() / 2.0) {
+                        foreach (var k in ks) data.Remove(k);
+                        data["default"] = v;
+                        CollapsePaymentData(data, attributeVariants);
+                        return;
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    if (ks.Count >= attributeVariants.Count() / 2.0) {
+                        foreach (var k in ks) data.Remove(k);
+                        data["default"] = v;
+                        CollapsePaymentData(data, attributeVariants);
+                        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 = attributeVariants.Count(e => e.EndsWith(idx));
+                foreach (var (v, ks) in rev1) {
+                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    if (myKs.Count > 1 && myKs.Count >= len / 2.0) {
+                        foreach (var k in myKs) data.Remove(k);
+                        data[idx] = v;
+                    }
+                }
+                foreach (var (v, ks) in rev2) {
+                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    if (myKs.Count > 1 && myKs.Count >= len / 2.0) {
+                        foreach (var k in myKs) data.Remove(k);
+                        data[idx] = v;
+                    }
+                }
+            }
+        }
+
+        public static JsonObject FromGraphEntries(IEnumerable<GraphEntry> graphEntries, BillingData? origData = null, IEnumerable<string>? attributeVariants = null) {
+            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.Contracts) {
+                    if (entry.Abgewertet) {
+                        qualityWei[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    } else {
+                        payment[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    }
+                }
+            }
+
+            CollapsePaymentData(payment, attributeVariants ?? payment.Select(e => e.Key).ToList());
+            CollapsePaymentData(qualityWei, attributeVariants ?? qualityWei.Select(e => e.Key).ToList());
+
+            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) {
+                data["payment"] = payment.Single().Value?.DeepClone();
+            } else {
+                data["payment"] = payment;
+            }
+            if (qualityWei.Count == 1) {
+                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,190 @@
+using Elwig.Models.Entities;
+using Microsoft.Data.Sqlite;
+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;
+            PaymentVariant = Context.PaymentVariants.Find(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetAttributeVarieties(Context, Year));
+        }
+
+        public async Task Calculate() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using var tx = await cnx.BeginTransactionAsync();
+            await DeleteInDb(cnx);
+            await SetCalcTime(cnx);
+            await CalculatePrices(cnx);
+            if (Data.ConsiderDelieryModifiers)
+                await CalculateDeliveryModifiers(cnx);
+            await CalculateMemberModifiers(cnx);
+            await tx.CommitAsync();
+        }
+
+        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,
+                           ROUND(lp.amount / POW(10, s.precision - 2)) AS prev_amount,
+                           IIF(m.buchführend, s.vat_normal, s.vat_flatrate) AS vat,
+                           ROUND(
+                               IIF({Data.ConsiderContractPenalties}, COALESCE(u.total_penalty, 0) / POW(10, 4 - 2), 0) +
+                               IIF({Data.ConsiderTotalPenalty}, COALESCE(b.total_penalty, 0), 0) +
+                               IIF({Data.ConsiderAutoBusinessShares}, -COALESCE(a.business_shares * s.bs_value, 0), 0) / POW(10, s.precision - 2)
+                           ) AS modifiers,
+                           lc.modifiers 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 (SELECT year, mgnr,
+                                          SUM(COALESCE(IIF(u.weight = 0, -t.penalty_none, 0), 0) +
+                                              COALESCE(IIF(u.diff < 0, -t.penalty_amount, 0), 0) +
+                                              COALESCE(u.diff * t.penalty_per_kg, 0)) AS total_penalty
+                                   FROM v_under_delivery u
+                                       JOIN area_commitment_type t ON t.vtrgid = u.bucket
+                                   GROUP BY year, mgnr) u ON (u.year, u.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN (SELECT s.year, u.mgnr,
+                                          (COALESCE(IIF(u.weight = 0, -s.penalty_none, 0), 0) +
+                                           COALESCE(IIF(u.diff < 0, -s.penalty_amount, 0), 0) +
+                                           COALESCE(u.diff * s.penalty_per_kg, 0)
+                                           ) / POW(10, s.precision - 2) AS total_penalty
+                                   FROM v_total_under_delivery u
+                                       JOIN season s ON s.year = u.year
+                                   WHERE u.diff < 0) b ON (b.year, b.mgnr) = (s.year, m.mgnr)
+                        LEFT JOIN (SELECT h.mgnr, h.business_shares
+                                   FROM member_history h
+                                   WHERE type = 'auto' AND
+                                         date >= '{Year}-06-01' AND
+                                         date < '{Year + 1}-06-01') a ON a.mgnr = m.mgnr
+                    WHERE s.year = {Year} AND v.avnr = {AvNr};
+
+                    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 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, mgnr,
+                                 ROUND(AVG(sum) * {multiplier}) AS baseline,
+                                 COUNT(*) = {lastYears} AND MIN(sum) > 0 AS allowed
+                          FROM v_stat_member
+                          WHERE year > {Year} - {lastYears}
+                          GROUP BY 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
+                    """);
+            }
+        }
+
+        protected async Task CalculatePrices(SqliteConnection cnx) {
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string Discr, int Value, double Oe, double Kmw, string QualId)>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, b.discr, b.value, d.oe, d.kmw, d.qualid
+                    FROM delivery_part_bucket b
+                        JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr)
+                    WHERE b.year = {Year}
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    parts.Add((
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3),
+                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5), reader.GetString(6),
+                        reader.GetInt32(7), reader.GetDouble(8), reader.GetDouble(9), reader.GetString(10)
+                    ));
+                }
+            }
+
+            var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
+            foreach (var part in parts) {
+                var ungeb = part.Discr == "_";
+                var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
+                var geb = !ungeb && payAttrId == part.AttrId;
+                var price = Data.CalculatePrice(part.SortId, part.AttrId, part.QualId, geb, part.Oe, part.Kmw);
+                var priceL = PaymentVariant.Season.DecToDb(price);
+                inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
+            }
+
+            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})"))};
+                """);
+        }
+
+        protected async Task CalculateDeliveryModifiers(SqliteConnection cnx) {
+            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, 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/ContractSelection.cs

@@ -0,0 +1,25 @@
+using Elwig.Models.Entities;
+using System;
+
+namespace Elwig.Helpers.Billing {
+    public class ContractSelection : IComparable<ContractSelection> {
+
+        public WineVar? Variety { get; }
+        public WineAttr? Attribute { get; }
+        public string Listing => $"{Variety?.SortId}{Attribute?.AttrId}";
+        public string FullName => $"{Variety?.Name}" + (Variety != null && Attribute != null ? " " : "") + $"{Attribute?.Name}";
+
+        public ContractSelection(WineVar? var, WineAttr? attr) {
+            Variety = var;
+            Attribute = attr;
+        }
+
+        public override string ToString() {
+            return Listing;
+        }
+
+        public int CompareTo(ContractSelection? other) {
+            return Listing.CompareTo(other?.Listing);
+        } 
+    }
+}

Elwig/Helpers/Billing/EditBillingData.cs

@@ -0,0 +1,102 @@
+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<string> AttributeVariants;
+
+        public EditBillingData(JsonObject data, IEnumerable<string> attributeVariants) :
+            base(data) {
+            AttributeVariants = attributeVariants;
+        }
+
+        public static EditBillingData FromJson(string json, IEnumerable<string> attributeVariants) {
+            return new(ParseJson(json), attributeVariants);
+        }
+
+        private (Dictionary<int, Curve>, Dictionary<int, List<string>>) 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<string>> dict3 = curves.ToDictionary(c => c.Key, _ => new List<string>());
+            foreach (var (selector, value) in GetSelection(root, AttributeVariants)) {
+                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<string>> entries) {
+            var vars = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
+            var attrs = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
+            return entries
+                .Select(e => new GraphEntry(e.Key, precision, curves[e.Key], e.Value
+                    .Select(s => new ContractSelection(vars[s[..2]], s.Length > 2 ? attrs[s[2..]] : null))
+                    .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.Contracts.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.Contracts.Count > 0);
+            foreach (var e in list) {
+                e.Id += idOffset;
+                e.Abgewertet = true;
+            }
+            return list;
+        }
+    }
+}

Elwig/Helpers/Billing/Graph.cs

@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Helpers.Billing {
+    public class Graph : ICloneable {
+
+        public readonly int Precision;
+        public double[] DataX { get; set; }
+        public double[] DataY { get; set; }
+        public int MinX { get; set; }
+        public int MaxX { get; set; }
+
+        public Graph(int precision, int minX, int maxX) {
+            Precision = precision;
+            MinX = minX;
+            MaxX = maxX;
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
+            DataY = new double[DataX.Length];
+        }
+
+        public Graph(Dictionary<double, decimal> data, int precision, int minX, int maxX) {
+            Precision = precision;
+            MinX = minX;
+            MaxX = maxX;
+            DataX = Enumerable.Range(minX, maxX - minX + 1).Select(n => (double)n).ToArray();
+            DataY = DataX.Select(i => (double)BillingData.GetCurveValueAt(data, i)).ToArray();
+        }
+
+        public Graph(double[] values, int precision, int minX, int maxX) {
+            Precision = precision;
+            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;
+            DataX = dataX;
+            DataY = dataY;
+        }
+
+        public double GetOechsleAt(int index) {
+            return DataX[index];
+        }
+
+        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;
+
+            for (int i = lowIndex; i < highIndex - 1; i++) {
+                DataY[i + 1] = Math.Round(DataY[i] + step, Precision);
+            }
+        }
+
+        public object Clone() {
+            return new Graph((double[])DataX.Clone(), (double[])DataY.Clone(), Precision, MinX, MaxX);
+        }
+    }
+}

Elwig/Helpers/Billing/GraphEntry.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Helpers.Billing {
+    public class GraphEntry {
+
+        public const int MinX = 50;
+        public const int MinXGeb = 73;
+        public const int MaxX = 140;
+
+        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<ContractSelection> Contracts { get; set; }
+        public string ContractsStringSimple => (Abgewertet ? "Abgew.: " : "") + (Contracts.Count != 0 ? (Contracts.Count >= 25 ? "Restliche Sorten" : string.Join(", ", Contracts.Select(c => c.Listing))) : "-");
+        public string ContractsString => Contracts.Count != 0 ? string.Join("\n", Contracts.Select(c => c.FullName)) : "-";
+        public string ContractsStringChange => (Abgewertet ? "A." : "") + string.Join(",", Contracts.Select(c => c.Listing));
+        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); ;
+            Contracts = [];
+        }
+
+        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<ContractSelection> contracts) :
+            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);
+            Contracts = contracts;
+        }
+
+        private GraphEntry(int id, int precision, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph, List<ContractSelection> contracts) {
+            Id = id;
+            Precision = precision;
+            Mode = mode;
+            DataGraph = dataGraph;
+            GebundenGraph = gebundenGraph;
+            Contracts = contracts;
+        }
+
+        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,73 @@
+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<string, Curve> PaymentData;
+        protected readonly Dictionary<string, Curve> QualityData;
+        protected readonly IEnumerable<string> AttributeVariants;
+
+        public PaymentBillingData(JsonObject data, IEnumerable<string> attributeVariants) :
+            base(data) {
+            if (attributeVariants.Any(e => e.Any(c => c < 'A' || c > 'Z')))
+                throw new ArgumentException("Invalid attributeVariants");
+            AttributeVariants = attributeVariants;
+            Curves = GetCurves();
+            PaymentData = GetPaymentData();
+            QualityData = GetQualityData();
+        }
+
+        public static PaymentBillingData FromJson(string json, IEnumerable<string> attributeVariants) {
+            return new(ParseJson(json), attributeVariants);
+        }
+
+        private Dictionary<string, Curve> GetData(JsonNode data) {
+            return GetSelection(data, AttributeVariants).ToDictionary(e => e.Key, e => LookupCurve(e.Value));
+        }
+
+        protected Dictionary<string, Curve> GetPaymentData() {
+            return GetData(GetPaymentEntry());
+        }
+
+        protected Dictionary<string, Curve> GetQualityData() {
+            Dictionary<string, Curve> dict = [];
+            var q = GetQualityEntry();
+            if (q == null) return dict;
+
+            foreach (var (qualid, data) in q) {
+                foreach (var (idx, d) in GetData(data ?? throw new InvalidOperationException())) {
+                    dict[$"{qualid}/{idx}"] = d;
+                }
+            }
+
+            return dict;
+        }
+
+        public decimal CalculatePrice(string sortid, string? attrid, string qualid, bool gebunden, double oe, double kmw) {
+            var curve = GetQualityCurve(qualid, sortid, attrid) ?? GetCurve(sortid, attrid);
+            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) {
+            return PaymentData[$"{sortid}{attrid}"];
+        }
+
+        protected Curve? GetQualityCurve(string qualid, string sortid, string? attrid) {
+            return QualityData.TryGetValue($"{qualid}/{sortid}{attrid}", out var curve) ? curve : null;
+        }
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -1,4 +1,4 @@
-using Elwig.Models;
+using Elwig.Models.Entities;
 using Microsoft.Data.Sqlite;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,16 +7,30 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
     public class ClientParameters {
 
-        public enum Type { Matzen, GWK };
+        public enum Type { Matzen, Winzerkeller };
 
         public bool IsMatzen => Client == Type.Matzen;
-        public bool IsGWK => Client == Type.GWK;
+        public bool IsWinzerkeller => Client == Type.Winzerkeller;
+        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
+        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
+        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
+
+        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
+        public bool HasRebler() => HasRebler(App.ZwstId);
+        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
+        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
+        public bool HasKisten() => HasKisten(App.ZwstId);
 
         public string NameToken;
         public string NameShort;
         public string Name;
         public string? NameSuffix;
         public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;
 
@@ -42,13 +56,10 @@ namespace Elwig.Helpers {
         public string? EmailAddress;
         public string? Website;
 
-        public int DeliveryObligation;
+        public int ModeDeliveryNoteStats;
-        public int DeliveryRight;
-        public decimal VatNormal;
-        public decimal VatReduced;
-        public decimal VatFlatRate;
 
         public string? TextDeliveryNote;
+        public string? TextDeliveryConfirmation;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -61,7 +72,7 @@ namespace Elwig.Helpers {
                 NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
                 switch (Name) {
                     case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break;
-                    case "Winzerkeller im Weinviertel": Client = Type.GWK; break;
+                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
                 };
 
                 Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
@@ -76,20 +87,31 @@ namespace Elwig.Helpers {
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
 
-                DeliveryObligation = int.Parse(parameters["DELIVERY_OBLIGATION"] ?? "");
+                switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
-                DeliveryRight = int.Parse(parameters["DELIVERY_RIGHT"] ?? "");
+                    case "NONE": ModeDeliveryNoteStats = 0; break;
-                VatNormal = decimal.Parse((parameters["VAT_NORMAL"] ?? "").Replace(".", ","));
+                    case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
-                VatReduced = decimal.Parse((parameters["VAT_REDUCED"] ?? "").Replace(".", ","));
+                    case "SHORT": ModeDeliveryNoteStats = 2; break;
-                VatFlatRate = decimal.Parse((parameters["VAT_FLATRATE"] ?? "").Replace(".", ","));
+                    case "FULL": ModeDeliveryNoteStats = 3; break;
+                }
 
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+                if (TextDeliveryNote == "") TextDeliveryNote = null;
+                TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
+                if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
             } catch {
                 throw new KeyNotFoundException();
             }
         }
 
         private IEnumerable<(string, string?)> GetParamValues() {
+            string deliveryNoteStats = "SHORT";
+            switch (ModeDeliveryNoteStats) {
+                case 0: deliveryNoteStats = "NONE"; break;
+                case 1: deliveryNoteStats = "GA_ONLY"; break;
+                case 2: deliveryNoteStats = "SHORT"; break;
+                case 3: deliveryNoteStats = "FULL"; break;
+            }
             return new (string, string?)[] {
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -107,13 +129,10 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
-                ("DELIVERY_OBLIGATION", DeliveryObligation.ToString()),
+                ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
-                ("DELIVERY_RIGHT", DeliveryRight.ToString()),
-                ("VAT_NORMAL", VatNormal.ToString().Replace(",", ".")),
-                ("VAT_REDUCED", VatReduced.ToString().Replace(",", ".")),
-                ("VAT_FLATRATE", VatFlatRate.ToString().Replace(",", ".")),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+                ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
             };
         }
 

Elwig/Helpers/Config.cs

@@ -1,19 +1,19 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
+using Microsoft.Extensions.Configuration;
-using IniParser;
-using IniParser.Model;
 
 namespace Elwig.Helpers {
     public class Config {
 
         private readonly string FileName;
+        public bool Debug;
         public string DatabaseFile = App.DataPath + "database.sqlite3";
         public string? DatabaseLog = null;
         public string? Branch = null;
         public IList<string?[]> Scales;
-        private readonly List<string?[]> ScaleList = new();
+        private readonly List<string?[]> ScaleList = [];
+        private static readonly string[] trueValues = ["1", "true", "yes", "on"];
 
         public Config(string filename) {
             FileName = filename;
@@ -22,57 +22,32 @@ namespace Elwig.Helpers {
         }
 
         public void Read() {
-            var parser = new FileIniDataParser();
+            var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
-            IniData? ini = null;
-            try {
-                ini = parser.ReadFile(FileName, Encoding.UTF8);
-            } catch {}
 
-            if (ini == null || !ini.TryGetKey("database.file", out string db)) {
+            DatabaseFile = Path.Combine(App.DataPath, config["database:file"] ?? "database.sqlite3");
-                DatabaseFile = App.DataPath + "database.sqlite3";
+            var log = config["database:log"];
-            } else if (db.Length > 1 && (db[1] == ':' || db[0] == '/' || db[0] == '\\')) {
+            DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
-                DatabaseFile = db;
+            Branch = config["general:branch"];
-            } else {
+            Debug = trueValues.Contains(config["general:debug"]?.ToLower());
-                DatabaseFile = App.DataPath + db;
-            }
-
-            if (ini == null || !ini.TryGetKey("database.log", out string log)) {
-                DatabaseLog = null;
-            } else if (log.Length > 1 && (log[1] == ':' || log[0] == '/' || log[0] == '\\')) {
-                DatabaseLog = log;
-            } else {
-                DatabaseLog = App.DataPath + log;
-            }
-
-            if (ini == null || !ini.TryGetKey("general.branch", out string branch)) {
-                Branch = null;
-            } else {
-                Branch = branch;
-            }
 
+            var scales = config.AsEnumerable().Where(i => i.Key.StartsWith("scale.")).GroupBy(i => i.Key.Split(':')[0][6..]).Select(i => i.Key);
             ScaleList.Clear();
             Scales = ScaleList;
-            if (ini != null) {
+            foreach (var s in scales) {
-                foreach (var s in ini.Sections.Where(s => s.SectionName.StartsWith("scale."))) {
+                string? scaleLog = config[$"scale.{s}:log"];
-                    string? scaleLog = null;
+                if (scaleLog != null) scaleLog = Path.Combine(App.DataPath, scaleLog);
-                    if (s.Keys["log"] != null) {
+                ScaleList.Add([
-                        scaleLog = s.Keys["log"];
+                    s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
-                        if (scaleLog.Length <= 1 || (scaleLog[1] != ':' && scaleLog[0] != '/' && scaleLog[0] != '\\')) {
+                    config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], scaleLog
-                            scaleLog = App.DataPath + scaleLog;
+                ]);
-                        }
-                    }
-                    ScaleList.Add(new string?[] {
-                        s.SectionName[6..], s.Keys["type"], s.Keys["model"], s.Keys["connection"],
-                        s.Keys["empty"], s.Keys["filling"], s.Keys["limit"], scaleLog
-                    });
-                }
             }
         }
 
         public void Write() {
-            using var file = new StreamWriter(FileName, false, Encoding.UTF8);
+            using var file = new StreamWriter(FileName, false, Utils.UTF8);
             file.Write($"\r\n[general]\r\n");
             if (Branch != null) file.Write($"branch = {Branch}\r\n");
+            if (Debug) file.Write("debug = true\r\n");
             file.Write($"\r\n[database]\r\nfile = {DatabaseFile}\r\n");
             if (DatabaseLog != null) file.Write($"log = {DatabaseLog}\r\n");
             foreach (var s in ScaleList) {

Elwig/Helpers/ControlUtils.cs

@@ -5,7 +5,8 @@ using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Media;
+using Brush = System.Windows.Media.Brush;
+using Brushes = System.Windows.Media.Brushes;
 
 namespace Elwig.Helpers {
     public class ControlUtils {
@@ -16,7 +17,7 @@ namespace Elwig.Helpers {
             First
         }
 
-        private static void SetControlBrush(Control input, Brush brush) {
+        private static void SetControlBorderBrush(Control input, Brush brush) {
             if (input is ComboBox cb) {
                 var border = GetComboBoxBorder(cb);
                 if (border != null) border.BorderBrush = brush;
@@ -26,15 +27,15 @@ namespace Elwig.Helpers {
         }
 
         public static void SetInputNotDefault(Control input) {
-            SetControlBrush(input, Brushes.Gold);
+            SetControlBorderBrush(input, Brushes.Gold);
         }
 
         public static void SetInputChanged(Control input) {
-            SetControlBrush(input, Brushes.Orange);
+            SetControlBorderBrush(input, Brushes.Orange);
         }
 
         public static void SetInputInvalid(Control input) {
-            SetControlBrush(input, Brushes.Red);
+            SetControlBorderBrush(input, Brushes.Red);
         }
 
         public static void ClearInputState(Control input) {
@@ -58,7 +59,8 @@ namespace Elwig.Helpers {
                     continue;
                 } else if (child is T t) {
                     yield return t;
-                } else if (child is DependencyObject childDepOpj) {
+                }
+                if (child is DependencyObject childDepOpj) {
                     foreach (T childOfChild in FindAllChildren<T>(childDepOpj)) {
                         yield return childOfChild;
                     }
@@ -181,6 +183,15 @@ namespace Elwig.Helpers {
             SelectComboBoxItem(cb, getId, getId(item));
         }
 
+        public static void SelectListBoxItem(ListBox lb, Func<object?, object?> getId, object? id) {
+            lb.SelectedItem = GetItemFromSource(lb.ItemsSource, getId, id);
+            lb.ScrollIntoView(lb.SelectedItem);
+        }
+
+        public static void SelectListBoxItem(ListBox lb, object? item, Func<object?, object?> getId) {
+            SelectListBoxItem(lb, getId, getId(item));
+        }
+
         public static IEnumerable<object?> GetItemsFromSource(IEnumerable source, Func<object?, object?> getId, IEnumerable<object?> ids) {
             if (source == null)
                 return Array.Empty<object>();

Elwig/Helpers/Export/Bki.cs

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

Elwig/Helpers/Export/Csv.cs

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

Elwig/Helpers/Export/Ebics.cs

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

Elwig/Helpers/Export/Elba.cs

@@ -1,14 +1,14 @@
-using Elwig.Models;
+using Elwig.Models.Dtos;
 using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
-    public class Elba : IBankingProvider {
+    public class Elba : Csv<Transaction>, IBankingExporter {
 
-        public string FileExtension => "elba";
+        public static new string FileExtension => "elba";
 
-        public Task Export(string filename, int avnr, IEnumerable<Member> members) {
+        public Elba(string filename) : base(filename) { }
+
+        public override string FormatRow(Transaction row) {
             throw new NotImplementedException();
         }
     }

Elwig/Helpers/Export/IBankingExporter.cs

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

Elwig/Helpers/Export/IBankingProvider.cs

@@ -1,24 +0,0 @@
-using Elwig.Models;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Elwig.Helpers.Export {
-    /// <summary>
-    /// Interface for exporting banking data
-    /// </summary>
-    public interface IBankingProvider {
-        /// <summary>
-        /// The default file extension of the exported files to be used (whithout a preceding ".")
-        /// </summary>
-        string FileExtension { get; }
-
-        /// <summary>
-        /// Export the member payment data of the given payment variant to the given file.
-        /// (The amount of the last payed variant is deducted from the calculated amount.)
-        /// </summary>
-        /// <param name="filename">The file to export the data to</param>
-        /// <param name="avnr">The number of the payment variant to export</param>
-        /// <param name="members">The members whose data to include in the export</param>
-        Task Export(string filename, int avnr, IEnumerable<Member> members);
-    }
-}

Elwig/Helpers/Export/IExporter.cs

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

Elwig/Helpers/Export/Ods.cs

@@ -0,0 +1,285 @@
+using Elwig.Models.Dtos;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity.Core.Common.CommandTrees.ExpressionBuilder;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Export {
+    public class OdsFile : IDisposable {
+
+        protected readonly string FileName;
+        protected readonly ZipArchive ZipArchive;
+        protected StreamWriter? Content;
+        private readonly List<string> _tables;
+
+        public OdsFile(string filename) {
+            FileName = filename;
+            File.Delete(filename);
+            ZipArchive = ZipFile.Open(FileName, ZipArchiveMode.Create);
+            _tables = new();
+        }
+
+        public void Dispose() {
+            AddTrailer().GetAwaiter().GetResult();
+            ZipArchive?.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        private async Task AddHeader() {
+            var mimetype = ZipArchive.CreateEntry("mimetype", CompressionLevel.NoCompression);
+            using (var writer = new StreamWriter(mimetype.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("application/vnd.oasis.opendocument.spreadsheet");
+            }
+
+            var manifest = ZipArchive.CreateEntry("META-INF/manifest.xml");
+            using (var writer = new StreamWriter(manifest.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.3">
+                     <manifest:file-entry manifest:full-path="/" manifest:version="1.3" manifest:media-type="application/vnd.oasis.opendocument.spreadsheet"/>
+                     <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
+                     <manifest:file-entry manifest:full-path="settings.xml" manifest:media-type="text/xml"/>
+                    </manifest:manifest>
+
+                    """);
+            }
+
+            var styles = ZipArchive.CreateEntry("styles.xml");
+            using (var writer = new StreamWriter(styles.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.3">
+                    </office:document-styles>
+
+                    """);
+            }
+
+            var meta = ZipArchive.CreateEntry("meta.xml");
+            using (var writer = new StreamWriter(meta.Open(), Utils.UTF8)) {
+                var now = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ");
+                await writer.WriteAsync($"""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" office:version="1.3">
+                     <office:meta>
+                      <meta:generator>Elwig {App.Version}</meta:generator>
+                      <meta:initial-creator>Elwig</meta:initial-creator>
+                      <dc:creator>Elwig</dc:creator>
+                      <meta:creation-date>{now}</meta:creation-date>
+                      <dc:date>{now}</dc:date>
+                     </office:meta>
+                    </office:document-meta>
+
+                    """);
+            }
+
+            var content = ZipArchive.CreateEntry("content.xml");
+            Content = new StreamWriter(content.Open(), Utils.UTF8);
+            await Content.WriteAsync("""
+                <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                <office:document-content xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3">
+                 <office:automatic-styles>
+                  <style:default-style style:family="table-cell">
+                   <style:text-properties fo:language="de" fo:country="AT"/>
+                  </style:default-style>
+                  <style:style style:name="default" style:family="table-cell">
+                   <style:table-cell-properties style:vertical-align="top"/>
+                  </style:style>
+
+                """);
+
+            for (int i = 1; i <= 100; i++) {
+                await Content.WriteAsync($"  <style:style style:name=\"col{i}mm\" style:family=\"table-column\"><style:table-column-properties style:column-width=\"{i}mm\"/></style:style>\r\n");
+            }
+
+            await Content.WriteAsync("""
+                  <style:style style:name="header" style:family="table-cell" style:parent-style-name="default">
+                   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
+                   <style:paragraph-properties fo:text-align="center"/>
+                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"  fo:font-size="16pt"/>
+                  </style:style>
+                  <style:style style:name="th" style:family="table-cell" style:parent-style-name="default">
+                   <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" style:vertical-align="middle"/>
+                   <style:paragraph-properties fo:text-align="center"/>
+                   <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
+                  </style:style>
+                  <number:number-style style:name="NN0"><number:number number:decimal-places="0" number:min-decimal-places="0" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N0" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN0"/>
+                  <number:number-style style:name="NN1"><number:number number:decimal-places="1" number:min-decimal-places="1" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N1" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN1"/>
+                  <number:number-style style:name="NN2"><number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N2" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN2"/>
+                  <number:number-style style:name="NN3"><number:number number:decimal-places="3" number:min-decimal-places="3" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N3" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN3"/>
+                  <number:number-style style:name="NN4"><number:number number:decimal-places="4" number:min-decimal-places="4" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N4" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN4"/>
+                  <number:number-style style:name="NN5"><number:number number:decimal-places="5" number:min-decimal-places="5" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N5" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN5"/>
+                  <number:number-style style:name="NN6"><number:number number:decimal-places="6" number:min-decimal-places="6" number:min-integer-digits="1"/></number:number-style>
+                  <style:style style:name="N6" style:family="table-cell" style:parent-style-name="default" style:data-style-name="NN6"/>
+                 </office:automatic-styles>
+                 <office:body>
+                  <office:spreadsheet>
+                   <table:calculation-settings table:case-sensitive="false" table:search-criteria-must-apply-to-whole-cell="true" table:use-wildcards="true" table:use-regular-expressions="false" table:automatic-find-labels="false"/>
+
+                """);
+        }
+
+        private async Task AddTrailer() {
+            if (Content == null) await AddHeader();
+            if (Content == null) return;
+
+            await Content.WriteAsync("""
+                  </office:spreadsheet>
+                 </office:body>
+                </office:document-content>
+
+                """);
+            Content.Close();
+            Content.Dispose();
+            Content = null;
+
+            var settings = ZipArchive.CreateEntry("settings.xml");
+            using (var writer = new StreamWriter(settings.Open(), Utils.UTF8)) {
+                await writer.WriteAsync("""
+                    <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+                    <office:document-settings xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.3">
+                     <office:settings>
+                      <config:config-item-set config:name="ooo:view-settings">
+                       <config:config-item-map-indexed config:name="Views">
+                        <config:config-item-map-entry>
+                         <config:config-item-map-named config:name="Tables">
+
+                    """);
+
+                foreach (var tbl in _tables) {
+                    await writer.WriteAsync($"""
+                              <config:config-item-map-entry config:name="{tbl}">
+                               <config:config-item config:name="VerticalSplitMode" config:type="short">2</config:config-item>
+                               <config:config-item config:name="VerticalSplitPosition" config:type="int">4</config:config-item>
+                               <config:config-item config:name="PositionBottom" config:type="int">4</config:config-item>
+                              </config:config-item-map-entry>
+
+                        """);
+                }
+
+                await writer.WriteAsync("""
+                         </config:config-item-map-named>
+                        </config:config-item-map-entry>
+                       </config:config-item-map-indexed>
+                      </config:config-item-set>
+                     </office:settings>
+                    </office:document-settings>
+
+                    """);
+            }
+        }
+
+        public async Task AddTable<T>(DataTable<T> table, bool mergeSubRowCells = true) {
+            if (Content == null) await AddHeader();
+            if (Content == null) return;
+            var totalSpan = table.ColumnSpans.Sum();
+
+            _tables.Add(table.Name);
+            await Content.WriteAsync($"    <table:table table:name=\"{table.Name}\" table:default-cell-style-name=\"default\">\r\n");
+            foreach (var (s, w) in table.ColumnSpans.Zip(table.ColumnWidths)) {
+                for (int i = 0; i < s; i++) {
+                    await Content.WriteAsync("     <table:table-column" + (w != null ? $" table:style-name=\"col{(int)(w / s)}mm\"" : "") + "/>\r\n");
+                }
+            }
+
+            await Content.WriteAsync(
+                $"     <table:table-row>\r\n" +
+                FormatCell(table.FullName, colSpan: totalSpan, style: "header") +
+                $"     </table:table-row>\r\n" +
+                $"     <table:table-row>\r\n" +
+                $"      <table:table-cell table:number-columns-repeated=\"{totalSpan}\"/>\r\n" +
+                $"     </table:table-row>\r\n" +
+                $"     <table:table-row>\r\n");
+            foreach (var (name, span, units) in table.ColumnNames.Zip(table.ColumnSpans, table.ColumnUnits)) {
+                var hasUnits = units.Length > 0;
+                await Content.WriteAsync(FormatCell(name, colSpan: span, rowSpan: hasUnits ? 1 : 2, style: "th"));
+            }
+            await Content.WriteAsync("     </table:table-row>\r\n     <table:table-row>\r\n");
+            foreach (var (span, units) in table.ColumnSpans.Zip(table.ColumnUnits)) {
+                if (units.Length == 0) {
+                    await Content.WriteAsync($"      <table:covered-table-cell table:number-columns-repeated=\"{span}\"/>\r\n");
+                    continue;
+                }
+                foreach (var u in units) {
+                    await Content.WriteAsync(FormatCell(u == null ? null : $"[{u}]", style: "th"));
+                }
+            }
+            await Content.WriteAsync("     </table:table-row>\r\n");
+
+            foreach (var row in table.GetData()) {
+                await FormatRow(row, table.ColumnUnits, mergeSubRowCells);
+            }
+
+            await Content.WriteAsync("    </table:table>\r\n");
+        }
+
+        protected async Task FormatRow(IEnumerable<object?> row, IEnumerable<string?[]?> colUnits, bool mergeSubRowCells) {
+            if (Content == null) throw new InvalidOperationException();
+            var arrays = row.Where(c => c is Array).Cast<Array>().Select(c => c.Length).ToArray();
+            int rowNum = Math.Max(1, arrays.Length > 0 ? arrays.Max() : 0);
+            for (int i = 0; i < rowNum; i++) {
+                await Content.WriteAsync("     <table:table-row>\r\n");
+                foreach (var (data, units) in row.Zip(colUnits)) {
+                    if (data is Array a) {
+                        await Content.WriteAsync(i < a.Length ? FormatCell(a.GetValue(i), units: units) : $"      <table:table-cell table:number-columns-repeated=\"{GetSubCols(a.GetType().GetElementType())}\"/>\r\n");
+                    } else if (!mergeSubRowCells) {
+                        await Content.WriteAsync(FormatCell(data, units: units));
+                    } else {
+                        await Content.WriteAsync(FormatCell(data, rowSpan: i == 0 ? rowNum : 1, isCovered: i > 0, units: units));
+                    }
+                }
+                await Content.WriteAsync("     </table:table-row>\r\n");
+            }
+        }
+
+        private static int GetSubCols(Type? type) {
+            if (type != null && type.IsValueType == true && type.Name.StartsWith("ValueTuple"))
+                return type.GetFields().Length;
+            return 1;
+        }
+
+        protected static string FormatCell(object? data, int rowSpan = 1, int colSpan = 1, string? style = "default", bool isCovered = false, string?[]? units = null) {
+            if (data?.GetType().IsValueType == true && data.GetType().Name.StartsWith("ValueTuple"))
+                return string.Join("", data.GetType().GetFields().Zip(units ?? Array.Empty<string?>())
+                    .Select(p => FormatCell(p.First.GetValue(data), rowSpan, colSpan, style, isCovered, new[] { p.Second }))
+                );
+
+            var add = (style != null ? $" table:style-name=\"{style}\"" : "") + (rowSpan > 1 || colSpan > 1 ? $" table:number-rows-spanned=\"{rowSpan}\" table:number-columns-spanned=\"{colSpan}\"" : "");
+            string ct = isCovered ? "table:covered-table-cell" : "table:table-cell";
+            var isPercent = units != null && units.Length > 0 && units[0] == "%";
+
+            string c;
+            if (data == null) {
+                c = $"<{ct}{add}/>";
+            } else if (data is float || data is double || data is byte || data is char ||
+                       data is short || data is ushort || data is int || data is uint || data is long || data is ulong) {
+                double v = double.Parse(data?.ToString() ?? "0");  // use default culture for ToString and Parse()!
+                if (units != null && units.Length > 0) {
+                    int n = -1;
+                    switch (units[0]) {
+                        case "%": n = 1; data = $"{v:N1}"; break;
+                        case "°KMW": n = 1; data = $"{v:N1}"; break;
+                        case "°Oe": n = 0; data = $"{v:N0}"; break;
+                    }
+                    if (n >= 0) add = string.Join(" ", add.Split(" ").Select(p => p.StartsWith("table:style-name=") ? $"table:style-name=\"N{n}\"" : p));
+                }
+                c = $"<{ct} office:value-type=\"float\" calcext:value-type=\"float\" office:value=\"{v.ToString(CultureInfo.InvariantCulture)}\"{add}><text:p>{data}</text:p></{ct}>";
+            } else {
+                c = $"<{ct} office:value-type=\"string\" calcext:value-type=\"string\"{add}><text:p>{data}</text:p></{ct}>";
+            }
+
+            return $"      {c}\r\n" + (colSpan > 1 ? $"      <table:covered-table-cell table:number-rows-repeated=\"{colSpan - 1}\"/>\r\n" : "");
+        }
+    }
+}

Elwig/Helpers/IAddress.cs

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

Elwig/Helpers/NullItem.cs

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

Elwig/Helpers/Printing/Html.cs

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

Elwig/Helpers/Printing/Pdf.cs

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

Elwig/Helpers/TempFile.cs

@@ -5,6 +5,7 @@ namespace Elwig.Helpers {
     public sealed class TempFile : IDisposable {
         private int Usages = 0;
         public string FilePath { get; private set; }
+        public string FileName => Path.GetFileName(FilePath);
 
         public TempFile() : this(null) { }
 

Elwig/Helpers/Utils.cs

@@ -10,11 +10,16 @@ using System.Net.Sockets;
 using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
-using Elwig.Models;
+using Elwig.Models.Entities;
+using System.IO;
+using ScottPlot.TickGenerators.TimeUnits;
+using Elwig.Helpers.Billing;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
 
+        public static readonly Encoding UTF8 = new UTF8Encoding(false, true);
+
         public static int CurrentYear => DateTime.Now.Year;
         public static int CurrentNextSeason => DateTime.Now.Year - (DateTime.Now.Month <= 3 ? 1 : 0);
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
@@ -22,9 +27,10 @@ namespace Elwig.Helpers {
 
         public static readonly Regex SerialRegex = GeneratedSerialRegex();
         public static readonly Regex TcpRegex = GeneratedTcpRegex();
-        public static readonly Regex PartialDateRegex = GeneratedPartialDateRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
         public static readonly Regex FromToRegex = GeneratedFromToRegex();
         public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
+        public static readonly Regex AddressRegex = GeneratedAddressRegex();
 
         [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedSerialRegex();
@@ -32,8 +38,8 @@ namespace Elwig.Helpers {
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
 
-        [GeneratedRegex(@"^(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.$", RegexOptions.Compiled)]
+        [GeneratedRegex(@"^(-?(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
-        private static partial Regex GeneratedPartialDateRegex();
+        private static partial Regex GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();
@@ -41,6 +47,22 @@ namespace Elwig.Helpers {
         [GeneratedRegex(@"^([0-9]{1,2}:[0-9]{2})?-([0-9]{1,2}:[0-9]{2})?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToTimeRegex();
 
+        [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
+        private static partial Regex GeneratedAddressRegex();
+
+        public static readonly string GroupSeparator = "\u202F";
+        public static readonly string UnitSeparator = "\u00A0";
+
+        public static readonly KeyValuePair<string, string>[] PhoneNrTypes = [
+            new("landline", "Tel.-Nr. (Festnetz)"),
+            new("mobile", "Tel.-Nr. (mobil)"),
+            new("fax", "Fax-Nr."),
+        ];
+
+        public static string PhoneNrTypeToString(string type) {
+            return PhoneNrTypes.Where(t => t.Key == type).Select(t => t.Value).FirstOrDefault(type);
+        }
+
         private static readonly ushort[] Crc16ModbusTable = {
             0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
             0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
@@ -140,6 +162,10 @@ namespace Elwig.Helpers {
             return CalcCrc16Modbus(Encoding.ASCII.GetBytes(data));
         }
 
+        public static string FormatIban(string iban) {
+            return Regex.Replace(iban, ".{4}", "$0 ");
+        }
+
         public static void RunBackground(string title, Func<Task> a) {
             Task.Run(async () => {
                 try {
@@ -151,8 +177,12 @@ namespace Elwig.Helpers {
         }
 
         public static void MailTo(string emailAddress) {
+            MailTo(new string[] { emailAddress });
+        }
+
+        public static void MailTo(IEnumerable<string> emailAddresses) {
             Process.Start(new ProcessStartInfo() {
-                FileName = $"mailto:{emailAddress}",
+                FileName = $"mailto:{string.Join(",%20", emailAddresses)}",
                 UseShellExecute = true,
             });
         }
@@ -187,34 +217,33 @@ namespace Elwig.Helpers {
             if (!searchKeywords.Any())
                 return 0;
 
-            return words
+            return searchKeywords
-                .Select(w => {
+                .Select(k => {
-                    w = w?.ToLower();
+                    k = k.ToLower();
-                    var p = w?.ToLower()?.Split(" ");
+                    var scores = words.Select(w => {
-                    if (w == null || p == null)
+                        w = w?.ToLower();
-                        return 0;
+                        var p = w?.ToLower()?.Split(" ");
-
+                        if (w == null || p == null) {
-                    var t1 = searchKeywords.Where(f => w == f).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
+                            return 0;
-                    var t2 = searchKeywords.Where(f => p.Any(a => a == f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
+                        } else if (k == w) {
-                    var t3 = searchKeywords.Where(f => p.Any(a => a.StartsWith(f))).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
+                            return 4 + k.Length;
-                    var t4 = searchKeywords.Where(f => w.Contains(f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
+                        } else if (p.Any(a => a == k)) {
-                    if (t1 > 0) {
+                            return 3 + k.Length;
-                        return 4 + t1;
+                        } else if (p.Any(a => a.StartsWith(k))) {
-                    } else if (t2 > 0) {
+                            return 2 + k.Length;
-                        return 3 + t2;
+                        } else if (w.Contains(k)) {
-                    } else if (t3 > 0) {
+                            return 1 + k.Length;
-                        return 2 + t3;
+                        } else {
-                    } else if (t4 > 0) {
+                            return 0;
-                        return 1 + t4;
+                        }
-                    } else {
+                    });
-                        return 0;
+                    return scores.Max() + scores.Count(s => s > 0);
-                    }
                 })
                 .Sum();
         }
 
-        public static (int, string?)? ShowManualWeighingDialog() {
+        public static (int, string?)? ShowManualWeighingDialog(string? reason = null) {
-            var d = new ManualWeighingDialog();
+            var d = new ManualWeighingDialog(reason);
             return d.ShowDialog() == true ? (d.Weight, d.Reason) : null;
         }
 
@@ -292,5 +321,67 @@ namespace Elwig.Helpers {
         public static string GenerateLsNr(Delivery d) => GenerateLsNr(d.Date, d.ZwstId, d.LNr);
 
         public static string GenerateLsNr(DateOnly date, string zwstid, int lnr) => $"{date:yyyyMMdd}{zwstid}{lnr:000}";
+
+        public static (string, string?) SplitAddress(string address) {
+            var m = AddressRegex.Match(address);
+            return (m.Groups[1].Value, m.Groups[2].Value);
+        }
+
+        public static (string, string?) SplitName(string fullName, string? familyName) {
+            if (familyName == null || familyName == "") return (fullName, null);
+            var p0 = fullName.ToLower().IndexOf(familyName.ToLower());
+            if (p0 == -1) return (fullName, null);
+            var p1 = fullName.IndexOf(" und ");
+            var p2 = fullName.ToLower().LastIndexOf(" und ");
+            if (p1 != p2) {
+                if (p0 > p1) {
+                    // A und B familyName [und ...]
+                    return (fullName[p0..^0], fullName[0..(p0 - 1)]);
+                } else {
+                    // familyName und ... A und B
+                    var p3 = fullName.LastIndexOf(' ', p2 - 1);
+                    return (fullName[0..p3], fullName[(p3 + 1)..^0]);
+                }
+            } else {
+                return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            }
+        }
+
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
+            HashSet<IEnumerable<T>> output = new();
+            for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
+                List<T> t = new();
+                for (int j = 0; j < 30; j++) {
+                    var e = input.ElementAtOrDefault(j);
+                    if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
+                        t.Add(e);
+                    }
+                }
+                output.Add(t);
+            }
+            return output.OrderByDescending(l => l.Count());
+        }
+
+        public static List<string> GetAttributeVarieties(AppDbContext ctx, int year, bool withSlash = false) {
+            return ctx.DeliveryParts
+               .Where(d => d.Year == year)
+               .Select(d => $"{d.SortId}{(withSlash ? "/" : "")}{d.AttrId}")
+               .Distinct()
+               .ToList()
+               .Union(ctx.WineVarieties.Select(v => v.SortId))
+               .ToList();
+        }
+
+        public static List<ContractSelection> GetContractsForYear(AppDbContext ctx, int year) {
+            return ctx.DeliveryParts
+                .Where(p => p.Year == year)
+                .Select(d => new ContractSelection(d.Variant, d.Attribute))
+                .Distinct()
+                .ToList()
+                .Union(ctx.WineVarieties.Select(v => new ContractSelection(v, null)))
+                .DistinctBy(c => c.Listing)
+                .Order()
+                .ToList();
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -2,21 +2,21 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Controls;
-using Elwig.Models;
+using Elwig.Models.Entities;
 
 namespace Elwig.Helpers {
     public static class Validator {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
             { "43", new string[][] {
-                Array.Empty<string>(),
+                [],
-                new string[] { "57", "59" },
+                ["57", "59"],
-                new string[] {
+                [
                     "50", "517", "718", "804", "720", "780", "800", "802", "810",
                     "820", "821", "828", "900", "901", "930", "931", "939",
                     "650", "651", "652", "653", "655", "657", "659", "660", "661",
                     "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
-                }
+                ]
             } },
             { "49", Array.Empty<string[]>() },
             { "48", Array.Empty<string[]>() },
@@ -63,16 +63,18 @@ namespace Elwig.Helpers {
             return CheckDecimal(input, required, -1, -1);
         }
 
-        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal) {
+        public static ValidationResult CheckDecimal(TextBox input, bool required, int maxLen, int maxDecimal, bool allowMinus = false) {
             string text = "";
             int pos = input.CaretIndex;
             int v1 = 0, v2 = -1;
             for (int i = 0; i < input.Text.Length; i++) {
                 char ch = input.Text[i];
-                if (char.IsAsciiDigit(ch)) {
+                if (ch == '-' && i == 0 && allowMinus) {
-                    if (v2 == -1 && v1 < maxLen) {
+                    text += ch;
+                } else if (char.IsAsciiDigit(ch)) {
+                    if (v2 == -1 && (maxLen == -1 || v1 < maxLen)) {
                         text += ch; v1++;
-                    } else if (v2 != -1 && v2 < maxDecimal) {
+                    } else if (v2 != -1 && (maxDecimal == -1 || v2 < maxDecimal)) {
                         text += ch; v2++;
                     }
                 } else if (v2 == 0-1 && ch == ',' || ch == '.') {
@@ -160,7 +162,7 @@ namespace Elwig.Helpers {
                     if (text.StartsWith("+43 ")) {
                         var nr = text[4..];
                         var vws = PHONE_NRS["43"];
-                        if (!text.EndsWith(" ") && v >= 4 && v - 4 < vws.Length && vws[v - 4].Any(vw => nr.StartsWith(vw))) {
+                        if (!text.EndsWith(' ') && v >= 4 && v - 4 < vws.Length && vws[v - 4].Any(vw => nr.StartsWith(vw))) {
                             text += ' ';
                         } else if (nr == "1") {
                             text += ' ';
@@ -318,18 +320,24 @@ namespace Elwig.Helpers {
                 return new(true, null);
             } else if (input.Text.Length != 7) {
                 return new(false, "Betriebsnummer zu kurz");
+            } else if (!CheckLfbisNr(input.Text)) {
+                return new(false, "Prüfsumme der Betriebsnummer ist falsch");
+            } else {
+                return new(true, null);
             }
+        }
+
+        public static bool CheckLfbisNr(string nr) {
+            if (nr.Length != 7 || !nr.All(char.IsAsciiDigit))
+                return false;
 
             // https://statistik.at/fileadmin/shared/QM/Standarddokumentationen/RW/std_r_land-forstw_register.pdf#page=41
             int s = 0, v;
             for (int i = 0; i < 6; i++)
-                s += (input.Text[i] - '0') * (7 - i);
+                s += (nr[i] - '0') * (7 - i);
             v = (11 - (s % 11)) % 10;
 
-            if (v != (input.Text[6] - '0'))
+            return v == (nr[6] - '0');
-                return new(false, "Prüfsumme der Betriebsnummer ist falsch");
-
-            return new(true, null);
         }
 
         public static ValidationResult CheckUstIdNr(TextBox input, bool required) {
@@ -371,17 +379,11 @@ namespace Elwig.Helpers {
                 return required ? new(false, "UID ist nicht optional") : new(true, null);
 
             if (text.StartsWith("AT")) {
-                if (text.Length != 11 || text[2] != 'U')
+                if (text.Length != 11 || text[2] != 'U') {
                     return new(false, "UID ist ungültig");
-
+                } else if (!CheckUstIdNr(text)) {
-                // http://www.pruefziffernberechnung.de/U/USt-IdNr.shtml
-                int s = 0, v = 0;
-                for (int i = 0; i < 7; i++)
-                    s += ((text[i + 3] - '0') * (i % 2 + 1)).ToString().Select(ch => ch - '0').Sum();
-                v = (96 - s) % 10;
-
-                if (v != (text[10] - '0'))
                     return new(false, "Prüfsumme der UID ist falsch");
+                }
             } else {
                 return new(false, "Not implemented yet");
             }
@@ -389,6 +391,26 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static bool CheckUstIdNr(string nr) {
+            if (nr.Length < 4 || nr.Length > 14 || !nr.All(char.IsAsciiLetterOrDigit))
+                return false;
+
+            if (nr.StartsWith("AT")) {
+                if (nr.Length != 11 || nr[2] != 'U')
+                    return false;
+
+                // http://www.pruefziffernberechnung.de/U/USt-IdNr.shtml
+                int s = 0, v = 0;
+                for (int i = 0; i < 7; i++)
+                    s += ((nr[i + 3] - '0') * (i % 2 + 1)).ToString().Select(ch => ch - '0').Sum();
+                v = (96 - s) % 10;
+
+                return v == (nr[10] - '0');
+            } else {
+                return false;
+            }
+        }
+
         public static ValidationResult CheckMgNr(TextBox input, bool required, AppDbContext ctx) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {
@@ -521,6 +543,36 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
+        public static ValidationResult CheckTime(TextBox input, bool required) {
+            string text = "";
+            int pos = input.CaretIndex;
+            int v = 0;
+            for (int i = 0; i < input.Text.Length; i++) {
+                char ch = input.Text[i];
+                if (v >= 0 && v < 5 && v != 2 && char.IsAsciiDigit(ch)) {
+                    if ((v == 0 && ch <= '2') || (v == 1 && (text[0] < '2' || ch <= '3')) || (v == 3 && ch <= '5') || v == 4) {
+                        text += ch;
+                        v++;
+                    }
+                } else if (v == 2 && ch == ':') {
+                    text += ch;
+                    v++;
+                }
+                if (i == input.CaretIndex - 1)
+                    pos = text.Length;
+            }
+            input.Text = text;
+            input.CaretIndex = pos;
+
+            if (text.Length == 0) {
+                return required ? new(false, "Wert ist nicht optional") : new(true, null);
+            } else if (v != 5) {
+                return new(false, "Zeit ist ungültig");
+            } else {
+                return new(true, null);
+            }
+        }
+
         public static ValidationResult CheckFbNr(TextBox input, bool required, AppDbContext ctx, AreaCom? c) {
             var res = CheckInteger(input, required);
             if (!res.IsValid) {

Elwig/Helpers/Weighing/InvalidScale.cs

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

Elwig/Models/AreaComType.cs

@@ -1,51 +0,0 @@
-using Elwig.Helpers;
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Elwig.Models {
-    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]
-    public class AreaComType {
-        [Column("vtrgid")]
-        public string VtrgId { get; set; }
-
-        [Column("sortid")]
-        public string SortId { get; set; }
-
-        [Column("attrid_1")]
-        public string? AttrId1 { get; set; }
-
-        [Column("attrid_2")]
-        public string? AttrId2 { get; set; }
-
-        [Column("disc")]
-        public string? Discriminator { get; set; }
-
-        [Column("min_kg_per_ha")]
-        public int? MinKgPerHa { get; set; }
-
-        [Column("max_kg_per_ha")]
-        public int? MaxKgPerHa { get; set; }
-
-        [Column("penalty_amount")]
-        public long? PenaltyAmoutValue { get; set; }
-
-        [NotMapped]
-        public decimal? PenaltyAmount {
-            get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
-            set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
-        }
-
-        [ForeignKey("SortId")]
-        public virtual WineVar WineVar { get; private set; }
-
-        [ForeignKey("AttrId1")]
-        public virtual WineAttr? WineAttr1 { get; private set; }
-
-        [ForeignKey("AttrId2")]
-        public virtual WineAttr? WineAttr2 { get; private set; }
-
-        [NotMapped]
-        public string DisplayName => WineVar.Name + (WineAttr1 != null ? $" {WineAttr1.Name}" : "") +
-            (WineAttr2 != null ? $" {WineAttr2.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
-    }
-}

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -0,0 +1,105 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class AreaComUnderDeliveryData : DataTable<AreaComUnderDeliveryRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("VtrgIds", "Vertrag", null, 14),
+            ("Areas", "Fläche", "m²", 16),
+            ("DeliveryObligations", "Lieferpflicht", "kg", 22),
+            ("Weights", "Geliefert", "kg", 22),
+            ("UnderDeliveries", "Unterliefert", "kg|%", 34),
+        };
+
+        public AreaComUnderDeliveryData(IEnumerable<AreaComUnderDeliveryRow> rows, int year) :
+            base($"Unterlieferungen FB", $"Unterlieferungen laut Flächenbindungen {year}", rows, FieldNames) {
+        }
+
+        public static async Task<AreaComUnderDeliveryData> ForSeason(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
+            return new AreaComUnderDeliveryData(
+                (await FromDbSet(table, year)).GroupBy(
+                    r => r.MgNr,
+                    (k, g) => new AreaComUnderDeliveryRow(g)
+              ), year);
+        }
+
+        private static async Task<IEnumerable<AreaComUnderDeliveryRowSingle>> FromDbSet(DbSet<AreaComUnderDeliveryRowSingle> table, int year) {
+            return await table.FromSqlRaw($"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address,
+                           c.bucket, c.area, u.min_kg, u.weight
+                    FROM member m
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                        LEFT JOIN v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
+                        JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
+                    WHERE m.active = 1
+                    ORDER BY m.mgnr, c.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class AreaComUnderDeliveryRow {
+        public int MgNr;
+        public string Name;
+        public string GivenName;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] VtrgIds;
+        public int[] Areas;
+        public int[] DeliveryObligations;
+        public int[] Weights;
+        public (int? Kg, double? Percent)[] UnderDeliveries => Weights.Zip(DeliveryObligations)
+            .Select(v => v.First < v.Second ? ((int?, double?))(v.First - v.Second, v.First * 100.0 / v.Second - 100.0) : (null, null))
+            .ToArray();
+
+        public AreaComUnderDeliveryRow(IEnumerable<AreaComUnderDeliveryRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name = f.Name;
+            GivenName = f.GivenName;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            VtrgIds = rows.Select(r => r.VtrgId).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            DeliveryObligations = rows.Select(r => r.DeliveryObligation).ToArray();
+            Weights = rows.Select(r => r.Weight).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class AreaComUnderDeliveryRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string Locality { get; set; }
+        [Column("bucket")]
+        public string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("min_kg")]
+        public int DeliveryObligation { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Models/Dtos/CreditNoteData.cs

@@ -0,0 +1,162 @@
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class CreditNoteData : DataTable<CreditNoteRow> {
+
+        private static readonly (string, string, string?)[] FieldNames = new[] {
+            ("", "", (string?)null), // TODO
+        };
+
+        private readonly int Year;
+        private readonly int? TgNr;
+        private readonly int? AvNr;
+        private readonly int? MgNr;
+
+        private CreditNoteData(IEnumerable<CreditNoteRow> rows, int year, int? tgnr, int? avnr = null, int? mgnr = null) :
+            base($"Traubengutschrift {year}/{tgnr}", rows, FieldNames) {
+            Year = year;
+            TgNr = tgnr;
+            AvNr = avnr;
+            MgNr = mgnr;
+        }
+
+        public static async Task<IDictionary<int, CreditNoteData>> ForPaymentVariant(DbSet<CreditNoteRowSingle> table, DbSet<Season> seasons, int year, int avnr) {
+            return (await FromDbSet(table, year, avnr))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr, r.DId, r.DPNr },
+                    (k, g) => new CreditNoteRow(g, seasons))
+                .GroupBy(
+                    r => new { r.Year, r.AvNr, r.MgNr, r.TgNr },
+                    (k, g) => new CreditNoteData(g, k.Year, k.TgNr, mgnr: k.MgNr))
+                .ToDictionary(d => d.MgNr ?? 0);
+        }
+
+        private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int? year = null, int? avnr = null, int? mgnr = null) {
+            var y = year?.ToString() ?? "NULL";
+            var v = avnr?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            return await table.FromSqlRaw($"""
+                SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
+                       b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
+                       s.name AS variant, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
+                FROM v_delivery d
+                    JOIN wine_variety s ON s.sortid = d.sortid
+                    LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                    JOIN wine_quality_level q ON q.qualid = d.qualid
+                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                    LEFT JOIN payment_variant v ON v.year = d.year
+                    LEFT JOIN payment_delivery_part p ON (p.year, p.did, p.dpnr, p.avnr) = (d.year, d.did, d.dpnr, v.avnr)
+                    LEFT JOIN payment_delivery_part_bucket pb ON (pb.year, pb.did, pb.dpnr, pb.bktnr, pb.avnr) = (b.year, b.did, b.dpnr, b.bktnr, v.avnr)
+                    LEFT JOIN credit c ON (c.year, c.avnr, c.mgnr) = (d.year, v.avnr, d.mgnr)
+                WHERE b.value > 0 AND (d.year = {y} OR {y} IS NULL) AND (v.avnr = {v} OR {v} IS NULL) AND (d.mgnr = {m} OR {m} IS NULL)
+                ORDER BY d.year, v.avnr, d.mgnr, d.lsnr, d.dpnr
+                """).ToListAsync();
+        }
+    }
+
+    public class CreditNoteRow {
+
+        public int Year;
+        public int? TgNr;
+        public int AvNr;
+        public int MgNr;
+
+        public string LsNr;
+        public int DPNr;
+        public string Variant;
+        public string? Attribute;
+        public string[] Modifiers;
+        public string QualityLevel;
+        public (double Oe, double Kmw) Gradation;
+        public (string Name, int Value, decimal? Price, decimal? Amount)[] Buckets;
+        public decimal? TotalModifiers;
+        public decimal? Amount;
+
+        public CreditNoteRow(IEnumerable<CreditNoteRowSingle> rows, DbSet<Season> seasons) {
+            var f = rows.First();
+            Year = f.Year;
+            TgNr = f.TgNr;
+            MgNr = f.MgNr;
+            var season = seasons.Find(Year);
+
+            LsNr = f.LsNr;
+            DPNr = f.DPNr;
+            Variant = f.Variant;
+            Attribute = f.Attribute;
+            var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
+                .Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
+                .Where(m => m != null)
+                .OrderBy(m => m.Ordering)
+                .ToList();
+            Modifiers = modifiers.Select(m => m.Name).ToArray();
+            QualityLevel = f.QualityLevel;
+            Gradation = (f.Oe, f.Kmw);
+            Buckets = rows
+                .Where(b => b.Value > 0)
+                .OrderByDescending(b => b.BktNr)
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {f.SortId}{b.Discr}", b.Value,
+                              b.Price != null ? season?.DecFromDb((long)b.Price) : null,
+                              b.Amount != null ? season?.DecFromDb((long)b.Amount) : null))
+                .ToArray();
+            Amount = f.TotalAmount != null ? season?.DecFromDb((long)f.TotalAmount) : null;
+            var netAmount = f.NetAmount != null ? season?.DecFromDb((long)f.NetAmount) : null;
+            TotalModifiers = Amount - netAmount;
+        }
+    }
+
+    [Keyless]
+    public class CreditNoteRowSingle {
+        [Column("year")]
+        public int Year { get; set; }
+        [Column("tgnr")]
+        public int? TgNr { get; set; }
+        [Column("avnr")]
+        public int? AvNr { get; set; }
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("did")]
+        public int DId { get; set; }
+        [Column("lsnr")]
+        public string LsNr { get; set; }
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+        [Column("modifiers")]
+        public string? Modifiers { get; set; }
+        [Column("bktnr")]
+        public int BktNr { get; set; }
+        [Column("sortid")]
+        public string SortId { get; set; }
+        [Column("discr")]
+        public string Discr { get; set; }
+        [Column("value")]
+        public int Value { get; set; }
+        [Column("price")]
+        public long? Price { get; set; }
+        [Column("amount")]
+        public long? Amount { get; set; }
+        [Column("net_amount")]
+        public long? NetAmount { get; set; }
+        [Column("total_amount")]
+        public long? TotalAmount { get; set; }
+        [Column("variant")]
+        public string Variant { get; set; }
+        [Column("attribute")]
+        public string? Attribute { get; set; }
+        [Column("quality_level")]
+        public string QualityLevel { get; set; }
+        [Column("oe")]
+        public double Oe { get; set; }
+        [Column("kmw")]
+        public double Kmw { get; set; }
+    }
+}

Elwig/Models/Dtos/DataTable.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace Elwig.Models.Dtos {
+    public class DataTable<T> {
+
+        public string Name { get; set; }
+        public string FullName { get; set; }
+        public IEnumerable<T> Rows { get; private set; }
+        public int RowNum => Rows.Count();
+        public int ColNum => ColumnNames.Count();
+
+        public IEnumerable<(string, Type?)> ColumnDefs => _map.Select(m => (m.Item1, m.Item2?.PropertyType ?? m.Item3?.FieldType));
+        public IEnumerable<string> ColumnNames => ColumnDefs.Select(m => m.Item1);
+        public IEnumerable<Type?> ColumnTypes => ColumnDefs.Select(m => m.Item2);
+        public IEnumerable<Type?> ColumnFlatTypes { get; private set; }
+        public IEnumerable<int> ColumnSpans { get; private set; }
+        public IEnumerable<int?> ColumnWidths { get; private set; }
+        public IEnumerable<string?[]> ColumnUnits { get; private set; }
+
+        private readonly PropertyInfo[] _properties;
+        private readonly FieldInfo[] _fields;
+        private readonly (string, PropertyInfo?, FieldInfo?)[] _map;
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) {
+            _fields = typeof(T).GetFields();
+            _properties = typeof(T).GetProperties();
+            colNames ??= _properties.Select(p => p.Name).Union(_fields.Select(f => f.Name)).Select(i => (i, i, (string?)null, (int?)null)).ToList();
+            _map = colNames.Select(n => (n.Item2, _properties.FirstOrDefault(p => p?.Name == n.Item1, null), _fields.FirstOrDefault(f => f?.Name == n.Item1, null))).ToArray();
+            Name = name;
+            FullName = fullName;
+            Rows = rows;
+            ColumnFlatTypes = ColumnTypes.SelectMany(type => {
+                var elType = type?.GetElementType();
+                return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Select(f => f.FieldType) :
+                       type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Select(f => f.FieldType) :
+                       new Type?[] { type };
+            }).ToList();
+            ColumnSpans = ColumnTypes.Select(type => {
+                var elType = type?.GetElementType();
+                return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Length :
+                       type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Length : 1;
+            }).ToList();
+            ColumnWidths = colNames.Select(c => c.Item4).ToList();
+            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? Array.Empty<string?>()).ToList();
+        }
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :
+            this(name, fullName, rows, colNames?.Select(c => (c.Item1, c.Item2, c.Item3, (int?)null))) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?, int?)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, IEnumerable<T> rows, IEnumerable<(string, string, string?, int)>? colNames = null) :
+            this(name, name, rows, colNames) {
+        }
+
+        public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?, int)>? colNames = null) :
+            this(name, fullName, rows, colNames?.Select(c => (c.Item1, c.Item2, c.Item3, (int?)c.Item4))) {
+        }
+
+        protected IEnumerable<(string, object?)> GetNamedRowData(T row) {
+            return _map.Select(i => (i.Item1, i.Item2?.GetValue(row) ?? i.Item3?.GetValue(row)));
+        }
+
+        protected IEnumerable<object?> GetRowData(T row) {
+            return GetNamedRowData(row).Select(i => i.Item2);
+        }
+
+        public IEnumerable<IEnumerable<object?>> GetData() {
+            return Rows.Select(GetRowData);
+        }
+
+        public IEnumerable<IEnumerable<(string, object?)>> GetNamedData() {
+            return Rows.Select(GetNamedRowData);
+        }
+    }
+}

Elwig/Models/Dtos/DeliveryConfirmationData.cs

@@ -0,0 +1,101 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class DeliveryConfirmationData : DataTable<DeliveryConfirmationRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("LsNr", "LsNr.", null, 26),
+            ("DPNr", "Pos.", null, 8),
+            ("Variant", "Sorte", null, 40),
+            ("Attribute", "Attribut", null, 20),
+            ("Modifiers", "Zu-/Abschläge", null, 30),
+            ("QualityLevel", "Qualitätsstufe", null, 25),
+            ("Gradation", "Gradation", "°Oe|°KMW", 32),
+            ("Buckets", "Flächenbindung", "|kg", 36),
+            ("Weight", "Gewicht", "kg", 16),
+        };
+
+        private readonly int MgNr;
+
+        private DeliveryConfirmationData(IEnumerable<DeliveryConfirmationRow> rows, int year, Member m) :
+            base($"Anlieferungsbestätigung", $"Anlieferungsbestätigung {year} – {m.AdministrativeName}", rows, FieldNames) {
+            MgNr = m.MgNr;
+        }
+
+        public static DeliveryConfirmationData CreateEmpty(int year, Member m) {
+            return new([], year, m);
+        }
+
+        public static async Task<IDictionary<int, DeliveryConfirmationData>> ForSeason(DbSet<DeliveryPart> table, int year) {
+            return (await FromDbSet(table, year))
+                .GroupBy(
+                    p => p.Delivery.Member,
+                    p => new DeliveryConfirmationRow(p),
+                    (k, g) => new DeliveryConfirmationData(g, year, k)
+                ).ToDictionary(d => d.MgNr, d => d);
+        }
+
+        public static async Task<DeliveryConfirmationData> ForMember(DbSet<DeliveryPart> table, int year, Member m) {
+            return new DeliveryConfirmationData((await FromDbSet(table, year, m.MgNr)).Select(p => new DeliveryConfirmationRow(p)), year, m);
+        }
+
+        private static async Task<IEnumerable<DeliveryPart>> FromDbSet(DbSet<DeliveryPart> table, int? year = null, int? mgnr = null) {
+            var y = year?.ToString() ?? "NULL";
+            var m = mgnr?.ToString() ?? "NULL";
+            IQueryable<DeliveryPart> q = table;
+            if (year != null) q = q.Where(p => p.Year == year);
+            if (mgnr != null) q = q.Where(p => p.Delivery.MgNr == mgnr);
+            await q
+                 .Include(p => p.Delivery)
+                 .Include(p => p.Variant)
+                 .Include(p => p.Attribute)
+                 .Include(p => p.Quality)
+                 .Include(p => p.Buckets)
+                 .Include(p => p.PartModifiers)
+                 .ThenInclude(m => m.Modifier)
+                 .LoadAsync();
+            return await table.FromSqlRaw($"""
+                    SELECT p.*
+                    FROM v_delivery v
+                        JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                    WHERE (p.year = {y} OR {y} IS NULL) AND (v.mgnr = {m} OR {m} IS NULL)
+                    ORDER BY p.year, v.mgnr, v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
+                    """).ToListAsync();
+        }
+    }
+
+    public class DeliveryConfirmationRow {
+        public string LsNr;
+        public int DPNr;
+        public string Variant;
+        public string? Attribute;
+        public string QualityLevel;
+        public (double Oe, double Kmw) Gradation;
+        public string[] Modifiers;
+        public int Weight;
+        public (string Name, int Value)[] Buckets;
+
+        public DeliveryConfirmationRow(DeliveryPart p) {
+            var d = p.Delivery;
+            LsNr = d.LsNr;
+            DPNr = p.DPNr;
+            Variant = p.Variant.Name;
+            Attribute = p.Attribute?.Name;
+            QualityLevel = p.Quality.Name;
+            Gradation = (p.Oe, p.Kmw);
+            Modifiers = p.Modifiers
+                .Select(m => m.Name)
+                .ToArray();
+            Weight = p.Weight;
+            Buckets = p.Buckets
+                .Where(b => b.Value > 0)
+                .OrderByDescending(b => b.BktNr)
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))
+                .ToArray();
+        }
+    }
+}

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -0,0 +1,118 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class MemberDeliveryPerVariantData : DataTable<MemberDeliveryPerVariantRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("SortIds", "Sorte", null, 12),
+            ("AttrIds", "Attribut", null, 16),
+            ("Weights", "Geliefert", "kg", 22),
+            ("Areas", "Fläche", "m²", 22),
+            ("Yields", "Ertrag", "kg/ha", 22),
+        };
+
+
+        public MemberDeliveryPerVariantData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
+            base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
+        }
+
+        public static async Task<MemberDeliveryPerVariantData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+            return new MemberDeliveryPerVariantData(
+               (await FromDbSet(table, year)).GroupBy(
+                   r => r.MgNr,
+                   (k, g) => new MemberDeliveryPerVariantRow(g)
+             ), year);
+        }
+
+        private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+            return await table.FromSqlRaw($"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address,
+                           v.bucket, v.weight, v.area
+                    FROM (
+                            SELECT c.year AS year,
+                                   c.mgnr AS mgnr,
+                                   c.bucket AS bucket,
+                                   COALESCE(d.weight, 0) AS weight,
+                                   COALESCE(c.area, 0) AS area
+                            FROM v_area_commitment_bucket_strict c
+                                LEFT JOIN v_delivery_bucket_strict d ON (d.year, d.mgnr, d.bucket) = (c.year, c.mgnr, c.bucket)
+                            WHERE c.year = {year}
+                            UNION
+                            SELECT d.year,
+                                   d.mgnr,
+                                   d.bucket,
+                                   COALESCE(d.weight, 0),
+                                   COALESCE(c.area, 0)
+                            FROM v_delivery_bucket_strict d
+                                LEFT JOIN v_area_commitment_bucket_strict c ON (c.year, c.mgnr, c.bucket) = (d.year, d.mgnr, d.bucket)
+                            WHERE d.year = {year}
+                        ) v
+                        LEFT JOIN member m ON m.mgnr = v.mgnr
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                    ORDER BY m.mgnr, v.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class MemberDeliveryPerVariantRow {
+        public int MgNr;
+        public string Name;
+        public string GivenName;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] SortIds;
+        public string[] AttrIds;
+        public int[] Areas;
+        public int[] Weights;
+        public int?[] Yields => Weights.Zip(Areas).Select(i => i.Second > 0 ? (int?)i.First * 10_000 / i.Second : null).ToArray();
+
+        public MemberDeliveryPerVariantRow(IEnumerable<MemberDeliveryPerVariantRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name = f.Name;
+            GivenName = f.GivenName;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
+            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            Weights = rows.Select(r => r.Weight).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class MemberDeliveryPerVariantRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string Locality { get; set; }
+        [Column("bucket")]
+        public string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -0,0 +1,76 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class OverUnderDeliveryData : DataTable<OverUnderDeliveryRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = new[] {
+            ("MgNr", "MgNr.", null, 12),
+            ("Name", "Name", null, 40),
+            ("GivenName", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("BusinessShares", "GA", null, 10),
+            ("DeliveryObligation", "Lieferpflicht", "kg", 22),
+            ("DeliveryRight", "Lieferrecht", "kg", 22),
+            ("Weight", "Geliefert", "kg", 22),
+            ("OverUnderDelivery", "Über-/Unterliefert", "kg|%", 34),
+        };
+
+        public OverUnderDeliveryData(IEnumerable<OverUnderDeliveryRow> rows, int year) :
+            base($"Über-Unterlieferungen", $"Über- und Unterlieferungen laut gezeichneten Geschäftsanteilen {year}", rows, FieldNames) {
+        }
+
+        public static async Task<OverUnderDeliveryData> ForSeason(DbSet<OverUnderDeliveryRow> table, int year) {
+            var rows = await table.FromSqlRaw($"""
+                SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.business_shares,
+                       m.business_shares * s.min_kg_per_bs AS min_kg,
+                       m.business_shares * s.max_kg_per_bs AS max_kg,
+                       COALESCE(SUM(d.weight), 0) AS sum
+                FROM member m
+                    LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                    LEFT JOIN AT_ort o ON o.okz = p.okz
+                    LEFT JOIN season s ON s.year = {year}
+                    LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
+                WHERE m.active = 1
+                GROUP BY d.year, m.mgnr
+                ORDER BY 100.0 * sum / max_kg, m.mgnr;
+                """).ToListAsync();
+            return new OverUnderDeliveryData(rows, year);
+        }
+    }
+
+    [Keyless]
+    public class OverUnderDeliveryRow {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("family_name")]
+        public string Name { get; set; }
+        [Column("given_name")]
+        public string GivenName { get; set; }
+        [Column("address")]
+        public string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public string LocalityFull { get; set; }
+        [NotMapped]
+        public string Locality => LocalityFull.Split(",")[0];
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+        [Column("min_kg")]
+        public int DeliveryObligation { get; set; }
+        [Column("max_kg")]
+        public int DeliveryRight { get; set; }
+        [Column("sum")]
+        public int Weight { get; set; }
+        [NotMapped]
+        public (int? Kg, double? Percent) OverUnderDelivery =>
+            Weight < DeliveryObligation ? (Weight - DeliveryObligation, Weight * 100.0 / DeliveryObligation - 100.0) :
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100.0) : (null, null);
+    }
+}

Elwig/Models/Dtos/Transaction.cs

@@ -0,0 +1,26 @@
+using Elwig.Models.Entities;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Models.Dtos {
+    public class Transaction(Member member, decimal amount, string currency, int nr) {
+
+        public readonly Member Member = member;
+        public readonly decimal Amount = amount;
+        public readonly string Currency = currency;
+        public readonly int Nr = nr;
+
+        public Transaction(Credit c) : this(c.Member, c.Amount, c.Variant.Season.CurrencyCode, c.TgNr) { }
+
+        public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
+            return variant.Credits
+                .OrderBy(c => c.TgNr)
+                .Select(c => new Transaction(c))
+                .ToList();
+        }
+
+        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
+
+        public static string FormatAmount(decimal amount) => FormatAmountCent((int)(amount * 100));
+    }
+}

Elwig/Models/Entities/AT_Gem.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_gem"), PrimaryKey("Gkz")]
     public class AT_Gem {
         [Column("gkz")]

Elwig/Models/Entities/AT_Kg.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_kg"), PrimaryKey("KgNr")]
     public class AT_Kg {
         [Column("kgnr")]
@@ -17,6 +17,6 @@ namespace Elwig.Models {
         public virtual AT_Gem Gem { get; private set; }
 
         [InverseProperty("AtKg")]
-        public virtual WbKg WbKg { get; private set; }
+        public virtual WbKg? WbKg { get; private set; }
     }
 }

Elwig/Models/Entities/AT_Ort.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_ort"), PrimaryKey("Okz")]
     public class AT_Ort {
         [Column("okz")]

Elwig/Models/Entities/AT_Plz.cs

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz"), PrimaryKey("Plz")]
     public class AT_Plz {
         [Column("plz")]

Elwig/Models/Entities/AT_PlzDest.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("AT_plz_dest"), PrimaryKey("Id"), Index("Plz", "Okz", IsUnique = true)]
     public class AT_PlzDest {
         [Column("plz")]

Elwig/Models/Entities/AreaCom.cs

@@ -1,7 +1,10 @@
+using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("area_commitment"), PrimaryKey("FbNr")]
     public class AreaCom {
         [Column("fbnr")]
@@ -51,5 +54,12 @@ namespace Elwig.Models {
 
         [ForeignKey("KgNr, RdNr")]
         public virtual WbRd? Rd { get; private set; }
+
+        public int SearchScore(IEnumerable<string> keywords) {
+            var list = new string?[] {
+                WineCult.Name, Kg.AtKg.Name, Rd.Name, GstNr, Comment,
+            }.ToList();
+            return Utils.GetSearchScore(list, keywords);
+        }
     }
 }

Elwig/Models/Entities/AreaComType.cs

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

Elwig/Models/Entities/BillingAddr.cs

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

Elwig/Models/Entities/Branch.cs

@@ -1,9 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
-    [Table("branch"), PrimaryKey("ZwstId")]
+    [Table("branch"), PrimaryKey("ZwstId"), Index("Name", IsUnique = true)]
     public class Branch {
         [Column("zwstid")]
         public string ZwstId { get; set; }

Elwig/Models/Entities/ClientParam.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("client_parameter"), PrimaryKey("Param")]
     public class ClientParam {
         [Column("param")]

Elwig/Models/Entities/Country.cs

@@ -1,7 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]
     public class Country {
         [Column("num")]

Elwig/Models/Entities/Credit.cs

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

Elwig/Models/Entities/Currency.cs

@@ -2,7 +2,7 @@ using Elwig.Helpers;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("currency"), PrimaryKey("Code")]
     public class Currency {
         [Column("code")]

Elwig/Models/Entities/Delivery.cs

@@ -4,8 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery"), PrimaryKey("Year", "DId"), Index("DateString", "ZwstId", "LNr", IsUnique = true), Index("LsNr", IsUnique = true)]
     public class Delivery {
         [Column("year")]
@@ -19,12 +20,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly Date {
-            get {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
-                return DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => DateString = value.ToString("yyyy-MM-dd");
-            }
-            set {
-                DateString = value.ToString("yyyy-MM-dd");
-            }
         }
 
         [Column("time")]
@@ -32,19 +29,13 @@ namespace Elwig.Models {
 
         [NotMapped]
         public TimeOnly? Time {
-            get {
+            get => (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
-                return (TimeString == null) ? null : TimeOnly.ParseExact(TimeString, "HH:mm:ss");
+            set => TimeString = value?.ToString("HH:mm:ss");
-            }
-            set {
-                TimeString = value?.ToString("HH:mm:ss");
-            }
         }
 
         [NotMapped]
         public DateTime DateTime {
-            get {
+            get => Date.ToDateTime(Time ?? TimeOnly.MinValue);
-                return Date.ToDateTime(Time ?? TimeOnly.MinValue);
-            }
             set {
                 Date = DateOnly.FromDateTime(value);
                 Time = TimeOnly.FromDateTime(value);
@@ -72,21 +63,37 @@ namespace Elwig.Models {
         [Column("comment")]
         public string? Comment { get; set; }
 
+        [ForeignKey("Year")]
+        public virtual Season Season { get; private set; }
+
         [InverseProperty("Delivery")]
         public virtual ISet<DeliveryPart> Parts { get; private set; }
+        [NotMapped]
+        public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
+
+        [NotMapped]
+        public Predicate<DeliveryPart>? PartFilter { get; set; }
 
         public int Weight => Parts.Select(p => p.Weight).Sum();
+        public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
 
         public IEnumerable<string> SortIds => Parts
             .GroupBy(p => p.SortId)
             .OrderByDescending(g => g.Select(p => p.Weight).Sum())
-            .Select(g => g.Select(p => p.SortId).First());
+            .Select(g => g.Key);
+        public IEnumerable<string> FilteredSortIds => FilteredParts
+            .GroupBy(p => p.SortId)
+            .OrderByDescending(g => g.Select(p => p.Weight).Sum())
+            .Select(g => g.Key);
 
         public string SortIdString => string.Join(", ", SortIds);
+        public string FilteredSortIdString => string.Join(", ", FilteredSortIds);
 
         public double Kmw => Utils.AggregateDeliveryPartsKmw(Parts);
+        public double FilteredKmw => Utils.AggregateDeliveryPartsKmw(FilteredParts);
 
         public double Oe => Utils.KmwToOe(Kmw);
+        public double FilteredOe => Utils.KmwToOe(FilteredKmw);
 
         public int SearchScore(IEnumerable<string> keywords) {
             var list = new string?[] {

Elwig/Models/Entities/DeliveryPart.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part"), PrimaryKey("Year", "DId", "DPNr")]
     public class DeliveryPart {
         [Column("year")]
@@ -25,20 +25,21 @@ namespace Elwig.Models {
         [ForeignKey("SortId")]
         public virtual WineVar Variant { get; private set; }
 
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
         [Column("weight")]
         public int Weight { get; set; }
 
         [Column("kmw")]
         public double Kmw { get; set; }
-
         [NotMapped]
         public double Oe {
-            get {
+            get => Utils.KmwToOe(Kmw);
-                return Utils.KmwToOe(Kmw);
+            set => Kmw = Utils.OeToKmw(value);
-            }
-            set {
-                Kmw = Utils.OeToKmw(value);
-            }
         }
 
         [Column("qualid")]
@@ -80,6 +81,9 @@ namespace Elwig.Models {
         [Column("lesewagen")]
         public bool? IsLesewagen { get; set; }
 
+        [Column("gebunden")]
+        public bool? IsGebunden { get; set; }
+
         [Column("temperature")]
         public double? Temperature { get; set; }
 
@@ -92,21 +96,25 @@ namespace Elwig.Models {
         [Column("weighing_id")]
         public string? WeighingId { get; set; }
 
+        [Column("weighing_reason")]
+        public string? WeighingReason { get; set; }
+
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartAttr> PartAttributes { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
-
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
         [NotMapped]
         public IEnumerable<Modifier> Modifiers => PartModifiers.Select(m => m.Modifier).OrderBy(m => m.Ordering);
 
+        [InverseProperty("DeliveryPart")]
+        public virtual PaymentDeliveryPart? Payment { get; private set; }
+
+        [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
+
+        [InverseProperty("Part")]
+        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
     }
 }

Elwig/Models/Entities/DeliveryPartBucket.cs

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

Elwig/Models/Entities/DeliveryPartModifier.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("delivery_part_modifier"), PrimaryKey("Year", "DId", "DPNr", "ModId")]
     public class DeliveryPartModifier {
         [Column("year")]

Elwig/Models/Entities/Member.cs

@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member"), PrimaryKey("MgNr")]
-    public class Member {
+    public class Member : IAddress {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
@@ -62,12 +62,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly? EntryDate {
-            get {
+            get => EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
-                return EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
+            set => EntryDateString = value?.ToString("yyyy-MM-dd");
-            }
-            set {
-                EntryDateString = value?.ToString("yyyy-MM-dd");
-            }
         }
 
         [Column("exit_date")]
@@ -75,12 +71,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly? ExitDate {
-            get {
+            get => ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
-                return ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
+            set => ExitDateString = value?.ToString("yyyy-MM-dd");
-            }
-            set {
-                ExitDateString = value?.ToString("yyyy-MM-dd");
-            }
         }
 
         [Column("business_shares")]
@@ -104,6 +96,9 @@ namespace Elwig.Models {
         [Column("buchführend")]
         public bool IsBuchführend { get; set; }
 
+        [Column("organic")]
+        public bool IsOrganic { get; set; }
+
         [Column("funktionär")]
         public bool IsFunktionär { get; set; }
 
@@ -128,9 +123,6 @@ namespace Elwig.Models {
         [Column("address")]
         public string Address { get; set; }
 
-        [Column("email")]
-        public string? Email { get; set; }
-
         [Column("default_kgnr")]
         public int? DefaultKgNr { get; set; }
 
@@ -163,7 +155,7 @@ namespace Elwig.Models {
 
         [NotMapped]
         public IEnumerable<AreaCom> ActiveAreaCommitments => AreaCommitments
-            .Where(c => c.YearFrom <= Utils.CurrentNextSeason && (c.YearTo ?? int.MaxValue) >= Utils.CurrentNextSeason);
+            .Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear);
 
         [InverseProperty("Member")]
         public virtual BillingAddr? BillingAddress { get; private set; }
@@ -174,14 +166,13 @@ namespace Elwig.Models {
         [InverseProperty("Member")]
         public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; }
 
-        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
+        [InverseProperty("member")]
+        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; }
 
-        public int DeliveryRight => BusinessShares * App.Client.DeliveryRight;
+        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
-        public int DeliveryObligation => BusinessShares * App.Client.DeliveryObligation;
 
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {
-                MgNr.ToString(),
                 FamilyName, MiddleName, GivenName,
                 BillingAddress?.Name,
                 Comment,

Elwig/Models/Entities/MemberEmailAddr.cs

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

Elwig/Models/Entities/MemberHistory.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models.Entities {
+    [Table("member_history"), PrimaryKey("MgNr", "DateString")]
+    public class MemberHistory {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("date")]
+        public string DateString { get; set; }
+        [NotMapped]
+        public DateOnly Date {
+            get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
+            set => value.ToString("yyyy-MM-dd");
+        }
+
+        [Column("business_shares")]
+        public int BusinessShares { get; set; }
+
+        [Column("type")]
+        public string Type { get; set; }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; }
+    }
+}

Elwig/Models/Entities/MemberTelNr.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Elwig.Models {
+namespace Elwig.Models.Entities {
     [Table("member_telephone_number"), PrimaryKey("MgNr", "Nr")]
     public class MemberTelNr {
         [Column("mgnr")]