Some Bugfixes

Elwig/App.xaml.cs

@@ -17,6 +17,7 @@ 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 {
@@ -64,22 +65,27 @@ namespace Elwig {
             MainDispatcher = Dispatcher;
             Scales = Array.Empty<IScale>();
             CurrentApp = this;
+            OverrideCulture();
         }
 
-        protected override async void OnStartup(StartupEventArgs evt) {
-            var locale = new CultureInfo("de-AT");
-            locale.NumberFormat.CurrencyGroupSeparator = "\u202f";
-            locale.NumberFormat.NumberGroupSeparator = "\u202f";
-            locale.NumberFormat.PercentGroupSeparator = "\u202f";
+        private static void OverrideCulture() {
+            var locale = new CultureInfo("de-AT", false);
+            locale.NumberFormat.CurrencyGroupSeparator = Utils.GroupSeparator;
+            locale.NumberFormat.NumberGroupSeparator = Utils.GroupSeparator;
+            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 {
@@ -221,6 +227,13 @@ namespace Elwig {
             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());
         }

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

@@ -17,6 +17,8 @@ namespace Elwig.Documents {
         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) {
@@ -32,6 +34,16 @@ namespace Elwig.Documents {
             } 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>" +

Elwig/Documents/CreditNote.cshtml

@@ -112,7 +112,7 @@
                     // TODO Mock VAT
                 } else {
                     var hasPrev = Model.Credit.PrevNetAmount != null;
-                    @Raw(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Model.Credit.NetAmount, bold: true))
+                    @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)))
@@ -136,6 +136,14 @@
                 }
                 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))

Elwig/Documents/MemberDataSheet.cs

@@ -2,6 +2,7 @@
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class MemberDataSheet : BusinessDocument {
@@ -9,13 +10,12 @@ namespace Elwig.Documents {
         public new static string Name => "Stammdatenblatt";
 
         public Season Season;
-        public int Year = Utils.CurrentYear;
         public Dictionary<string, MemberBucket> MemberBuckets;
 
         public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
             DocumentId = $"{Name} {m.MgNr}";
-            Season = ctx.Seasons.Find(Year) ?? throw new ArgumentException("invalid season");
-            MemberBuckets = ctx.GetMemberBuckets(Year, m.MgNr).GetAwaiter().GetResult();
+            Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.5.1</Version>
+    <Version>0.6.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
@@ -25,11 +25,11 @@
   <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.25" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <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.2151.40" />
+    <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="4.1.68" />

Elwig/Helpers/AppDbContext.cs

@@ -44,6 +44,7 @@ namespace Elwig.Helpers {
         public DbSet<Member> Members { get; private set; }
         public DbSet<BillingAddr> BillingAddresses { get; private set; }
         public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
+        public DbSet<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; }
@@ -200,6 +201,13 @@ namespace Elwig.Helpers {
             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))

Elwig/Helpers/AppDbUpdater.cs

@@ -9,7 +9,7 @@ namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
         // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 12;
+        public static readonly int RequiredSchemaVersion = 13;
 
         private static int VersionOffset = 0;
 

Elwig/Helpers/Billing/Billing.cs

@@ -31,6 +31,18 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
+        public async Task AutoAdjustBusinessShare() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            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
+                """);
+        }
+
         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();

Elwig/Helpers/Billing/BillingData.cs

@@ -13,7 +13,6 @@ namespace Elwig.Helpers.Billing {
 
         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; }
@@ -23,24 +22,47 @@ namespace Elwig.Helpers.Billing {
             Schema = await JsonSchema.FromJsonAsync(stream ?? throw new ArgumentException("JSON schema not found"));
         }
 
-        private readonly CalculationMode Mode;
-        private readonly JsonObject Data;
-        private readonly Dictionary<int, Curve> Curves;
-        private readonly Dictionary<string, Curve> PaymentData;
-        private readonly Dictionary<string, Curve> QualityData;
+        public readonly JsonObject Data;
+        public readonly CalculationMode Mode;
 
-        public BillingData(JsonObject data, IEnumerable<string> attributeVariants) {
-            if (attributeVariants.Any(e => e.Any(c => c < 'A' || c > 'Z')))
-                throw new ArgumentException("Invalid attributeVariants");
+        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;
-            Curves = GetCurves(data);
-            PaymentData = GetPaymentData(attributeVariants);
-            QualityData = GetQualityData(attributeVariants);
         }
 
-        public static JsonObject ParseJson(string json) {
+        protected static JsonObject ParseJson(string json) {
             if (Schema == null) throw new InvalidOperationException("Schema has to be initialized first");
             try {
                 var errors = Schema.Validate(json);
@@ -51,8 +73,20 @@ namespace Elwig.Helpers.Billing {
             }
         }
 
-        public static BillingData FromJson(string json, IEnumerable<string> attributeVariants) {
-            return new(ParseJson(json), attributeVariants);
+        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) {
@@ -83,9 +117,9 @@ namespace Elwig.Helpers.Billing {
             return dict;
         }
 
-        public static Dictionary<int, Curve> GetCurves(JsonObject data) {
+        protected Dictionary<int, Curve> GetCurves() {
             var dict = new Dictionary<int, Curve>();
-            var curves = data["curves"]?.AsArray() ?? throw new InvalidOperationException();
+            var curves = GetCurvesEntry();
             foreach (var c in curves) {
                 var obj = c?.AsObject() ?? throw new InvalidOperationException();
                 var id = obj["id"]?.GetValue<int>() ?? throw new InvalidOperationException();
@@ -111,110 +145,5 @@ namespace Elwig.Helpers.Billing {
             }
             return dict;
         }
-
-        private Dictionary<string, Curve> GetData(JsonObject data, IEnumerable<string> attributeVariants) {
-            Dictionary<string, Curve> dict;
-            if (data["default"] is JsonValue def) {
-                var c = LookupCurve(def);
-                dict = attributeVariants.ToDictionary(e => e, _ => c);
-            } 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);
-            foreach (var (idx, v) in variants) {
-                var curve = LookupCurve(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 = LookupCurve(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 = LookupCurve(v?.AsValue() ?? throw new InvalidOperationException());
-                dict[idx.Replace("/", "")] = curve;
-            }
-
-            return dict;
-        }
-
-        public Dictionary<string, Curve> GetPaymentData(IEnumerable<string> attributeVariants) {
-            // TODO parse wgmaster
-            var p = Data["payment"];
-            if (p is JsonValue val) {
-                var c = LookupCurve(val);
-                return attributeVariants.ToDictionary(e => e, _ => c);
-            }
-            return GetData(p?.AsObject() ?? throw new InvalidOperationException(), attributeVariants);
-        }
-
-        public Dictionary<string, Curve> GetQualityData(IEnumerable<string> attributeVariants) {
-            // TODO parse wgmaster
-            var q = Data["quality"]?.AsObject();
-            Dictionary<string, Curve> dict = [];
-            if (q == null) return dict;
-
-            foreach (var (qualid, data) in q) {
-                Dictionary<string, Curve> qualDict;
-                if (data is JsonValue val) {
-                    var c = LookupCurve(val);
-                    qualDict = attributeVariants.ToDictionary(e => e, _ => c);
-                } else {
-                    qualDict = GetData(data?.AsObject() ?? throw new InvalidOperationException(), attributeVariants);
-                }
-                foreach (var (idx, d) in qualDict) {
-                    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);
-            var d = (gebunden ? curve.Gebunden : null) ?? curve.Normal;
-            if (d.Count == 1) return d.First().Value;
-
-            var r = curve.Mode == CurveMode.Oe ? oe : kmw;
-            var lt = d.Keys.Where(v => v <= r);
-            var gt = d.Keys.Where(v => v >= r);
-            if (!lt.Any()) {
-                return d[gt.Min()];
-            } else if (!gt.Any()) {
-                return d[lt.Max()];
-            }
-
-            var max = lt.Max();
-            var min = gt.Min();
-            if (max == min) return d[r];
-
-            var p1 = ((decimal)r - (decimal)min) / ((decimal)max - (decimal)min);
-            var p2 = 1 - p1;
-            return d[min] * p2 + d[max] * p1;
-        }
-
-        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();
-        }
-
-        public Curve GetCurve(string sortid, string? attrid) {
-            return PaymentData[$"{sortid}{attrid ?? ""}"];
-        }
-
-        public Curve? GetQualityCurve(string qualid, string sortid, string? attrid) {
-            return QualityData.TryGetValue($"{qualid}/{sortid}{attrid ?? ""}", out var curve) ? curve : null;
-        }
     }
 }

Elwig/Helpers/Billing/BillingVariant.cs

@@ -10,10 +10,19 @@ namespace Elwig.Helpers.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");
+            var attrVariants = Context.DeliveryParts
+                .Where(d => d.Year == Year)
+                .Select(d => $"{d.SortId}{d.AttrId}")
+                .Distinct()
+                .ToList()
+                .Union(Context.WineVarieties.Select(v => v.SortId))
+                .ToList();
+            Data = PaymentBillingData.FromJson(PaymentVariant.Data, attrVariants);
         }
 
         public async Task Calculate() {
@@ -22,7 +31,8 @@ namespace Elwig.Helpers.Billing {
             await DeleteInDb(cnx);
             await SetCalcTime(cnx);
             await CalculatePrices(cnx);
-            await CalculateModifiers(cnx);
+            if (Data.ConsiderDelieryModifiers)
+                await CalculateDeliveryModifiers(cnx);
             await CalculateMemberModifiers(cnx);
             await tx.CommitAsync();
         }
@@ -39,7 +49,11 @@ namespace Elwig.Helpers.Billing {
                            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(COALESCE(u.total_penalty, 0) / POW(10, 4 - 2)) AS modifiers,
+                           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
@@ -62,6 +76,19 @@ namespace Elwig.Helpers.Billing {
                                    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});
@@ -119,17 +146,6 @@ namespace Elwig.Helpers.Billing {
         }
 
         protected async Task CalculatePrices(SqliteConnection cnx) {
-            var jsonData = PaymentVariant.Data;
-            var attrVariants = Context.DeliveryParts
-                .Where(d => d.Year == Year)
-                .Select(d => $"{d.SortId}{d.AttrId}")
-                .Distinct()
-                .ToList()
-                .Union(Context.WineVarieties.Select(v => v.SortId))
-                .ToList();
-
-            var data = BillingData.FromJson(jsonData, attrVariants);
-
             var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string Discr, int Value, double Oe, double Kmw, string QualId)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
@@ -151,7 +167,7 @@ namespace Elwig.Helpers.Billing {
             var inserts = new List<(int Year, int DId, int DPNr, int BktNr, long Price, long Amount)>();
             foreach (var part in parts) {
                 var attrId = (part.Discr == "_" || part.Discr == "") ? null : part.Discr;
-                var price = data.CalculatePrice(part.SortId, attrId, part.QualId, part.Discr != "_", part.Oe, part.Kmw);
+                var price = Data.CalculatePrice(part.SortId, attrId, part.QualId, part.Discr != "_", part.Oe, part.Kmw);
                 var priceL = PaymentVariant.Season.DecToDb(price);
                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }
@@ -162,7 +178,7 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        protected async Task CalculateModifiers(SqliteConnection cnx) {
+        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)

Elwig/Helpers/Billing/EditBillingData.cs

@@ -0,0 +1,90 @@
+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);
+        }
+
+        public IEnumerable<GraphEntry> GetPaymentGraphEntries() {
+            Dictionary<int, List<string>> dict1 = [];
+            Dictionary<decimal, List<string>> dict2 = [];
+            var p = GetPaymentEntry();
+            if (p 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 (p is JsonValue paymentVal) {
+                var idx = paymentVal.GetValue<decimal>();
+                if (!dict2.ContainsKey(idx)) dict2[idx] = [];
+                dict2[idx].Add("default");
+            }
+
+            Dictionary<int, Curve> curves = GetCurves();
+            decimal[] virtCurves = [.. dict2.Keys.Order()];
+            for (int i = 0; i < virtCurves.Length; i++) {
+                var idx = virtCurves[i];
+                dict1[1000 + i] = dict2[idx];
+                curves[1000 + i] = new Curve(CurveMode.Oe, new() { { 73, idx } }, null);
+            }
+
+            Dictionary<int, List<string>> dict3 = [];
+
+
+
+            return dict3.Select(e => new GraphEntry(e.Key, curves[e.Key], 50, 120)).ToList();
+        }
+
+        public IEnumerable<GraphEntry> GetQualityGraphEntries() {
+            Dictionary<int, List<string>> dict1 = [];
+            Dictionary<decimal, List<string>> dict2 = [];
+            foreach (var (qualid, q) in GetQualityEntry() ?? []) {
+                if (q is JsonObject qualityObj) {
+                    foreach (var (selector, node) in qualityObj) {
+                        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 (q is JsonValue qualityVal) {
+                    var idx = qualityVal.GetValue<decimal>();
+                    if (!dict2.ContainsKey(idx)) dict2[idx] = [];
+                    dict2[idx].Add($"{qualid}/");
+                }
+            }
+
+            // TODO
+
+            List<GraphEntry> list = [];
+
+            return list;
+        }
+    }
+}

Elwig/Helpers/Billing/Graph.cs

@@ -7,113 +7,101 @@ using System.Text.Json.Nodes;
 namespace Elwig.Helpers.Billing {
     public class Graph : ICloneable {
 
-        public string Type { get; set; }
-        public int Num { get; set; }
-        private int MinX { get; set; }
-        private int MaxX { get; set; }
-        public string Contracts { get; set; }
         public double[] DataX { get; set; }
         public double[] DataY { get; set; }
 
-        public Graph(int num, int minX, int maxX) {
-            Type = "oe";
-            Num = num;
-            Contracts = "";
-            MinX = minX;
-            MaxX = maxX;
-
-            DataX = DataGen.Range(MinX, MaxX + 1);
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
+        public Graph(int minX, int maxX) {
+            DataX = DataGen.Range(minX, maxX + 1);
+            DataY = DataGen.Zeros(maxX - minX + 1);
         }
 
-        public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
-            Type = type;
-            Num = num;
-            Contracts =  contracts;
-            MinX = minX;
-            MaxX = maxX;
-
-            DataX = DataGen.Range(MinX, MaxX + 1);
-            DataY = DataGen.Zeros(MaxX - MinX + 1);
-            ParseGraphData(graphData);
+        public Graph(Dictionary<double, decimal> data, int minX, int maxX) {
+            DataX = DataGen.Range(minX, maxX + 1);
+            DataY = DataGen.Zeros(maxX - minX + 1);
+            ParseGraphData(data, minX, maxX);
         }
 
-        public Graph(string type, int num, int minX, int maxX, string contracts, double[] dataX, double[] dataY) {
-            Type = type;
-            Num = num;
-            MinX = minX;
-            MaxX = maxX;
-            Contracts = contracts;
+        public Graph(double[] dataX, double[] dataY) {
             DataX = dataX;
             DataY = dataY;
         }
 
-        private void ParseGraphData(JsonObject graphData) {
-            var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
-
-            if (GraphPoints.Keys.Count < 1) {
+        private void ParseGraphData(Dictionary<double, decimal> graphPoints, int minX, int maxX) {
+            if (graphPoints.Keys.Count < 1) {
                 return;
             }
 
-            var minKey = GraphPoints.Keys.Order().First();
-            var maxKey = GraphPoints.Keys.OrderDescending().First();
+            var minKey = graphPoints.Keys.Order().First();
+            var maxKey = graphPoints.Keys.OrderDescending().First();
 
-            if (!GraphPoints.ContainsKey(MinX)) {
-                GraphPoints.Add(MinX, GraphPoints.GetValueOrDefault(minKey));
+            if (!graphPoints.ContainsKey(minX)) {
+                graphPoints.Add(minX, graphPoints.GetValueOrDefault(minKey));
             }
-            if (!GraphPoints.ContainsKey(MaxX)) {
-                GraphPoints.Add(MaxX, GraphPoints.GetValueOrDefault(maxKey));
+            if (!graphPoints.ContainsKey(maxX)) {
+                graphPoints.Add(maxX, graphPoints.GetValueOrDefault(maxKey));
             }
 
-            var keys = GraphPoints.Keys.Order().ToArray();
+            var keys = graphPoints.Keys.Order().ToArray();
 
             for (int i = 0; i < keys.Length; i++) {
-                double point1Value = GraphPoints[keys[i]];
+                decimal point1Value = graphPoints[keys[i]];
                 if (i + 1 < keys.Length) {
-                    double point2Value = GraphPoints[keys[i + 1]];
+                    decimal point2Value = graphPoints[keys[i + 1]];
                     if (point1Value == point2Value) {
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX; j++) {
-                            DataY[j] = point1Value;
+                        for (int j = (int)(keys[i] - minX); j < keys[i + 1] - minX; j++) {
+                            DataY[j] = (double)point1Value;
                         }
                     } else {
-                        int steps = Math.Abs(keys[i + 1] - keys[i]);
-                        double step = (point2Value - point1Value) / steps;
+                        int steps = (int)Math.Abs(keys[i + 1] - keys[i]);
+                        decimal step = (point2Value - point1Value) / steps;
 
-                        DataY[keys[i] - MinX] = point1Value;
-                        DataY[keys[i + 1] - MinX] = point2Value;
+                        DataY[(int)(keys[i] - minX)] = (double)point1Value;
+                        DataY[(int)(keys[i + 1] - minX)] = (double)point2Value;
 
-                        for (int j = keys[i] - MinX; j < keys[i + 1] - MinX - 1; j++) {
-                            DataY[j + 1] = Math.Round(DataY[j] + step, 4); // TODO richtig runden
+                        for (int j = (int)(keys[i] - minX); j < keys[i + 1] - minX - 1; j++) {
+                            DataY[j + 1] = Math.Round(DataY[j] + (double)step, 4); // TODO richtig runden
                         }
                     }
                 }
                 else {
-                    for (int j = keys[i] - MinX; j < DataX.Length; j++) {
-                        DataY[j] = point1Value;
+                    for (int j = (int)(keys[i] - minX); j < DataX.Length; j++) {
+                        DataY[j] = (double)point1Value;
                     }
                 }
             }
         }
 
-        public JsonObject ToJson() {
-            JsonObject graph = new();
+        public void FlattenGraph(int begin, int end, double value) {
+            for (int i = begin; i <= end; i++) {
+                DataY[i] = value;
+            }
+        }
+
+        public void LinearIncreaseGraph(int begin, int end, double inc) {
+            for (int i = begin; i < end; i++) {
+                DataY[i + 1] = DataY[i] + inc;
+            }
+        }
+
+        public JsonObject ToJson(string mode) {
+            var data = new JsonObject();
 
             if (DataY[0] != DataY[1]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
+                data.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + mode, Math.Round(DataY[0], 4)));
             }
             for (int i = 1; i < DataX.Length - 1; i++) {
-                if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
-                    graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
+                if (Math.Round(DataY[i] - DataY[i - 1], 10) != Math.Round(DataY[i + 1] - DataY[i], 10)) {
+                    data.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + mode, Math.Round(DataY[i], 4)));
                 }
             }
             if (DataY[^1] != DataY[^2]) {
-                graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
+                data.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + mode, Math.Round(DataY[^1], 4)));
             }
-            return graph;
+            return data;
         }
 
         public object Clone() {
-            return new Graph(Type, Num, MinX, MaxX, Contracts, (double[])DataX.Clone(), (double[])DataY.Clone());
+            return new Graph((double[])DataX.Clone(), (double[])DataY.Clone());
         }
     }
 }

Elwig/Helpers/Billing/GraphEntry.cs

@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace Elwig.Helpers.Billing {
+    public class GraphEntry {
+
+        public int Id { get; set; }
+        public BillingData.CurveMode Mode { get; set; }
+        public Graph DataGraph { get; set; }
+        public Graph? GebundenGraph { get; set; }
+        public decimal? GebundenFlatPrice { get; set; }
+        public List<string> Contracts { get; set; }
+        private int MinX { get; set; }
+        private int MaxX { get; set; }
+
+        public GraphEntry(int id, BillingData.CurveMode mode, int minX, int maxX) {
+            Id = id;
+            Mode = mode;
+            MinX = minX;
+            MaxX = maxX;
+            DataGraph = new Graph(minX, maxX);
+            Contracts = [];
+        }
+
+        public GraphEntry(int id, BillingData.CurveMode mode, Dictionary<double, decimal> data, int minX, int maxX) :
+            this(id, mode, minX, maxX) {
+            DataGraph = new Graph(data, minX, maxX);
+        }
+
+        public GraphEntry(int id, BillingData.Curve curve, int minX, int maxX) :
+            this(id, curve.Mode, minX, maxX) {
+            DataGraph = new Graph(curve.Normal, minX, maxX);
+            if (curve.Gebunden != null)
+                GebundenGraph = new Graph(curve.Gebunden, minX, maxX);
+        }
+
+        private GraphEntry(int id, BillingData.CurveMode mode, Graph dataGraph, Graph? gebundenGraph,
+                           decimal? gebundenFlatPrice, List<string> contracts, int minX, int maxX) {
+            Id = id;
+            Mode = mode;
+            MinX = minX;
+            MaxX = maxX;
+            DataGraph = dataGraph;
+            GebundenGraph = gebundenGraph;
+            GebundenFlatPrice = gebundenFlatPrice;
+            Contracts = contracts;
+        }
+
+        public JsonObject ToJson() {
+            var curve = new JsonObject {
+                ["id"] = Id,
+                ["mode"] = Mode.ToString().ToLower(),
+            };
+
+            curve["data"] = DataGraph.ToJson(Mode.ToString().ToLower());
+
+            if (GebundenFlatPrice != null) {
+                curve["geb"] = GebundenFlatPrice.ToString();
+            } else if (GebundenGraph != null) {
+                curve["geb"] = GebundenGraph.ToJson(Mode.ToString().ToLower());
+            }
+
+            return curve;
+        }
+
+        public GraphEntry Copy(int id) {
+            return new GraphEntry(id, Mode, (Graph)DataGraph.Clone(), (Graph?)GebundenGraph?.Clone(), GebundenFlatPrice, Contracts, MinX, MaxX);
+        }
+    }
+}

Elwig/Helpers/Billing/PaymentBillingData.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+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(JsonObject data) {
+            Dictionary<string, Curve> dict;
+            if (data["default"] is JsonValue def) {
+                var c = LookupCurve(def);
+                dict = AttributeVariants.ToDictionary(e => e, _ => c);
+            } 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);
+            foreach (var (idx, v) in variants) {
+                var curve = LookupCurve(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 = LookupCurve(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 = LookupCurve(v?.AsValue() ?? throw new InvalidOperationException());
+                dict[idx.Replace("/", "")] = curve;
+            }
+
+            return dict;
+        }
+
+        protected Dictionary<string, Curve> GetPaymentData() {
+            var p = GetPaymentEntry();
+            if (p is JsonValue val) {
+                var c = LookupCurve(val);
+                return AttributeVariants.ToDictionary(e => e, _ => c);
+            }
+            return GetData(p?.AsObject() ?? throw new InvalidOperationException());
+        }
+
+        protected Dictionary<string, Curve> GetQualityData() {
+            Dictionary<string, Curve> dict = [];
+            var q = GetQualityEntry();
+            if (q == null) return dict;
+
+            foreach (var (qualid, data) in q) {
+                Dictionary<string, Curve> qualDict;
+                if (data is JsonValue val) {
+                    var c = LookupCurve(val);
+                    qualDict = AttributeVariants.ToDictionary(e => e, _ => c);
+                } else {
+                    qualDict = GetData(data?.AsObject() ?? throw new InvalidOperationException());
+                }
+                foreach (var (idx, d) in qualDict) {
+                    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);
+            var d = (gebunden ? curve.Gebunden : null) ?? curve.Normal;
+            if (d.Count == 1) return d.First().Value;
+
+            var r = curve.Mode == CurveMode.Oe ? oe : kmw;
+            var lt = d.Keys.Where(v => v <= r);
+            var gt = d.Keys.Where(v => v >= r);
+            if (!lt.Any()) {
+                return d[gt.Min()];
+            } else if (!gt.Any()) {
+                return d[lt.Max()];
+            }
+
+            var max = lt.Max();
+            var min = gt.Min();
+            if (max == min) return d[r];
+
+            var p1 = ((decimal)r - (decimal)min) / ((decimal)max - (decimal)min);
+            var p2 = 1 - p1;
+            return d[min] * p2 + d[max] * p1;
+        }
+
+        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/Config.cs

@@ -24,9 +24,9 @@ namespace Elwig.Helpers {
         public void Read() {
             var config = new ConfigurationBuilder().AddIniFile(FileName).Build();
 
-            DatabaseFile = Utils.GetAbsolutePath(config["database:file"] ?? "database.sqlite3", App.DataPath);
+            DatabaseFile = Path.Combine(App.DataPath, config["database:file"] ?? "database.sqlite3");
             var log = config["database:log"];
-            DatabaseLog = log != null ? Utils.GetAbsolutePath(log, App.DataPath) : null;
+            DatabaseLog = log != null ? Path.Combine(App.DataPath, log) : null;
             Branch = config["general:branch"];
             Debug = trueValues.Contains(config["general:debug"]?.ToLower());
 
@@ -35,7 +35,7 @@ namespace Elwig.Helpers {
             Scales = ScaleList;
             foreach (var s in scales) {
                 string? scaleLog = config[$"scale.{s}:log"];
-                if (scaleLog != null) scaleLog = Utils.GetAbsolutePath(scaleLog, App.DataPath);
+                if (scaleLog != null) scaleLog = Path.Combine(App.DataPath, scaleLog);
                 ScaleList.Add([
                     s, config[$"scale.{s}:type"], config[$"scale.{s}:model"], config[$"scale.{s}:connection"],
                     config[$"scale.{s}:empty"], config[$"scale.{s}:filling"], config[$"scale.{s}:limit"], scaleLog

Elwig/Helpers/Export/Ods.cs

@@ -264,8 +264,7 @@ namespace Elwig.Helpers.Export {
                 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", CultureInfo.InvariantCulture);
+                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]) {

Elwig/Helpers/Utils.cs

@@ -48,6 +48,9 @@ namespace Elwig.Helpers {
         [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)"),
@@ -356,9 +359,5 @@ namespace Elwig.Helpers {
             }
             return output.OrderByDescending(l => l.Count());
         }
-
-        public static string GetAbsolutePath(string path, string basePath) {
-            return (path.Length > 1 && (path[1] == ':' || path[0] == '/' || path[0] == '\\')) ? Path.Combine(basePath, path) : path;
-        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -9,14 +9,14 @@ namespace Elwig.Helpers {
 
         private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
             { "43", new string[][] {
-                Array.Empty<string>(),
-                new string[] { "57", "59" },
-                new string[] {
+                [],
+                ["57", "59"],
+                [
                     "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[]>() },
@@ -162,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 += ' ';
@@ -320,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 new(false, "Prüfsumme der Betriebsnummer ist falsch");
-
-            return new(true, null);
+            return v == (nr[6] - '0');
         }
 
         public static ValidationResult CheckUstIdNr(TextBox input, bool required) {
@@ -373,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");
-
-                // 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'))
+                } else if (!CheckUstIdNr(text)) {
                     return new(false, "Prüfsumme der UID ist falsch");
+                }
             } else {
                 return new(false, "Not implemented yet");
             }
@@ -391,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) {

Elwig/Models/Dtos/DeliveryConfirmationData.cs

@@ -26,6 +26,10 @@ namespace Elwig.Models.Dtos {
             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(

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -71,6 +71,6 @@ namespace Elwig.Models.Dtos {
         [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) : (null, null);
+            Weight > DeliveryRight ? (Weight - DeliveryRight, Weight * 100.0 / DeliveryRight - 100.0) : (null, null);
     }
 }

Elwig/Models/Entities/Member.cs

@@ -62,12 +62,8 @@ namespace Elwig.Models.Entities {
 
         [NotMapped]
         public DateOnly? EntryDate {
-            get {
-                return EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                EntryDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => EntryDateString != null ? DateOnly.ParseExact(EntryDateString, "yyyy-MM-dd") : null;
+            set => EntryDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("exit_date")]
@@ -75,12 +71,8 @@ namespace Elwig.Models.Entities {
 
         [NotMapped]
         public DateOnly? ExitDate {
-            get {
-                return ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                ExitDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => ExitDateString != null ? DateOnly.ParseExact(ExitDateString, "yyyy-MM-dd") : null;
+            set => ExitDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("business_shares")]
@@ -181,7 +173,6 @@ namespace Elwig.Models.Entities {
 
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {
-                MgNr.ToString(),
                 FamilyName, MiddleName, GivenName,
                 BillingAddress?.Name,
                 Comment,

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

@@ -55,6 +55,14 @@ namespace Elwig.Models.Entities {
             set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
         }
 
+        [Column("bs_value")]
+        public long? BusinessShareValueValue { get; set; }
+        [NotMapped]
+        public decimal? BusinessShareValue {
+            get => BusinessShareValueValue != null ? DecFromDb(BusinessShareValueValue.Value) : null;
+            set => BusinessShareValueValue = value != null ? DecToDb(value.Value) : null;
+        }
+
         [Column("start_date")]
         public string? StartDateString { get; set; }
 

Elwig/Properties/PublishProfiles/FolderProfile.pubxml

@@ -9,7 +9,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\Publish</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -8,25 +8,49 @@
     "properties": {
       "mode": {"enum": ["elwig"]},
       "version": {"enum": [1]},
-      "payment": {
-        "type": ["number", "string", "object"],
-        "pattern": "^curve:[0-9]+$",
-        "additionalProperties": false,
-        "properties": {
-          "default": {
-            "type": ["number", "string"],
-            "pattern": "^curve:[0-9]+$"
-          }
-        },
-        "patternProperties": {
-          "^([A-Z]{2})?(\/[A-Z]*)?$": {
-            "type": ["number", "string"],
-            "pattern": "^curve:[0-9]+$"
-          }
+      "consider_delivery_modifiers": {"type": "boolean"},
+      "consider_contract_penalties": {"type": "boolean"},
+      "consider_total_penalty": {"type": "boolean"},
+      "consider_auto_business_shares": {"type": "boolean"},
+      "payment": {"$ref": "#/definitions/payment_1"},
+      "quality": {"$ref": "#/definitions/quality_1"},
+      "curves": {
+        "type": "array",
+        "items": {"$ref": "#/definitions/curve"}
+      }
+    }
+  }, {
+    "required": ["AuszahlungSorten", "Kurven"],
+    "properties": {
+      "mode": {"enum": ["wgmaster"]},
+      "AuszahlungSorten": {"$ref": "#/definitions/payment_1"},
+      "AuszahlungSortenQualitätsstufe": {"$ref": "#/definitions/quality_1"},
+      "Kurven": {
+        "type": "array",
+        "items": {"$ref": "#/definitions/curve"}
+      }
+    }
+  }],
+  "definitions": {
+    "payment_1": {
+      "type": ["number", "string", "object"],
+      "pattern": "^curve:[0-9]+$",
+      "additionalProperties": false,
+      "properties": {
+        "default": {
+          "type": ["number", "string"],
+          "pattern": "^curve:[0-9]+$"
         }
       },
-      "quality": {
-        "type": "object",
+      "patternProperties": {
+        "^([A-Z]{2})?(\/[A-Z]*)?$": {
+          "type": ["number", "string"],
+          "pattern": "^curve:[0-9]+$"
+        }
+      }
+    },
+    "quality_1": {
+      "type": "object",
         "additionalProperties": false,
         "patternProperties": {
           "^[A-Z]{3}$": {
@@ -47,58 +71,7 @@
             }
           }
         }
-      },
-      "curves": {
-        "type": "array",
-        "items": {"$ref": "#/definitions/curve"}
-      }
-    }
-  }, {
-    "properties": {
-      "mode": {"enum": ["wgmaster"]},
-      "AuszahlungSorten": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["Kurven"],
-        "properties": {
-          "Kurven": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "additionalProperties": false,
-              "minProperties": 1,
-              "patternProperties": {
-                "^[0-9]+(\\.[0-9]+)?oe$": {"type": "number"}
-              }
-            }
-          }
-        },
-        "patternProperties": {
-          "^[A-Z]{2}$": {
-            "type": "object",
-            "additionalProperties": false,
-            "patternProperties": {
-              "^[A-Z]*$": {
-                "type": "object",
-                "additionalProperties": false,
-                "properties": {
-                  "Gebunden": {
-                    "type": "integer",
-                    "minimum": 0
-                  },
-                  "NichtGebunden": {
-                    "type": "integer",
-                    "minimum": 0
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }],
-  "definitions": {
+    },
     "curve": {
       "type": "object",
       "required": ["id", "mode", "data"],
@@ -111,15 +84,15 @@
         "mode": {"enum": ["oe", "kmw"]},
         "data": {
           "anyOf": [
-            {"type": "number" },
+            {"type": "number"},
             {"$ref": "#/definitions/curve_data"}
-         ]
+          ]
         },
         "geb": {
           "anyOf": [
             {"type": "number"},
             {"$ref": "#/definitions/curve_data"}
-         ]
+          ]
         }
       }
     },

Elwig/Resources/Sql/12-13.sql

@@ -0,0 +1,31 @@
+-- schema version 11 to 12
+
+ALTER TABLE season ADD COLUMN bs_value INTEGER;
+
+CREATE TABLE member_history (
+    mgnr            INTEGER NOT NULL,
+    date            TEXT    NOT NULL CHECK (date REGEXP '^[1-9][0-9]{3}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$') DEFAULT CURRENT_DATE,
+
+    business_shares INTEGER NOT NULL,
+    type            TEXT    NOT NULL CHECK (type REGEXP '^[a-z_]+$'),
+    comment         TEXT DEFAULT NULL,
+
+    CONSTRAINT pk_member_history PRIMARY KEY (mgnr, date),
+    CONSTRAINT fk_member_history_member FOREIGN KEY (mgnr) REFERENCES member (mgnr)
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
+) STRICT;
+
+CREATE VIEW v_total_under_delivery AS
+SELECT s.year, m.mgnr, 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(d.sum, 0) AS weight,
+       IIF(COALESCE(d.sum, 0) < m.business_shares * s.min_kg_per_bs,
+           COALESCE(d.sum, 0) - m.business_shares * s.min_kg_per_bs,
+           IIF(COALESCE(d.sum, 0) > m.business_shares * s.max_kg_per_bs,
+               COALESCE(d.sum, 0) - m.business_shares * s.max_kg_per_bs,
+               0)) AS diff
+FROM member m, season s
+    LEFT JOIN v_stat_member d ON (d.year, d.mgnr) = (s.year, m.mgnr)
+ORDER BY s.year, m.mgnr;

Elwig/Windows/BaseDataWindow.xaml

@@ -375,14 +375,14 @@
                 </Grid>
             </TabItem>
 
-            <TabItem Header="Saisons">
+            <TabItem Header="Saisons" x:Name="Seasons">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180"/>
                         <ColumnDefinition Width="*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="180"/>
+                        <RowDefinition Height="205"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
 
@@ -446,6 +446,10 @@
                         <Label Content="Strafe (Nicht-Lieferung):" Margin="10,130,0,10" Grid.Column="2"/>
                         <ctrl:UnitTextBox x:Name="SeasonPenaltyNoneInput" Unit="€" TextChanged="SeasonPenaltyInput_TextChanged"
                                           Grid.Column="3" Width="68" Margin="0,130,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+                        <Label Content="GA-Wert:" Margin="10,160,0,10" Grid.Column="2"/>
+                        <ctrl:UnitTextBox x:Name="SeasonBsValueInput" Unit="€/GA" TextChanged="SeasonPenaltyInput_TextChanged"
+                                          Grid.Column="3" Width="85" Margin="0,160,10,10" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     </Grid>
 
                     <GroupBox Grid.Column="1" Grid.Row="1" Header="Zu-/Abschläge" Margin="0,0,10,10" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">

Elwig/Windows/BaseDataWindow.xaml.Branch.cs

@@ -125,6 +125,7 @@ namespace Elwig.Windows {
             if (old != null) _branches[old] = id;
             branch.ZwstId = id;
             branch.Name = BranchNameInput.Text;
+            branch.CountryNum = 40;
             branch.PostalDestId = (BranchOrtInput.SelectedItem as AT_PlzDest)?.Id;
             branch.Address = BranchAddressInput.Text;
             branch.PhoneNr = BranchPhoneNrInput.Text;

Elwig/Windows/BaseDataWindow.xaml.Mod.cs

@@ -52,13 +52,13 @@ namespace Elwig.Windows {
 
             var year = (SeasonList.SelectedItem as Season)?.Year;
             foreach (var (modid, _) in _mods.Where(m => m.Value == null)) {
-                Context.Remove(Context.Modifiers.Find(new object?[] { year, modid }));
+                Context.Remove(Context.Modifiers.Find(year, modid));
             }
             foreach (var (mod, old) in _modIds) {
                 mod.ModId = old;
             }
             foreach (var (old, modid) in _mods.Where(m => m.Value != null)) {
-                Context.Update(Context.Modifiers.Find(new object?[] { year, old }));
+                Context.Update(Context.Modifiers.Find(year, old));
             }
             await Context.SaveChangesAsync();
 
@@ -102,8 +102,9 @@ namespace Elwig.Windows {
             if (_modList == null || SeasonList.SelectedItem is not Season s) return;
             _modChanged = true;
             var idx = (SeasonModifierList.SelectedIndex != -1) ? SeasonModifierList.SelectedIndex + 1 : _modList.Count;
-            var item = Context.CreateProxy<Modifier>();
-            item.Year = s.Year;
+            var item = new Modifier {
+                Year = s.Year
+            };
             _modList.Insert(idx, item);
             SeasonModifierList.SelectedIndex = idx;
             UpdateButtons();

Elwig/Windows/BaseDataWindow.xaml.Season.cs

@@ -43,12 +43,14 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = s.PenaltyPerKg?.ToString() ?? "";
                 SeasonPenaltyInput.Text = s.PenaltyAmount?.ToString() ?? "";
                 SeasonPenaltyNoneInput.Text = s.PenaltyNone?.ToString() ?? "";
+                SeasonBsValueInput.Text = s.BusinessShareValue?.ToString() ?? "";
 
                 var sym = s.Currency.Symbol ?? "";
                 SeasonModifierAbsInput.Unit = $"{sym}/kg";
                 SeasonPenaltyPerKgInput.Unit = $"{sym}/kg";
                 SeasonPenaltyInput.Unit = sym;
                 SeasonPenaltyNoneInput.Unit = sym;
+                SeasonBsValueInput.Unit = $"{sym}/GA";
                 AreaCommitmentTypePenaltyPerKgInput.Unit = $"{sym}/kg";
                 AreaCommitmentTypePenaltyInput.Unit = sym;
                 AreaCommitmentTypePenaltyNoneInput.Unit = sym;
@@ -64,6 +66,7 @@ namespace Elwig.Windows {
                 SeasonPenaltyPerKgInput.Text = "";
                 SeasonPenaltyInput.Text = "";
                 SeasonPenaltyNoneInput.Text = "";
+                SeasonBsValueInput.Text = "";
             }
             _seasonUpdate = false;
         }
@@ -85,6 +88,7 @@ namespace Elwig.Windows {
             s.PenaltyPerKg = (SeasonPenaltyPerKgInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyPerKgInput.Text) : null;
             s.PenaltyAmount = (SeasonPenaltyInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyInput.Text) : null;
             s.PenaltyNone = (SeasonPenaltyNoneInput.Text.Length > 0) ? decimal.Parse(SeasonPenaltyNoneInput.Text) : null;
+            s.BusinessShareValue = (SeasonBsValueInput.Text.Length > 0) ? decimal.Parse(SeasonBsValueInput.Text) : null;
 
             UpdateButtons();
         }

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -27,7 +27,8 @@ namespace Elwig.Windows {
                 AreaCommitmentTypeMinKgPerHaInput.TextBox, AreaCommitmentTypePenaltyPerKgInput.TextBox,
                 AreaCommitmentTypePenaltyInput.TextBox, AreaCommitmentTypePenaltyNoneInput.TextBox,
                 SeasonMaxKgPerHaInput.TextBox, SeasonVatNormalInput.TextBox, SeasonVatFlatrateInput.TextBox, SeasonStartInput, SeasonEndInput,
-                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
+                SeasonMinKgPerBsInput.TextBox, SeasonMaxKgPerBsInput.TextBox, SeasonBsValueInput.TextBox,
+                SeasonPenaltyPerKgInput.TextBox, SeasonPenaltyInput.TextBox, SeasonPenaltyNoneInput.TextBox,
                 SeasonModifierIdInput, SeasonModifierNameInput, SeasonModifierRelInput.TextBox, SeasonModifierAbsInput.TextBox,
             };
             WineAttributeFillLowerInput.Visibility = Visibility.Hidden;
@@ -72,6 +73,7 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.TextBox.IsReadOnly = true;
             SeasonPenaltyInput.TextBox.IsReadOnly = true;
             SeasonPenaltyNoneInput.TextBox.IsReadOnly = true;
+            SeasonBsValueInput.TextBox.IsReadOnly = true;
 
             SeasonModifierIdInput.IsReadOnly = true;
             SeasonModifierNameInput.IsReadOnly = true;
@@ -117,6 +119,7 @@ namespace Elwig.Windows {
             SeasonPenaltyPerKgInput.TextBox.IsReadOnly = false;
             SeasonPenaltyInput.TextBox.IsReadOnly = false;
             SeasonPenaltyNoneInput.TextBox.IsReadOnly = false;
+            SeasonBsValueInput.TextBox.IsReadOnly = false;
 
             SeasonModifierIdInput.IsReadOnly = false;
             SeasonModifierNameInput.IsReadOnly = false;
@@ -261,6 +264,8 @@ namespace Elwig.Windows {
             ClearInputStates();
             FillInputs(App.Client);
             LockInputs();
+
+            await HintContextChange();
         }
 
         private void FillInputs(ClientParameters p) {

Elwig/Windows/ChartWindow.xaml

@@ -1,4 +1,4 @@
-<local:AdministrationWindow
+<local:ContextWindow
         x:Class="Elwig.Windows.ChartWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,7 +8,7 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:ScottPlot="clr-namespace:ScottPlot;assembly=ScottPlot.WPF"
         mc:Ignorable="d"
-        Title="Auszahlung - Elwig" Height="700" Width="1500"
+        Title="Auszahlung - Elwig" Height="700" Width="1500" MinWidth="1000" MinHeight="500"
         Loaded="Window_Loaded">
 
     <Window.Resources>
@@ -43,94 +43,77 @@
 
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="19"/>
+            <RowDefinition Height="40"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="230"/>
             <ColumnDefinition Width="1*"/>
             <ColumnDefinition Width="200"/>
         </Grid.ColumnDefinitions>
 
-        <Grid Grid.Row="1" Margin="5,0,0,0">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*"/>
-                <RowDefinition Height="42"/>
-            </Grid.RowDefinitions>
+        <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="150"/>
+                <ColumnDefinition Width="500"/>
             </Grid.ColumnDefinitions>
 
-            <DataGrid x:Name="GraphList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
-                      CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
-                      SelectionChanged="GraphList_SelectionChanged"
-                      Margin="5,15,5,0" Grid.Row="0" FontSize="14" Grid.ColumnSpan="3">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="Nr."    Binding="{Binding Num}"       Width="40">
-                        <DataGridTextColumn.ElementStyle>
-                            <Style>
-                                <Setter Property="TextBlock.TextWrapping" Value="Wrap" />
-                            </Style>
-                        </DataGridTextColumn.ElementStyle>
-                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Typ"    Binding="{Binding Type}"       Width="40"/>
-                    <DataGridTextColumn Header="Angewandte Verträge" Binding="{Binding Contracts}" Width="4*"/>
-                </DataGrid.Columns>
-            </DataGrid>
+            <Label Content="Graph:" Margin="10,0,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"/>
+            <TextBlock x:Name="GraphNum" Margin="0,0,40,0" FontSize="14" Width="50" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>
 
-            <Button x:Name="NewButton" Content="Neu"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="NewButton_Click"/>
-            <Button x:Name="EditButton" Content="Bearbeiten" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="EditButton_Click"/>
-            <Button x:Name="DeleteButton" Content="Löschen" IsEnabled="False"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="DeleteButton_Click"/>
-
-            <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"
-                    Click="SaveButton_Click"/>
-            <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"
-                    Click="ResetButton_Click"/>
-            <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
-                    HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"
-                    Click="CancelButton_Click"/>
+            <Label Content="Für:" Margin="10,0,0,0" FontSize="14" Grid.Column="1" VerticalAlignment="Center"/>
+            <xctk:CheckComboBox x:Name="AppliedInput" Margin="0,10,10,10" Grid.Column="1"
+                                        Delimiter=", " AllItemsSelectedContent="Alle"
+                                        Width="400" HorizontalAlignment="Right">
+                <!--<xctk:CheckComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{}" Width="40"/>
+                        </StackPanel>
+                    </DataTemplate>
+                </xctk:CheckComboBox.ItemTemplate>-->
+            </xctk:CheckComboBox>
         </Grid>
 
+        <ListBox x:Name="GraphList" Margin="10,10,35,50" Grid.Column="0" Grid.Row="1" SelectionChanged="GraphList_SelectionChanged">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock Text="{Binding Id}" Width="40"/>
+                        <TextBlock Text="{Binding Contracts}" Width="100"/>
+                    </StackPanel>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+
+        <Button x:Name="SaveButton" Content="Speichern" IsEnabled="True"
+            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10,5,35,15" Grid.Column="0" Grid.Row="2"
+            Click="SaveButton_Click"/>
+
+        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.Column="0" Grid.Row="1"
+            Click="AddButton_Click"/>
+        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+            VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="0,0,5,0" Grid.Column="0" Grid.Row="1"
+            Click="CopyButton_Click"/>
+        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.Column="0" Grid.Row="1"
+                Click="DeleteButton_Click"/>
+
         <Grid Grid.Row="1" Grid.Column="1">
             <ScottPlot:WpfPlot x:Name="OechslePricePlot" MouseMove="OechslePricePlot_MouseMove" MouseDown="OechslePricePlot_MouseDown" IsEnabled="False"/>
         </Grid>
 
-        <Grid Grid.Row="1" Grid.Column="2" Margin="0,0,5,0">
+        <Grid Grid.Row="1" Grid.Column="2" Margin="0,0,5,36">
             <Grid.RowDefinitions>
                 <RowDefinition Height="120"/>
-                <RowDefinition Height="120"/>
+                <RowDefinition Height="90"/>
                 <RowDefinition Height="210"/>
+                <RowDefinition Height="1*"/>
                 <RowDefinition Height="110"/>
-                <RowDefinition Height="42"/>
             </Grid.RowDefinitions>
 
-            <GroupBox Header="Graph" Grid.Row="0" Margin="0,5,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="85"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Label Content="Nummer:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="GraphNumberInput" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0" Text="" Width="90" TextChanged="GraphNumberInput_TextChanged" LostFocus="GraphNumberInput_LostFocus"/>
-
-                    <Label Content="Typ:" Margin="10,45,0,0" Grid.Column="0"/>
-                    <RadioButton x:Name="OechsleGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,45,0,0">Oechsle</RadioButton>
-                    <RadioButton x:Name="KmwGraphType_Input" GroupName="GraphType" Grid.Column="1" Margin="0,60,0,0">KMW</RadioButton>
-                </Grid>
-            </GroupBox>
-
-            <GroupBox Header="Datenpunkt" Grid.Row="1" Margin="0,5,5,5">
+            <GroupBox Header="Datenpunkt" Grid.Row="0" Margin="0,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="85"/>
@@ -146,6 +129,23 @@
                 </Grid>
             </GroupBox>
 
+            <GroupBox Header="Gebunden" Grid.Row="1" Margin="0,5,5,5">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <StackPanel Margin="10,10,0,0">
+                        <RadioButton GroupName="GebundenType">Fix</RadioButton>
+                        <RadioButton GroupName="GebundenType">Graph</RadioButton>
+                        <RadioButton GroupName="GebundenType" IsChecked="True">Nein</RadioButton>
+                    </StackPanel>
+
+                    <TextBox x:Name="GebundenBonus" IsReadOnly="True" Grid.Column="1" HorizontalAlignment="Left" Margin="0,12,0,0" Text="" Width="90" TextChanged="GebundenBonus_TextChanged"/>
+                 </Grid>
+            </GroupBox>
+
             <GroupBox Header="Aktionen" Grid.Row="2" Margin="0,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
@@ -166,7 +166,7 @@
                 </Grid>
             </GroupBox>
 
-            <GroupBox Header="Optionen" Grid.Row="3" Margin="0,5,5,5">
+            <GroupBox Header="Optionen" Grid.Row="4" Margin="0,5,5,5">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*"/>
@@ -186,4 +186,4 @@
             </GroupBox>
         </Grid>
     </Grid>
-</local:AdministrationWindow>
+</local:ContextWindow>

Elwig/Windows/ChartWindow.xaml.cs

@@ -17,10 +17,11 @@ using ScottPlot;
 using ScottPlot.Plottable;
 
 namespace Elwig.Windows {
-    public partial class ChartWindow : AdministrationWindow {
+    public partial class ChartWindow : ContextWindow {
 
         public readonly int Year;
         public readonly int AvNr;
+        private readonly PaymentVar PaymentVar;
 
         private ScatterPlot OechslePricePlotScatter;
         private MarkerPlot HighlightedPoint;
@@ -38,21 +39,18 @@ namespace Elwig.Windows {
         private const int MinOechsle = 50;
         private const int MaxOechsle = 140;
 
-        private Graph? Graph;
+        private List<GraphEntry> GraphEntries = [];
+        private GraphEntry? SelectedGraphEntry;
 
         public ChartWindow(int year, int avnr) {
             InitializeComponent();
             Year = year;
             AvNr = avnr;
-            var v = Context.PaymentVariants.Find(year, avnr);
-            Title = $"{v?.Name} - Lese {year} - Elwig";
-            ExemptInputs = [
-                GraphList, OechsleInput, PriceInput, FreeZoomInput, GradationLinesInput, TooltipInput
-            ];
+            PaymentVar = Context.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
+            Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs evt) {
-            LockInputs();
             OechslePricePlot.IsEnabled = false;
         }
 
@@ -61,170 +59,65 @@ namespace Elwig.Windows {
             await RefreshGraphListQuery();
         }
 
-        private static JsonObject? ParseData(PaymentVar variant) {
-            try {
-                return BillingData.ParseJson(variant.Data);
-            } catch (ArgumentException) {
-                return null;
-            }
-        }
+        private async Task RefreshGraphListQuery() {
+            var attrVariants = Context.DeliveryParts
+                .Where(d => d.Year == Year)
+                .Select(d => $"{d.SortId}{d.AttrId}")
+                .Distinct()
+                .ToList()
+                .Union(Context.WineVarieties.Select(v => v.SortId))
+                .Order()
+                .ToList();
+            var data = EditBillingData.FromJson(PaymentVar.Data, attrVariants);
+            GraphEntries.AddRange(data.GetPaymentGraphEntries());
+            GraphEntries.AddRange(data.GetQualityGraphEntries());
 
-        private async Task RefreshGraphListQuery(bool updateSort = false) {
-            var paymentVar = await Context.PaymentVariants.FindAsync(Year, AvNr);
-            if (paymentVar == null) return;
-            var data = ParseData(paymentVar);
-            if (data == null) return;
-
-            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
-            if (auszahlungsSorten == null) {
-                return;
-            }
-
-            var Graphs = auszahlungsSorten["Kurven"]?.AsArray();
-
-            if (Graphs == null) {
-                return;
-            }
-
-            List<Graph> GraphsList = [];
-
-            int i = 1;
-            foreach (var graph in Graphs) {
-                GraphsList.Add(new Graph("Oe", i, graph?.AsObject(), ParseContracts(auszahlungsSorten, i - 1), 50, 140));
-                i++;
-            }
-
-            ControlUtils.RenewItemsSource(GraphList, GraphsList, g => (g as Graph)?.Num);
-            if (GraphsList.Count == 1) {
-                GraphList.SelectedIndex = 0;
-            }
+            ControlUtils.RenewItemsSource(AppliedInput, attrVariants, g => g);
+            ControlUtils.RenewItemsSource(GraphList, GraphEntries, g => (g as GraphEntry)?.Id, null, ControlUtils.RenewSourceDefault.IfOnly);
 
             RefreshInputs();
         }
 
         private string ParseContracts(JsonObject auszahlungsSorten, int num) {
-            List<string> contracts = [];
-
-            foreach (var sorte in auszahlungsSorten) {
-                if (sorte.Key == "Kurven") continue;
-                foreach (var attribut in sorte.Value.AsObject()) {
-                    foreach (var bindung in attribut.Value.AsObject()) {
-                        if ((int)bindung.Value.AsValue() == num) {
-                            contracts.Add($"{sorte.Key}/{attribut.Key}/{bindung.Key}");
-                        }
-                    }
-                }
-            }
-
-            return string.Join("\n", contracts);
-        }
-
-        private async Task<bool> RemoveGraph(int num) {
-            var paymentVar = await Context.PaymentVariants.FindAsync(Year, AvNr);
-            if (paymentVar == null) return false;
-            var data = ParseData(paymentVar);
-            if (data == null) return false;
-
-            var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
-            if (auszahlungsSorten == null) {
-                return false;
-            }
-
-            var Graphs = auszahlungsSorten["Kurven"]?.AsObject();
-            if (Graphs == null) {
-                return false;
-            }
-
-            int i = 1;
-            foreach (var graph in Graphs) {
-                if (i == num) {
-                    Graphs.Remove(graph.Key);
-                    break;
-                }
-                i++;
-            }
-
-            foreach (var sorte in auszahlungsSorten) {
-                if (sorte.Key == "Kurven") continue;
-                foreach (var attribut in sorte.Value.AsObject()) {
-                    var bindungen = attribut.Value.AsObject();
-                    foreach (var bindung in bindungen) {
-                        int v = (int)bindung.Value;
-                        if (v == num - 1) {
-                            bindungen.Remove(bindung.Key);
-                        } else if (v > num - 1) {
-                            bindungen[bindung.Key] = v - 1;
-                        }
-                    }
-                }
-            }
-
-            EntityEntry<PaymentVar>? tr = null;
-            try {
-                paymentVar.Data = data.ToString();
-                tr = Context.Update(paymentVar);
-
-                await Context.SaveChangesAsync();
-            } catch (Exception exc) {
-                if (tr != null) await tr.ReloadAsync();
-                var str = "Der Eintrag konnte nicht in der Datenbank gelöscht werden!\n\n" + exc.Message;
-                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-
-            return true;
+            return "";
         }
        
         private void RefreshInputs(bool validate = false) {
             ResetPlot();
-            ClearInputStates();
-            if (GraphList.SelectedItem is Graph g) {
-                EditButton.IsEnabled = true;
-                DeleteButton.IsEnabled = true;
-                EnableOptionButtons();
-                FillInputs(g);
-            } else {
-                EditButton.IsEnabled = false;
+            if (!PaymentVar.TestVariant) {
+                AddButton.IsEnabled = false;
+                CopyButton.IsEnabled = false;
                 DeleteButton.IsEnabled = false;
+                OechsleInput.IsReadOnly = true;
+                PriceInput.IsReadOnly = true;
+            } else if (SelectedGraphEntry != null) {
+                CopyButton.IsEnabled = true;
+                DeleteButton.IsEnabled = true;
+                OechsleInput.IsReadOnly = false;
+                EnableOptionButtons();
+                FillInputs();
+            } else {
+                CopyButton.IsEnabled = false;
+                DeleteButton.IsEnabled = false;
+                OechsleInput.IsReadOnly = true;
                 DisableOptionButtons();
-                ClearOriginalValues();
-                ClearInputs(validate);
-                ClearInputStates();
             }
             GC.Collect();
         }
 
-        private void FillInputs(Graph g) {
-            ClearOriginalValues();
-
-            Graph = (Graph)g.Clone();
-            
-            GraphNumberInput.Text = Graph.Num.ToString();
-            if (Graph.Type == "oe") {
-                OechsleGraphType_Input.IsChecked = true;
-            } else if (Graph.Type == "kmw") {
-                KmwGraphType_Input.IsChecked = true;
-            }
+        private void FillInputs() {
+            GraphNum.Text = SelectedGraphEntry.Id.ToString();
 
             InitPlot();
             OechslePricePlot.IsEnabled = true;
-
-            FinishInputFilling();
-        }
-
-        private void InitInputs() {
-            GraphNumberInput.Text = (GraphList.Items.Count + 1).ToString();
-            OechsleGraphType_Input.IsChecked = true;
-            FinishInputFilling();
         }
 
         protected override async Task OnRenewContext() {
-            await base.OnRenewContext();
             await RefreshGraphList();
         }
 
         private void InitPlot() {
-            OechslePricePlotScatter = OechslePricePlot.Plot.AddScatter(Graph.DataX, Graph.DataY);
+            OechslePricePlotScatter = OechslePricePlot.Plot.AddScatter(SelectedGraphEntry.DataGraph.DataX, SelectedGraphEntry.DataGraph.DataY);
 
             OechslePricePlot.Configuration.DoubleClickBenchmark = false;
             OechslePricePlotScatter.LineColor = Color.Blue;
@@ -265,7 +158,6 @@ namespace Elwig.Windows {
         }
 
         private void ResetPlot() {
-            Graph = null;
             PrimaryMarkedPointIndex = -1;
             OechslePricePlot.Plot.Remove(OechslePricePlotScatter);
             OechslePricePlot.Plot.Clear();
@@ -280,16 +172,12 @@ namespace Elwig.Windows {
         }
 
         private void FlattenGraph(int begin, int end, double value) {
-            for (int i = begin; i <= end; i++) {
-                Graph.DataY[i] = value;
-            }
+            SelectedGraphEntry.DataGraph.FlattenGraph(begin, end, value);
             OechslePricePlot.Render();
         }
 
         private void LinearIncreaseGraph(int begin, int end, double inc) {
-            for (int i = begin; i < end; i++) {
-                Graph.DataY[i + 1] = Graph.DataY[i] + inc;
-            }
+            SelectedGraphEntry.DataGraph.LinearIncreaseGraph(begin, end, inc);
             OechslePricePlot.Render();
         }
 
@@ -380,8 +268,6 @@ namespace Elwig.Windows {
         }
 
         private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            IntegerInput_TextChanged(sender, evt);
-
             bool success = int.TryParse(OechsleInput.Text, out int oechsle);
 
             SecondaryMarkedPointIndex = -1;
@@ -390,12 +276,13 @@ namespace Elwig.Windows {
             if (success) {
                 if (oechsle >= MinOechsle && oechsle <= MaxOechsle) {
                     PrimaryMarkedPointIndex = oechsle - MinOechsle;
-                    ChangeMarker(PrimaryMarkedPoint, true, Graph.DataX[PrimaryMarkedPointIndex], Graph.DataY[PrimaryMarkedPointIndex]);
+                    ChangeMarker(PrimaryMarkedPoint, true, SelectedGraphEntry.DataGraph.DataX[PrimaryMarkedPointIndex], SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex]);
 
-                    PriceInput.Text = Graph.DataY[PrimaryMarkedPointIndex].ToString();
+                    PriceInput.Text = SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex].ToString();
 
-                    if (IsEditing || IsCreating) EnableActionButtons();
+                    EnableActionButtons();
                     OechslePricePlot.Render();
+                    PriceInput.IsReadOnly = false;
                     return;
                 }
             }
@@ -405,6 +292,7 @@ namespace Elwig.Windows {
             DisableActionButtons();
             PriceInput.Text = "";
             OechslePricePlot.Render();
+            PriceInput.IsReadOnly = true;
         }
 
         private void PriceInput_TextChanged(object sender, RoutedEventArgs evt) {
@@ -412,10 +300,8 @@ namespace Elwig.Windows {
                 bool success = Double.TryParse(PriceInput.Text, out double price);
 
                 if (success) {
-                    Graph.DataY[PrimaryMarkedPointIndex] = price;
+                    SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex] = price;
                     PrimaryMarkedPoint.Y = price;
-                    SaveButton.IsEnabled = true;
-                    ResetButton.IsEnabled = true;
                     OechslePricePlot.Refresh();
                 }
             }
@@ -425,18 +311,14 @@ namespace Elwig.Windows {
             if (PrimaryMarkedPointIndex == -1) {
                 return;
             }
-            FlattenGraph(0, PrimaryMarkedPointIndex, Graph.DataY[PrimaryMarkedPointIndex]);
-            SaveButton.IsEnabled = true;
-            ResetButton.IsEnabled = true;
+            FlattenGraph(0, PrimaryMarkedPointIndex, SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex]);
         }
 
         private void RightFlatButton_Click(object sender, RoutedEventArgs evt) {
             if (PrimaryMarkedPointIndex == -1) {
                 return;
             }
-            FlattenGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, Graph.DataY[PrimaryMarkedPointIndex]);
-            SaveButton.IsEnabled = true;
-            ResetButton.IsEnabled = true;
+            FlattenGraph(PrimaryMarkedPointIndex, SelectedGraphEntry.DataGraph.DataY.Length - 1, SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex]);
         }
 
         private void InterpolateButton_Click(object sender, RoutedEventArgs evt) {
@@ -446,13 +328,11 @@ namespace Elwig.Windows {
             }
             var (lowIndex, highIndex) = PrimaryMarkedPointIndex < SecondaryMarkedPointIndex ? (PrimaryMarkedPointIndex, SecondaryMarkedPointIndex): (SecondaryMarkedPointIndex, PrimaryMarkedPointIndex);
 
-            double step = (Graph.DataY[highIndex] - Graph.DataY[lowIndex]) / steps;
+            double step = (SelectedGraphEntry.DataGraph.DataY[highIndex] - SelectedGraphEntry.DataGraph.DataY[lowIndex]) / steps;
 
             for (int i = lowIndex; i < highIndex - 1; i++) {
-                Graph.DataY[i + 1] = Math.Round(Graph.DataY[i] + step, 4); // TODO richtig runden
+                SelectedGraphEntry.DataGraph.DataY[i + 1] = Math.Round(SelectedGraphEntry.DataGraph.DataY[i] + step, 4); // TODO richtig runden
             }
-            SaveButton.IsEnabled = true;
-            ResetButton.IsEnabled = true;
         }
 
         private void LinearIncreaseButton_Click(object sender, RoutedEventArgs e) { 
@@ -463,23 +343,21 @@ namespace Elwig.Windows {
             if (priceIncrease == null) {
                 return;
             }
-            LinearIncreaseGraph(PrimaryMarkedPointIndex, Graph.DataY.Length - 1, priceIncrease.Value);
-            SaveButton.IsEnabled = true;
-            ResetButton.IsEnabled = true;
+            LinearIncreaseGraph(PrimaryMarkedPointIndex, SelectedGraphEntry.DataGraph.DataY.Length - 1, priceIncrease.Value);
         }
 
         private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
-            if (!IsCreating && GraphList.SelectedItem == null) {
+            if (GraphList.SelectedItem == null) {
                 return;
             }
 
             if (HoverActive) {
-                if ((IsEditing || IsCreating) && Keyboard.IsKeyDown(Key.LeftCtrl)) {
+                if (PaymentVar.TestVariant && Keyboard.IsKeyDown(Key.LeftCtrl)) {
                     if (PrimaryMarkedPointIndex == -1) {
                         return;
                     }
                     SecondaryMarkedPointIndex = HighlightedIndex;
-                    ChangeMarker(SecondaryMarkedPoint, true, Graph.DataX[SecondaryMarkedPointIndex], Graph.DataY[SecondaryMarkedPointIndex]);
+                    ChangeMarker(SecondaryMarkedPoint, true, SelectedGraphEntry.DataGraph.DataX[SecondaryMarkedPointIndex], SelectedGraphEntry.DataGraph.DataY[SecondaryMarkedPointIndex]);
 
                     InterpolateButton.IsEnabled = true;
 
@@ -487,12 +365,12 @@ namespace Elwig.Windows {
                 }
 
                 PrimaryMarkedPointIndex = HighlightedIndex;
-                ChangeMarker(PrimaryMarkedPoint, true, Graph.DataX[PrimaryMarkedPointIndex], Graph.DataY[PrimaryMarkedPointIndex]);
+                ChangeMarker(PrimaryMarkedPoint, true, SelectedGraphEntry.DataGraph.DataX[PrimaryMarkedPointIndex], SelectedGraphEntry.DataGraph.DataY[PrimaryMarkedPointIndex]);
 
-                OechsleInput.Text = Graph.DataX[HighlightedIndex].ToString();
-                PriceInput.Text = Graph.DataY[HighlightedIndex].ToString();
+                OechsleInput.Text = SelectedGraphEntry.DataGraph.DataX[HighlightedIndex].ToString();
+                PriceInput.Text = SelectedGraphEntry.DataGraph.DataY[HighlightedIndex].ToString();
 
-                if (IsEditing || IsCreating) {
+                if (PaymentVar.TestVariant) {
                     EnableActionButtons();
                 }
             } else {
@@ -509,7 +387,7 @@ namespace Elwig.Windows {
         }
 
         private void OechslePricePlot_MouseMove(object sender, MouseEventArgs e) {
-            if (!IsCreating && GraphList.SelectedItem == null) {
+            if (GraphList.SelectedItem == null) {
                 return;
             }
 
@@ -546,188 +424,45 @@ namespace Elwig.Windows {
             }
         }
 
-        override protected void UpdateButtons() {
-            if (!IsEditing && !IsCreating) return;
-            bool ch = HasChanged, v = IsValid;
+        private int getMaxGraphId() {
+            return GraphEntries.Count == 0 ? 0 : GraphEntries.Select(g => g.Id).Max();
         }
 
-        private void DisableNewEditDeleteButtons() {
-            NewButton.IsEnabled = false;
-            EditButton.IsEnabled = false;
-            DeleteButton.IsEnabled = false;
+        private void AddButton_Click(object sender, RoutedEventArgs e) {
+            GraphEntry newGraphEntry = new(getMaxGraphId() + 1, BillingData.CurveMode.Oe, MinOechsle, MaxOechsle);
+            GraphEntries.Add(newGraphEntry);
+            GraphList.Items.Refresh();
+            GraphList.SelectedItem = newGraphEntry;
         }
 
-        private void EnableNewEditDeleteButtons() {
-            NewButton.IsEnabled = true;
-            EditButton.IsEnabled = GraphList.SelectedItem != null;
-            DeleteButton.IsEnabled = GraphList.SelectedItem != null;
+        private void CopyButton_Click(object sender, RoutedEventArgs e) {
+            if (SelectedGraphEntry == null) return;
+
+            GraphEntry newGraphEntry = SelectedGraphEntry.Copy(getMaxGraphId() + 1);
+            GraphEntries.Add(newGraphEntry);
+            GraphList.Items.Refresh();
+            GraphList.SelectedItem = newGraphEntry;
         }
 
-        private void ShowSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = true;
-            SaveButton.Visibility = Visibility.Visible;
-            ResetButton.Visibility = Visibility.Visible;
-            CancelButton.Visibility = Visibility.Visible;
-        }
-
-        private void HideSaveResetCancelButtons() {
-            SaveButton.IsEnabled = false;
-            ResetButton.IsEnabled = false;
-            CancelButton.IsEnabled = false;
-            SaveButton.Visibility = Visibility.Hidden;
-            ResetButton.Visibility = Visibility.Hidden;
-            CancelButton.Visibility = Visibility.Hidden;
-        }
-        private void ShowNewEditDeleteButtons() {
-            EnableNewEditDeleteButtons();
-            NewButton.Visibility = Visibility.Visible;
-            EditButton.Visibility = Visibility.Visible;
-            DeleteButton.Visibility = Visibility.Visible;
-        }
-
-        private void HideNewEditDeleteButtons() {
-            DisableNewEditDeleteButtons();
-            NewButton.Visibility = Visibility.Hidden;
-            EditButton.Visibility = Visibility.Hidden;
-            DeleteButton.Visibility = Visibility.Hidden;
-        }
-
-        private void NewButton_Click(object sender, RoutedEventArgs e) {
-            IsCreating = true;
-            GraphList.IsEnabled = false;
-            GraphList.SelectedItem = null;
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
-            UnlockInputs();
-            PriceInput.IsReadOnly = false;
-            OechsleInput.IsReadOnly = false;
-            InitInputs();
-            FillInputs(new Graph(GraphList.Items.Count + 1, MinOechsle, MaxOechsle));
-            EnableOptionButtons();
-        }
-
-        private void EditButton_Click(object sender, RoutedEventArgs e) {
-            if (GraphList.SelectedItem == null) {
-                return;
-            }
-
-            IsEditing = true;
-            GraphList.IsEnabled = false;
-
-            HideNewEditDeleteButtons();
-            ShowSaveResetCancelButtons();
-            UnlockInputs();
-            PriceInput.IsReadOnly = false;
-            OechsleInput.IsReadOnly = false;
-            if (PrimaryMarkedPointIndex != -1) EnableActionButtons();
-        }
-
-        private async void DeleteButton_Click(object sender, RoutedEventArgs e) {
-            Graph g = (Graph)GraphList.SelectedItem;
-            if (g == null) return;
+        private void DeleteButton_Click(object sender, RoutedEventArgs e) {
+            if (SelectedGraphEntry == null) return;
 
             var r = MessageBox.Show(
-                $"Soll der Graph {g.Num} (verwendet in folgenden Verträgen: {g.Contracts}) wirklich unwiderruflich gelöscht werden?",
+                $"Soll der Graph {SelectedGraphEntry.Id} (verwendet in folgenden Verträgen: {SelectedGraphEntry.Contracts}) wirklich gelöscht werden?",
                 "Graph löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+
             if (r == MessageBoxResult.Yes) {
-                bool success = await RemoveGraph(g.Num);
-                if (!success) {
-                    MessageBox.Show("Der Graph konnte nicht gelöscht werden", "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                await RefreshGraphList();
+                GraphEntries.Remove(SelectedGraphEntry);
+                GraphList.Items.Refresh();
             }
         }
 
-
-        private async void SaveButton_Click(object sender, RoutedEventArgs e) {
-            int? index = await UpdateGraph(Graph);
-            if (index == null) {
-                MessageBox.Show("Der Graph konnte nicht gespeichert werden", "Graph speichern", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            IsEditing = false;
-            IsCreating = false;
-            GraphList.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
-            LockInputs();
-            PriceInput.IsReadOnly = true;
-            OechsleInput.IsReadOnly = true;
-            await RefreshGraphList();
-            GraphList.SelectedIndex = index.Value;
+        private void SaveButton_Click(object sender, RoutedEventArgs e) {
+            //TODO SAVE
         }
 
-        private async Task<int?> UpdateGraph(Graph g) {
-            List<PaymentVar> paymentVars = await Context.PaymentVariants.Where(p => p.Year == Year && p.AvNr == AvNr).ToListAsync();
-
-            if (paymentVars.Count != 1) {
-                return null;
-            }
-
-            PaymentVar paymentVar = paymentVars[0];
-            var data = JsonNode.Parse(paymentVar.Data).AsObject();
-
-            var auszahlungsSorten = data["AuszahlungSorten"];
-            if (auszahlungsSorten == null) {
-                return null;
-            }
-
-            var Graphs = auszahlungsSorten["Kurven"].AsArray();
-            if (Graphs == null) {
-                return null;
-            }
-
-            if (IsEditing) {
-                Graphs[g.Num - 1] = g.ToJson();
-            } else if(IsCreating) {
-                Graphs.Add(g.ToJson());
-            } else {
-                return null;
-            }
-
-            EntityEntry<PaymentVar>? tr = null;
-            try {
-                paymentVar.Data = data.ToString();
-                tr = Context.Update(paymentVar);
-
-                await Context.SaveChangesAsync();
-            } catch (Exception exc) {
-                if (tr != null) await tr.ReloadAsync();
-                var str = "Der Eintrag konnte nicht in der Datenbank gelöscht werden!\n\n" + exc.Message;
-                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Graph löschen", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-
-            return g.Num - 1;
-        }
-
-        private void ResetButton_Click(object sender, RoutedEventArgs e) {
-            if (IsEditing) {
-                RefreshInputs();
-            } else if (IsCreating) {
-                InitInputs();
-            }
-            UpdateButtons();
-        }
-
-        private void CancelButton_Click(object sender, RoutedEventArgs e) {
-            IsEditing = false;
-            IsCreating = false;
-            GraphList.IsEnabled = true;
-            HideSaveResetCancelButtons();
-            ShowNewEditDeleteButtons();
-            DisableActionButtons();
-            RefreshInputs();
-            PriceInput.Text = "";
-            OechsleInput.Text = "";
-            ClearInputStates();
-            LockInputs();
-            PriceInput.IsReadOnly = true;
-            OechsleInput.IsReadOnly = true;
-        }
-
-        private void GraphList_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) {
+        private void GraphList_SelectionChanged(object sender, SelectionChangedEventArgs e) {
+            SelectedGraphEntry = (GraphEntry)GraphList.SelectedItem;
             RefreshInputs();
 
             //var x = OechslePricePlot.Plot.GetPlottables().OfType<ScatterPlot>();
@@ -742,11 +477,7 @@ namespace Elwig.Windows {
 
         }
 
-        private void GraphNumberInput_TextChanged(object sender, TextChangedEventArgs e) {
-
-        }
-
-        private void GraphNumberInput_LostFocus(object sender, RoutedEventArgs e) {
+        private void GebundenBonus_TextChanged(object sender, TextChangedEventArgs evt) {
 
         }
     }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -92,8 +92,27 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,10,161,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"
-                     ToolTip="Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.&#xA;&#xA;Filtern nach:&#xA;Sorte: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...&#xA;Qualitätsstufe: z.B. QUW, kab, ldw, ...&#xA;Gradation: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...&#xA;Mitglied: z.B. 1234, 987, ...&#xA;Saison: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...&#xA;Zweigstelle: z.B. musterort, ...&#xA;Attribute: z.B. kabinett, !kabinett (alle außer kabinett), ...&#xA;Datum: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...&#xA;Uhrzeit: z.B. 06:00-08:00, 18:00-, ...&#xA;Freitext: z.B. Lieferscheinnummern, &quot;quw&quot; (sucht nach dem Text &quot;quw&quot;)"/>
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        Lieferungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
+                        <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
+                        <Bold>Qualitätsstufe</Bold>: z.B. QUW, kab, !ldw (ausgenommen LDW), ...<LineBreak/>
+                        <Bold>Gradation</Bold>: z.B. &gt;73, &lt;15, 17-18, 15-, &gt;17,5, 62-75, ...<LineBreak/>
+                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
+                        <Bold>Saison</Bold>: z.B. 2020, &gt;2015, 2017-2019, &lt;2005, 2019-, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Attribute</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
+                        <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
+                        <Bold>Freitext</Bold>: z.B. Lieferscheinnummern, Anmerkung, "quw" (sucht nach dem Text "quw")
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
             <xctk:IntegerUpDown x:Name="SeasonInput" Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
                                 Margin="0,10,100,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                 ValueChanged="SeasonInput_ValueChanged"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -26,7 +26,7 @@ namespace Elwig.Windows {
         private bool IsUpdatingGradation = false;
         private Member? Member = null;
         private readonly DispatcherTimer Timer;
-        private List<string> TextFilter = new();
+        private List<string> TextFilter = [];
         private readonly RoutedCommand CtrlF = new();
 
         private string? LastScaleError = null;
@@ -39,22 +39,22 @@ namespace Elwig.Windows {
             InitializeComponent();
             CtrlF.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control));
             CommandBindings.Add(new CommandBinding(CtrlF, FocusSearchInput));
-            RequiredInputs = new Control[] {
+            RequiredInputs = [
                 MgNrInput, MemberInput,
                 LsNrInput, DateInput, BranchInput,
                 SortIdInput, WineVarietyInput,
                 GradationOeInput.TextBox, GradationKmwInput.TextBox, WineQualityLevelInput,
                 WineOriginInput, WineKgInput,
                 WeightInput.TextBox
-            };
-            ExemptInputs = new Control[] {
+            ];
+            ExemptInputs = [
                 SearchInput, SeasonInput, TodayOnlyInput, AllSeasonsInput,
                 DeliveryList, DeliveryPartList,
                 MemberAddressField,
-            };
-            WeighingButtons = new Button[] {
+            ];
+            WeighingButtons = [
                 WeighingAButton, WeighingBButton, WeighingCButton, WeighingDButton,
-            };
+            ];
             IsReceipt = receipt;
 
             Timer = new DispatcherTimer();
@@ -68,7 +68,7 @@ namespace Elwig.Windows {
             DoShowWarningWindows = false;
 
             if (IsReceipt) {
-                Title = "Übernahme - Elwig";
+                Title = $"Übernahme - {App.BranchName} - Elwig";
                 TodayOnlyInput.IsChecked = true;
                 var n = App.Scales.Count;
                 if (n < 1) WeighingAButton.Visibility = Visibility.Hidden;
@@ -297,7 +297,7 @@ namespace Elwig.Windows {
         }
 
         private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
-            List<string> filterNames = new();
+            List<string> filterNames = [];
             IQueryable<Delivery> deliveryQuery = Context.Deliveries;
             if (IsReceipt && App.BranchNum > 1) {
                 deliveryQuery = deliveryQuery.Where(d => d.ZwstId == App.ZwstId);
@@ -326,6 +326,7 @@ namespace Elwig.Windows {
             var filterVar = new List<string>();
             var filterNotVar = new List<string>();
             var filterQual = new List<string>();
+            var filterNotQual = new List<string>();
             var filterMgNr = new List<int>();
             var filterZwst = new List<string>();
             var filterAttr = new List<string>();
@@ -346,7 +347,15 @@ namespace Elwig.Windows {
 
                 for (int i = 0; i < filter.Count; i++) {
                     var e = filter[i];
-                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
+                    if (e.ToLower() is "r" or "rot") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsRed).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Rotweinsorten");
+                    } else if (e.ToLower() is "w" or "weiß" or "weiss") {
+                        filterVar.AddRange(var.Values.Where(v => v.IsWhite).Select(v => v.SortId));
+                        filter.RemoveAt(i--);
+                        filterNames.Add("Weißweinsorten");
+                    } else if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
                         filterVar.Add(e.ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add(var[e.ToUpper()].Name);
@@ -358,10 +367,14 @@ namespace Elwig.Windows {
                         filterQual.Add(e.ToUpper());
                         filter.RemoveAt(i--);
                         filterNames.Add(qual[e.ToUpper()].Name);
-                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
+                    } else if (e[0] == '!' && qual.ContainsKey(e[1..].ToUpper())) {
+                        filterNotQual.Add(e[1..].ToUpper());
+                        filter.RemoveAt(i--);
+                        filterNames.Add("außer " + qual[e[1..].ToUpper()].Name);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.TryGetValue(e, out var member)) {
                         filterMgNr.Add(int.Parse(e));
                         filter.RemoveAt(i--);
-                        filterNames.Add(mgnr[e].AdministrativeName);
+                        filterNames.Add(member.AdministrativeName);
                     } else if (attr.ContainsKey(e.ToLower())) {
                         var a = attr[e.ToLower()];
                         filterAttr.Add(a.AttrId);
@@ -377,7 +390,7 @@ namespace Elwig.Windows {
                         filterZwst.Add(b.ZwstId);
                         filter.RemoveAt(i--);
                         filterNames.Add($"Zweigstelle {b.Name}");
-                    } else if (e.StartsWith(">") || e.StartsWith("<")) {
+                    } else if (e.StartsWith('>') || e.StartsWith('<')) {
                         if (double.TryParse(e[1..], out var num)) {
                             switch ((e[0], num)) {
                                 case ('>', <= 30): filterKmwGt = num; break;
@@ -467,7 +480,7 @@ namespace Elwig.Windows {
                                 filterNames.Add($"bis zum {n2}");
                             }
                         }
-                    } else if (e.Length > 2 && e.StartsWith("\"") && e.EndsWith("\"")) {
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
                         filter[i] = e[1..^1];
                     } else if (e.Length <= 2) {
                         filter.RemoveAt(i--);
@@ -492,9 +505,10 @@ namespace Elwig.Windows {
                 if (filterVar.Count > 0) dpq = dpq.Where(p => filterVar.Contains(p.SortId));
                 if (filterNotVar.Count > 0) dpq = dpq.Where(p => !filterNotVar.Contains(p.SortId));
                 if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId));
+                if (filterNotQual.Count > 0) dpq = dpq.Where(p => !filterNotQual.Contains(p.QualId));
                 if (filterZwst.Count > 0) dpq = dpq.Where(p => filterZwst.Contains(p.Delivery.ZwstId));
                 if (filterAttr.Count > 0) dpq = dpq.Where(p => p.AttrId != null && filterAttr.Contains(p.AttrId));
-                if (filterNotAttr.Count > 0) dpq = dpq.Where(p => p.AttrId == null || !filterAttr.Contains(p.AttrId));
+                if (filterNotAttr.Count > 0) dpq = dpq.Where(p => p.AttrId == null || !filterNotAttr.Contains(p.AttrId));
                 if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt);
                 if (filterKmwLt > 0) dpq = dpq.Where(p => p.Kmw < filterKmwLt);
                 if (filterOeGt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
@@ -875,7 +889,7 @@ namespace Elwig.Windows {
             p.Acid = (AcidInput.Text == "") ? null : double.Parse(AcidInput.Text);
             p.Comment = (PartCommentInput.Text == "") ? null : PartCommentInput.Text;
 
-            p.Weight = int.Parse(WeightInput.Text.Replace("\u202f", ""));
+            p.Weight = int.Parse(WeightInput.Text.Replace(Utils.GroupSeparator, ""));
             p.ManualWeighing = ManualWeighingInput.IsChecked ?? false;
             p.ScaleId = ScaleId;
             p.WeighingId = WeighingId;
@@ -1590,7 +1604,7 @@ namespace Elwig.Windows {
         }
 
         private void GradationKmwInput_LostFocus(object sender, RoutedEventArgs evt) {
-            if (GradationKmwInput.Text.EndsWith(",")) GradationKmwInput.Text += "0";
+            if (GradationKmwInput.Text.EndsWith(',')) GradationKmwInput.Text += "0";
             InputLostFocus((TextBox)sender, Validator.CheckGradationKmw);
             if (GradationKmwInput.Text.Length != 0 && !GradationKmwInput.Text.Contains(','))
                 GradationKmwInput.Text += ",0";
@@ -1688,7 +1702,7 @@ namespace Elwig.Windows {
             if (sender is not TextBox tb) return;
             if (tb.Text.Length > 0) {
                 if (!tb.Text.Contains(',')) tb.Text += ",0";
-                if (tb.Text.EndsWith(",")) tb.Text += "0";
+                if (tb.Text.EndsWith(',')) tb.Text += "0";
             }
             InputLostFocus(tb, Validator.CheckDecimal(tb, false, 2, 1));
         }

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -76,7 +76,7 @@ namespace Elwig.Dialogs {
             IEnumerable<Member> list = await members.ToListAsync();
             var data = await DeliveryConfirmationData.ForSeason(Context.DeliveryParts, Year);
             using var doc = Document.Merge(list.Select(m =>
-                new DeliveryConfirmation(Context, Year, m, data[m.MgNr]) {
+                new DeliveryConfirmation(Context, Year, m, data.TryGetValue(m.MgNr, out var d) ? d : DeliveryConfirmationData.CreateEmpty(Year, m)) {
                     //DoubleSided = true
                 }
             ));

Elwig/Windows/MemberAdminWindow.xaml

@@ -89,7 +89,29 @@
             </Grid.ColumnDefinitions>
 
             <TextBox x:Name="SearchInput" Grid.ColumnSpan="3" Margin="5,7,145,0" IsReadOnly="False"
-                     TextChanged="SearchInput_TextChanged"/>
+                     TextChanged="SearchInput_TextChanged">
+                <TextBox.ToolTip>
+                    <TextBlock>
+                        Mitglieder filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
+                        <LineBreak/>
+                        Filtern nach:<LineBreak/>
+                        <Bold>MgNr.</Bold>: z.B. 1234, 89, ...<LineBreak/>
+                        <Bold>Vor-/Nachname</Bold>: z.B. Max Mustermann... <LineBreak/>
+                        <Bold>Stamm-Zweigstelle</Bold>: z.B. zwst:Matzen, zwst:wolkersdorf, ...<LineBreak/>
+                        <Bold>Stammgemeinde</Bold>: z.B. matzen, Wolkersdorf, ...<LineBreak/>
+                        <Bold>UID</Bold>: z.B. ATU12345678, ...<LineBreak/>
+                        <Bold>Betriebs-Nr.</Bold>: z.B. 0123456, ...<LineBreak/>
+                        <Bold>Bio-Betrieb</Bold>: BIO, !bio (ausgenommen Bio)<LineBreak/>
+                        <Bold>Buchführend</Bold>: buchf[ührend], Pauschal[iert], !buchf[ührend]<LineBreak/>
+                        <Bold>Volllieferant</Bold>: voll[lieferant], !Voll[lieferant] (nicht-Volllieferant)<LineBreak/>
+                        <Bold>Funktionär</Bold>: Funkt[ionär], !funkt[ionär] (nicht-Funktionär)<LineBreak/>
+                        <Bold>Telefon-Nr.</Bold>: z.B. +436641234, ....<LineBreak/>
+                        <Bold>Flächenbindungen</Bold>: z.B. zw, GVK, WRB, ... (Mitglieder mit aktiven Flächenbindungen)<LineBreak/>
+                        <Bold>Freitext</Bold>: z.B. Rechnungsaddresse, Anmerkung, "matzen" (sucht nach dem Text "matzen")
+                    </TextBlock>
+                </TextBox.ToolTip>
+            </TextBox>
             <CheckBox x:Name="ActiveMemberInput" Content="Nur aktive anzeigen"
                       Checked="ActiveMemberInput_Changed" Unchecked="ActiveMemberInput_Changed"
                       HorizontalAlignment="Right" Margin="0,12,10,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
@@ -143,11 +165,11 @@
 
         <Grid Grid.Column="2" Grid.Row="1">
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition Height="0.8*"/>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition Height="1.3*"/>
-                <RowDefinition Height="0.8*"/>
+                <RowDefinition Height="108"/>
+                <RowDefinition Height="120"/>
+                <RowDefinition Height="18"/>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="113"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
@@ -288,11 +310,11 @@
                     </Grid.ColumnDefinitions>
 
                     <Label Content="IBAN:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1"
+                    <TextBox x:Name="IbanInput" Margin="0,10,10,0" Grid.Column="1" Width="290" HorizontalAlignment="Left"
                              TextChanged="IbanInput_TextChanged" LostFocus="IbanInput_LostFocus"/>
 
                     <Label Content="BIC:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1"
+                    <TextBox x:Name="BicInput" Margin="0,40,10,0" Grid.Column="1" Width="150" HorizontalAlignment="Left"
                              TextChanged="BicInput_TextChanged" LostFocus="BicInput_LostFocus"/>
                 </Grid>
             </GroupBox>
@@ -319,6 +341,9 @@
                     <CheckBox x:Name="OrganicInput" Content="Bio" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
                               Grid.Column="2" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" IsChecked="False"/>
+                    <Button x:Name="OrganicButton" Content="easy-cert.com" Height="25" FontSize="12" IsEnabled="False"
+                            Click="OrganicButton_Click"
+                            Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="60,40,0,0"/>
                 </Grid>
             </GroupBox>
             <GroupBox Header="Rechnungsadresse (optional)" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
@@ -391,16 +416,17 @@
                             Grid.Column="2" VerticalAlignment="Top" HorizontalAlignment="Right" Width="25" Height="25" Margin="10,160,10,10"/>
 
                     <Label Content="Anmerkung:" Margin="10,190,0,0" Grid.Column="0"/>
-                    <TextBox x:Name="CommentInput" Margin="0,190,10,0" Grid.Column="1" Grid.ColumnSpan="2"
-                             TextChanged="TextBox_TextChanged"/>
+                    <TextBox x:Name="CommentInput" Margin="0,190,10,70" Grid.Column="1" Grid.ColumnSpan="2"
+                             TextChanged="TextBox_TextChanged"
+                             VerticalAlignment="Stretch" Height="auto" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"/>
 
-                    <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
+                    <Label Content="Kontaktart:" Margin="10,10,0,10" Grid.Column="0" VerticalAlignment="Bottom"/>
                     <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="0,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
                     <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
                               Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
-                              HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                              HorizontalAlignment="Left" Margin="60,0,0,15" VerticalAlignment="Bottom" Grid.Column="1" Grid.ColumnSpan="2"/>
 
                     <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
                             HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 using System.Collections.ObjectModel;
 using Elwig.Documents;
+using System.Diagnostics;
 
 namespace Elwig.Windows {
     public partial class MemberAdminWindow : AdministrationWindow {
@@ -69,14 +70,98 @@ namespace Elwig.Windows {
 
         private async Task RefreshMemberListQuery(bool updateSort = false) {
             IQueryable<Member> memberQuery = Context.Members;
-            if (ActiveMemberInput.IsChecked == true)
-                memberQuery = memberQuery.Where(m => m.IsActive);
+            if (ActiveMemberInput.IsChecked == true) memberQuery = memberQuery.Where(m => m.IsActive);
+
+            var filterMgNr = new List<int>();
+            var filterZwst = new List<string>();
+            var filterKgNr = new List<int>();
+            var filterLfbisNr = new List<string>();
+            var filterUstIdNr = new List<string>();
+            var filterAreaCom = new List<string>();
+
+            var filter = TextFilter.ToList();
+            if (filter.Count > 0) {
+                var branches = await Context.Branches.ToListAsync();
+                var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var kgs = await Context.WbKgs.ToDictionaryAsync(k => k.AtKg.Name.ToLower(), k => k.AtKg);
+                var areaComs = await Context.AreaCommitmentTypes.ToDictionaryAsync(t => $"{t.SortId}{t.AttrId}", t => t);
+
+                for (int i = 0; i < filter.Count; i++) {
+                    var e = filter[i];
+
+                    if (e.Length >= 5 && e.Length <= 10 && "funktionär".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsFunktionär);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 6 && e.Length <= 11 && e[0] == '!' && "funktionär".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsFunktionär);
+                        filter.RemoveAt(i--);
+                    } else if (e.Equals("bio", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsOrganic);
+                        filter.RemoveAt(i--);
+                    } else if (e.Equals("!bio", StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsOrganic);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 4 && e.Length <= 13 && "volllieferant".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsVollLieferant);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 5 && e.Length <= 14 && e[0] == '!' && "volllieferant".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsVollLieferant);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 5 && e.Length <= 11 && "buchführend".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 6 && e.Length <= 12 && e[0] == '!' && "buchführend".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 8 && e.Length <= 12 && "pauschaliert".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => !m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.Length >= 9 && e.Length <= 13 && e[0] == '!' && "pauschaliert".StartsWith(e[1..], StringComparison.CurrentCultureIgnoreCase)) {
+                        memberQuery = memberQuery.Where(m => m.IsBuchführend);
+                        filter.RemoveAt(i--);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
+                        filterMgNr.Add(int.Parse(e));
+                        filter.RemoveAt(i--);
+                    } else if (kgs.TryGetValue(e, out var kg)) {
+                        filterKgNr.Add(kg.KgNr);
+                        filter.RemoveAt(i--);
+                    } else if (e.StartsWith("zwst:")) {
+                        try {
+                            filterZwst.Add(branches.Where(b => b.Name.StartsWith(e[5..], StringComparison.CurrentCultureIgnoreCase)).Single().ZwstId);
+                            filter.RemoveAt(i--);
+                        } catch (InvalidOperationException) { }
+                    } else if (e.StartsWith('+') && e[1..].All(char.IsAsciiDigit)) {
+                        memberQuery = memberQuery.Where(m => m.TelephoneNumbers.Any(t => t.Number.Replace(" ", "").StartsWith(e)));
+                        filter.RemoveAt(i--);
+                    } else if (areaComs.ContainsKey(e.ToUpper())) {
+                        filterAreaCom.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (Validator.CheckLfbisNr(e)) {
+                        filterLfbisNr.Add(e);
+                        filter.RemoveAt(i--);
+                    } else if (Validator.CheckUstIdNr(e.ToUpper())) {
+                        filterUstIdNr.Add(e.ToUpper());
+                        filter.RemoveAt(i--);
+                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
+                        filter[i] = e[1..^1];
+                    } else if (e.Length <= 2) {
+                        filter.RemoveAt(i--);
+                    }
+                }
+
+                if (filterMgNr.Count > 0) memberQuery = memberQuery.Where(m => filterMgNr.Contains(m.MgNr));
+                if (filterKgNr.Count > 0) memberQuery = memberQuery.Where(m => m.DefaultKgNr != null && filterKgNr.Contains((int)m.DefaultKgNr));
+                if (filterZwst.Count > 0) memberQuery = memberQuery.Where(m => m.ZwstId != null && filterZwst.Contains(m.ZwstId));
+                if (filterAreaCom.Count > 0) memberQuery = memberQuery.Where(m => m.AreaCommitments.Where(c => c.YearFrom <= Utils.CurrentYear && (c.YearTo ?? int.MaxValue) >= Utils.CurrentYear).Any(c => filterAreaCom.Contains(c.VtrgId)));
+                if (filterLfbisNr.Count > 0) memberQuery = memberQuery.Where(m => m.LfbisNr != null && filterLfbisNr.Contains(m.LfbisNr));
+                if (filterUstIdNr.Count > 0) memberQuery = memberQuery.Where(m => m.UstIdNr != null && filterUstIdNr.Contains(m.UstIdNr));
+            }
 
             List<Member> members = await memberQuery.ToListAsync();
 
-            if (TextFilter.Count > 0) {
+            if (filter.Count > 0 && members.Count > 0) {
                 var dict = members.AsParallel()
-                    .ToDictionary(m => m, m => m.SearchScore(TextFilter))
+                    .ToDictionary(m => m, m => m.SearchScore(filter))
                     .OrderByDescending(a => a.Value)
                     .ThenBy(a => a.Key.FamilyName)
                     .ThenBy(a => a.Key.GivenName);
@@ -103,12 +188,14 @@ namespace Elwig.Windows {
                 DeleteMemberButton.IsEnabled = true;
                 AreaCommitmentButton.IsEnabled = true;
                 DeliveryButton.IsEnabled = true;
+                OrganicButton.IsEnabled = true;
                 FillInputs(m);
             } else {
                 EditMemberButton.IsEnabled = false;
                 DeleteMemberButton.IsEnabled = false;
                 AreaCommitmentButton.IsEnabled = false;
                 DeliveryButton.IsEnabled = false;
+                OrganicButton.IsEnabled = false;
                 ClearOriginalValues();
                 ClearDefaultValues();
                 ClearInputs(validate);
@@ -707,5 +794,17 @@ namespace Elwig.Windows {
                 App.FocusOriginHierarchy();
             }
         }
+
+        private void OrganicButton_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            var url = "https://www.easy-cert.com/htm/suchergebnis.htm?" +
+                //$"CustomerNumber={m.LfbisNr}&" +
+                $"Name={(m.BillingAddress?.Name ?? m.Name).Replace(' ', '+')}&" +
+                $"PostalCode={(m.BillingAddress?.PostalDest ?? m.PostalDest).AtPlz?.Plz}";
+            Process.Start(new ProcessStartInfo(url) {
+                UseShellExecute = true,
+            });
+        }
     }
 }

Elwig/Windows/PaymentVariantsWindow.xaml

@@ -55,15 +55,21 @@
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
-        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0"
-                Click="AddButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"/>
-        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False"
-                Click="CopyButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"/>
-        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False"
-                Click="DeleteButton_Click"
-                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"/>
+        <Button x:Name="AddButton" Content="&#xF8AA;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" ToolTip="Neue Auszahlungsvariante hinzufügen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,60" Grid.RowSpan="2"
+                Click="AddButton_Click"/>
+        <Button x:Name="CopyButton" Content="&#xE8C8;" FontFamily="Segoe MDL2 Assets" FontSize="12" Padding="0,0,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante duplizieren"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,0,5,0" Grid.RowSpan="2"
+                Click="CopyButton_Click"/>
+        <Button x:Name="DeleteButton" Content="&#xF8AB;" FontFamily="Segoe MDL2 Assets" FontSize="11" Padding="0,1.5,0,0" IsEnabled="False" ToolTip="Ausgewählte Auszahlungsvariante löschen"
+                VerticalAlignment="Center" HorizontalAlignment="Right" Width="25" Height="25" Margin="5,60,5,0" Grid.RowSpan="2"
+                Click="DeleteButton_Click"/>
+
+        <TextBox x:Name="DataInput" Margin="10,200,35,10" Grid.Column="0" Grid.RowSpan="2"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
+                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
+                 FontFamily="Cascadia Code Light" FontSize="13"
+                 TextChanged="DataInput_TextChanged"/>
 
         <Label Content="Name:" Margin="10,10,0,0" Grid.Column="1"/>
         <TextBox x:Name="NameInput" Width="200" Grid.Column="2" HorizontalAlignment="Left" Margin="0,10,0,0"
@@ -80,27 +86,71 @@
         <TextBox x:Name="TransferDateInput" Grid.Column="2" Width="77" HorizontalAlignment="Left" Margin="0,100,10,0"
                  TextChanged="TransferDateInput_TextChanged"/>
 
-        <TextBox x:Name="DataInput" Margin="82,70,10,42" Grid.Column="2"
-                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Height="auto"
-                 AcceptsReturn="True" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Auto"
-                 FontFamily="Cascadia Code Light" FontSize="13"
-                 TextChanged="DataInput_TextChanged"/>
+        <Label Content="Berücksichtigen:" Margin="90,70,10,10" Grid.Column="2"/>
+        <CheckBox x:Name="ConsiderModifiersInput" Content="Zu-/Abschläge bei Lieferungen"
+                  Margin="110,95,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderModifiersInput_Changed" Unchecked="ConsiderModifiersInput_Changed"/>
+        <CheckBox x:Name="ConsiderPenaltiesInput" Content="Pönalen bei Unterlieferungen (FB)"
+                  Margin="110,115,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderPenaltiesInput_Changed" Unchecked="ConsiderPenaltiesInput_Changed"/>
+        <CheckBox x:Name="ConsiderPenaltyInput" Content="Strafen bei Unterlieferungen (GA)"
+                  Margin="110,135,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderPenaltyInput_Changed" Unchecked="ConsiderPenaltyInput_Changed"/>
+        <CheckBox x:Name="ConsiderAutoInput" Content="Automatische Nachzeichnungen der GA"
+                  Margin="110,155,10,10" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Top"
+                  Checked="ConsiderAutoInput_Changed" Unchecked="ConsiderAutoInput_Changed"/>
+        <Label Content="&#xF0AE;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="2" Margin="108,175,10,10"/>
 
-        <Button x:Name="SaveButton" Content="Speichern" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="SaveButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="100" Margin="10,10,325,10"/>
-        <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="CommitButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="100" Margin="10,10,115,10"/>
-        <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="RevertButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="100" Margin="10,10,115,10"/>
-        <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="CalculateButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="100" Margin="115,10,10,10"/>
-        <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="1" Grid.ColumnSpan="2"
-                Click="EditButton_Click"
-                VerticalAlignment="Bottom" HorizontalAlignment="Center" Width="100" Margin="325,10,10,10"/>
+        <Grid Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="10,10,10,10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="110"/>
+                <ColumnDefinition Width="27"/>
+                <ColumnDefinition Width="110"/>
+                <ColumnDefinition Width="27"/>
+                <ColumnDefinition Width="110"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="27"/>
+                <RowDefinition Height="5"/>
+                <RowDefinition Height="27"/>
+            </Grid.RowDefinitions>
+
+            <Grid.Resources>
+                <Style TargetType="Label">
+                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                    <Setter Property="VerticalAlignment" Value="Center"/>
+                    <Setter Property="Padding" Value="0"/>
+                    <Setter Property="Height" Value="auto"/>
+                </Style>
+                <Style TargetType="Button">
+                    <Setter Property="HorizontalAlignment" Value="Stretch"/>
+                    <Setter Property="FontSize" Value="14"/>
+                </Style>
+            </Grid.Resources>
+
+            <Button x:Name="ModifierButton" Content="Zu-/Abschläge" Grid.Column="0" Grid.Row="0"
+                    Click="ModifierButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="0" Grid.Column="1" RenderTransformOrigin="0.5,0.5" >
+                <Label.RenderTransform>
+                    <TransformGroup>
+                        <RotateTransform Angle="45"/>
+                        <TranslateTransform Y="5"/>
+                    </TransformGroup>
+                </Label.RenderTransform>
+            </Label>
+            <Button x:Name="EditButton" Content="Bearbeiten" Grid.Column="0" Grid.Row="2"
+                    Click="EditButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="1"/>
+            <Button x:Name="CalculateButton" Content="Berechnen" Grid.Column="2" Grid.Row="2"
+                    Click="CalculateButton_Click"/>
+            <Label Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="16" Grid.Row="2" Grid.Column="3" x:Name="Arrow3"/>
+            <Button x:Name="CommitButton" Content="Festsetzen" Grid.Column="4" Grid.Row="2"
+                    Click="CommitButton_Click"/>
+            <Button x:Name="RevertButton" Content="Freigeben" Grid.Column="4" Grid.Row="2"
+                    Click="RevertButton_Click"/>
+            <Button x:Name="SaveButton" Content="Speichern" Grid.Column="4" Grid.Row="0"
+                    Click="SaveButton_Click"/>
+        </Grid>
 
         <Grid Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2">
             <Grid.ColumnDefinitions>

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -19,13 +19,16 @@ namespace Elwig.Windows {
     public partial class PaymentVariantsWindow : ContextWindow {
 
         public readonly int Year;
+        public readonly bool SeasonLocked;
         private bool DataValid, DataChanged, NameChanged, CommentChanged, TransferDateValid, TransferDateChanged;
+        private BillingData? BillingData;
 
         private static readonly JsonSerializerOptions JsonOpt = new() { WriteIndented = true };
 
         public PaymentVariantsWindow(int year) {
             InitializeComponent();
             Year = year;
+            SeasonLocked = Context.Seasons.Find(Year + 1) != null;
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
                 DataInput.Visibility = Visibility.Hidden;
@@ -42,10 +45,11 @@ namespace Elwig.Windows {
                 var locked = !v.TestVariant;
                 DeleteButton.IsEnabled = !locked;
                 CalculateButton.IsEnabled = !locked;
-                CommitButton.IsEnabled = !locked;
+                CommitButton.IsEnabled = !locked && !SeasonLocked;
                 CommitButton.Visibility = !locked ? Visibility.Visible : Visibility.Hidden;
-                RevertButton.IsEnabled = locked;
+                RevertButton.IsEnabled = locked && !SeasonLocked;
                 RevertButton.Visibility = locked ? Visibility.Visible : Visibility.Hidden;
+                Arrow3.Content = locked ? "\xF0B0" : "\xF0AF";
                 CopyButton.IsEnabled = true;
                 EditButton.Content = locked ? "Ansehen" : "Bearbeiten";
                 ShowButton.IsEnabled = true;
@@ -53,16 +57,37 @@ namespace Elwig.Windows {
                 ExportButton.IsEnabled = locked;
 
                 NameInput.Text = v.Name;
+                NameInput.IsReadOnly = false;
                 CommentInput.Text = v.Comment;
+                CommentInput.IsReadOnly = false;
                 DateInput.Text = $"{v.Date:dd.MM.yyyy}";
+                DateInput.IsReadOnly = false;
                 TransferDateInput.Text = $"{v.TransferDate:dd.MM.yyyy}";
-                if (App.Config.Debug) {
-                    try {
-                        var json = BillingData.ParseJson(v.Data);
-                        DataInput.Text = JsonSerializer.Serialize(json, JsonOpt);
-                    } catch {
-                        DataInput.Text = v.Data;
-                    }
+                TransferDateInput.IsReadOnly = false;
+                try {
+                    BillingData = BillingData.FromJson(v.Data);
+                    ConsiderModifiersInput.IsChecked = BillingData.ConsiderDelieryModifiers;
+                    ConsiderModifiersInput.IsEnabled = !locked;
+                    ConsiderPenaltiesInput.IsChecked = BillingData.ConsiderContractPenalties;
+                    ConsiderPenaltiesInput.IsEnabled = !locked;
+                    ConsiderPenaltyInput.IsChecked = BillingData.ConsiderTotalPenalty;
+                    ConsiderPenaltyInput.IsEnabled = !locked;
+                    ConsiderAutoInput.IsChecked = BillingData.ConsiderAutoBusinessShares;
+                    ConsiderAutoInput.IsEnabled = !locked;
+                    DataInput.Text = JsonSerializer.Serialize(BillingData.Data, JsonOpt);
+                    DataInput.IsReadOnly = locked;
+                } catch {
+                    BillingData = null;
+                    ConsiderModifiersInput.IsChecked = false;
+                    ConsiderModifiersInput.IsEnabled = false;
+                    ConsiderPenaltiesInput.IsChecked = false;
+                    ConsiderPenaltiesInput.IsEnabled = false;
+                    ConsiderPenaltyInput.IsChecked = false;
+                    ConsiderPenaltyInput.IsEnabled = false;
+                    ConsiderAutoInput.IsChecked = false;
+                    ConsiderAutoInput.IsEnabled = false;
+                    DataInput.Text = v.Data;
+                    DataInput.IsEnabled = false;
                 }
             } else {
                 EditButton.Content = "Bearbeiten";
@@ -72,16 +97,31 @@ namespace Elwig.Windows {
                 CommitButton.Visibility = Visibility.Visible;
                 RevertButton.IsEnabled = false;
                 RevertButton.Visibility = Visibility.Hidden;
+                Arrow3.Content = "\xF0AF";
                 DeleteButton.IsEnabled = false;
                 ShowButton.IsEnabled = false;
                 PrintButton.IsEnabled = false;
                 ExportButton.IsEnabled = false;
 
+                BillingData = null;
                 NameInput.Text = "";
+                NameInput.IsReadOnly = true;
                 CommentInput.Text = "";
+                CommentInput.IsReadOnly = true;
                 DateInput.Text = "";
+                DateInput.IsReadOnly = true;
                 TransferDateInput.Text = "";
+                TransferDateInput.IsReadOnly = true;
+                ConsiderModifiersInput.IsChecked = false;
+                ConsiderModifiersInput.IsEnabled = false;
+                ConsiderPenaltiesInput.IsChecked = false;
+                ConsiderPenaltiesInput.IsEnabled = false;
+                ConsiderPenaltyInput.IsChecked = false;
+                ConsiderPenaltyInput.IsEnabled = false;
+                ConsiderAutoInput.IsChecked = false;
+                ConsiderAutoInput.IsEnabled = false;
                 DataInput.Text = "";
+                DataInput.IsReadOnly = true;
             }
             UpdateSums();
             UpdateSaveButton();
@@ -90,7 +130,11 @@ namespace Elwig.Windows {
         private void UpdateSaveButton() {
             SaveButton.IsEnabled = PaymentVariantList.SelectedItem != null &&
                 ((DataChanged && DataValid) || NameChanged || CommentChanged ||
-                (TransferDateChanged && TransferDateValid));
+                (TransferDateChanged && TransferDateValid)) ||
+                (ConsiderModifiersInput.IsChecked != BillingData?.ConsiderDelieryModifiers) ||
+                (ConsiderPenaltiesInput.IsChecked != BillingData?.ConsiderContractPenalties) ||
+                (ConsiderPenaltyInput.IsChecked != BillingData?.ConsiderTotalPenalty) ||
+                (ConsiderAutoInput.IsChecked != BillingData?.ConsiderAutoBusinessShares);
         }
 
         private void UpdateSums() {
@@ -120,16 +164,64 @@ namespace Elwig.Windows {
             Update();
         }
 
-        private void AddButton_Click(object sender, RoutedEventArgs evt) {
+        private async void AddButton_Click(object sender, RoutedEventArgs evt) {
+            try {
+                PaymentVar v = Context.CreateProxy<PaymentVar>();
 
+                v.Year = Year;
+                v.AvNr = await Context.NextAvNr(Year);
+                v.Name = "Neue Auszahlungsvariante";
+                v.TestVariant = true;
+                v.DateString = $"{DateTime.Today:yyyy-MM-dd}";
+                v.Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": 1.0, \"curves\": []}";
+
+                await Context.AddAsync(v);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+
+                ControlUtils.SelectListBoxItem(PaymentVariantList, v, v => (v as PaymentVar)?.AvNr);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante erstellen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
-        private void CopyButton_Click(object sender, RoutedEventArgs evt) {
+        private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
+            try {
+                PaymentVar n = Context.CreateProxy<PaymentVar>();
 
+                n.Year = orig.Year;
+                n.AvNr = await Context.NextAvNr(Year);
+                n.Name = $"{orig.Name} (Kopie)";
+                n.TestVariant = true;
+                n.DateString = $"{DateTime.Today:yyyy-MM-dd}";
+                n.Data = orig.Data;
+
+                await Context.AddAsync(n);
+                await Context.SaveChangesAsync();
+                await App.HintContextChange();
+
+                ControlUtils.SelectListBoxItem(PaymentVariantList, n, v => (v as PaymentVar)?.AvNr);
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
-        private void DeleteButton_Click(object sender, RoutedEventArgs evt) {
-
+        private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
+            try {
+                Context.Remove(v);
+                await Context.SaveChangesAsync();
+                await HintContextChange();
+            } catch (Exception exc) {
+                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
+                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
+                MessageBox.Show(str, "Auszahlungsvariante löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
         }
 
         private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
@@ -167,8 +259,12 @@ namespace Elwig.Windows {
                 return;
             CommitButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
-            var b = new BillingVariant(v.Year, v.AvNr);
-            await b.Commit();
+            try {
+                var b = new BillingVariant(v.Year, v.AvNr);
+                await b.Commit();
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
             Mouse.OverrideCursor = null;
             RevertButton.IsEnabled = true;
             await App.HintContextChange();
@@ -216,15 +312,25 @@ namespace Elwig.Windows {
         }
 
         private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || BillingData == null) return;
             try {
                 v.Name = NameInput.Text;
                 v.Comment = (CommentInput.Text != "") ? CommentInput.Text : null;
                 v.TransferDateString = (TransferDateInput.Text != "") ? string.Join("-", TransferDateInput.Text.Split(".").Reverse()) : null;
-                if (App.Config.Debug) v.Data = JsonSerializer.Serialize(BillingData.ParseJson(DataInput.Text));
+                var d = App.Config.Debug ? BillingData.FromJson(DataInput.Text) : BillingData;
+                d.ConsiderDelieryModifiers = ConsiderModifiersInput.IsChecked ?? false;
+                d.ConsiderContractPenalties = ConsiderPenaltiesInput.IsChecked ?? false;
+                d.ConsiderTotalPenalty = ConsiderPenaltyInput.IsChecked ?? false;
+                d.ConsiderAutoBusinessShares = ConsiderAutoInput.IsChecked ?? false;
+                v.Data = JsonSerializer.Serialize(d.Data);
                 Context.Update(v);
                 await Context.SaveChangesAsync();
                 await App.HintContextChange();
+                CommentInput_TextChanged(null, null);
+                ConsiderModifiersInput_Changed(null, null);
+                ConsiderPenaltiesInput_Changed(null, null);
+                ConsiderPenaltyInput_Changed(null, null);
+                ConsiderAutoInput_Changed(null, null);
             } catch (Exception exc) {
                 await HintContextChange();
                 var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -233,6 +339,10 @@ namespace Elwig.Windows {
             }
         }
 
+        private void ModifierButton_Click(object sender, RoutedEventArgs evt) {
+            App.FocusBaseDataSeason(Year);
+        }
+
         private void NameInput_TextChanged(object sender, TextChangedEventArgs evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(NameInput);
@@ -248,7 +358,7 @@ namespace Elwig.Windows {
             UpdateSaveButton();
         }
 
-        private void CommentInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private void CommentInput_TextChanged(object? sender, TextChangedEventArgs? evt) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v) {
                 ControlUtils.ClearInputState(CommentInput);
                 return;
@@ -290,13 +400,13 @@ namespace Elwig.Windows {
                 return;
             }
             try {
-                var json = BillingData.ParseJson(DataInput.Text);
+                var data = BillingData.FromJson(DataInput.Text);
                 var origJson = v.Data;
                 try {
-                    origJson = JsonSerializer.Serialize(BillingData.ParseJson(v.Data));
+                    origJson = JsonSerializer.Serialize(BillingData.FromJson(v.Data).Data);
                 } catch { }
                 DataValid = true;
-                if (JsonSerializer.Serialize(json) != origJson) {
+                if (JsonSerializer.Serialize(data.Data) != origJson) {
                     ControlUtils.SetInputChanged(DataInput);
                     DataChanged = true;
                 } else {
@@ -310,6 +420,58 @@ namespace Elwig.Windows {
             UpdateSaveButton();
         }
 
+        private void ConsiderModifiersInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderModifiersInput);
+                return;
+            }
+            if (BillingData.ConsiderDelieryModifiers != ConsiderModifiersInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderModifiersInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderModifiersInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderPenaltiesInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderPenaltiesInput);
+                return;
+            }
+            if (BillingData.ConsiderContractPenalties != ConsiderPenaltiesInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderPenaltiesInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderPenaltiesInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderPenaltyInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderPenaltyInput);
+                return;
+            }
+            if (BillingData.ConsiderTotalPenalty != ConsiderPenaltyInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderPenaltyInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderPenaltyInput);
+            }
+            UpdateSaveButton();
+        }
+
+        private void ConsiderAutoInput_Changed(object? sender, RoutedEventArgs? evt) {
+            if (BillingData == null) {
+                ControlUtils.ClearInputState(ConsiderAutoInput);
+                return;
+            }
+            if (BillingData.ConsiderAutoBusinessShares != ConsiderAutoInput.IsChecked) {
+                ControlUtils.SetInputChanged(ConsiderAutoInput);
+            } else {
+                ControlUtils.ClearInputState(ConsiderAutoInput);
+            }
+            UpdateSaveButton();
+        }
+
         private async Task Generate(int mode) {
             if (PaymentVariantList.SelectedItem is not PaymentVar v)
                 return;

Elwig/Windows/SeasonFinishWindow.xaml

@@ -37,14 +37,18 @@
 
         <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
                 Click="DeliveryConfirmationButton_Click"
-                Margin="50,122,0,0"/>
+                Margin="50,120,0,0"/>
 
         <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
                 Click="OverUnderDeliveryButton_Click"
-                Margin="50,164,0,0"/>
+                Margin="50,160,0,0"/>
+
+        <Button x:Name="AutoBusinessSharesButton" Content="Autom. GA nachzeichen"
+                Click="AutoBusinessSharesButton_Click"
+                Margin="50,200,0,0"/>
 
         <Button x:Name="PaymentButton" Content="Auszahlung"
                 Click="PaymentButton_Click"
-                Margin="50,206,0,0"/>
+                Margin="50,240,0,0"/>
     </Grid>
 </local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -31,6 +31,7 @@ namespace Elwig.Windows {
             CalculateBucketsButton.IsEnabled = valid && last;
             DeliveryConfirmationButton.IsEnabled = valid;
             OverUnderDeliveryButton.IsEnabled = valid;
+            AutoBusinessSharesButton.IsEnabled = valid;
             PaymentButton.IsEnabled = valid;
         }
 
@@ -82,6 +83,27 @@ namespace Elwig.Windows {
             Mouse.OverrideCursor = null;
         }
 
+        private async void AutoBusinessSharesButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            if (false && App.Client.IsMatzen) {
+                AutoBusinessSharesButton.IsEnabled = false;
+                Mouse.OverrideCursor = Cursors.AppStarting;
+
+                var b = new Billing(year);
+                await b.AutoAdjustBusinessShare();
+
+                Mouse.OverrideCursor = null;
+                AutoBusinessSharesButton.IsEnabled = true;
+            } else {
+                MessageBox.Show(
+                    "Es ist kein automatisches Nachzeichnen der Geschäftsanteile\n" +
+                    "für diese Genossenschaft eingestellt!\n" +
+                    "Bitte wenden Sie sich an die Programmierer!", "Fehler",
+                    MessageBoxButton.OK, MessageBoxImage.Information);
+            }
+        }
+
         private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;

Installer/Installer.wixproj

@@ -60,6 +60,6 @@
     <None Include="Files\config.ini" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.Heat" Version="4.0.1" />
+    <PackageReference Include="WixToolset.Heat" Version="4.0.3" />
   </ItemGroup>
 </Project>

Setup/Setup.wixproj

@@ -13,7 +13,7 @@
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.1" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.1" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.3" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.3" />
   </ItemGroup>
 </Project>

Tests/DatabaseSetup.cs

@@ -10,9 +10,10 @@ namespace Tests {
 
         [OneTimeSetUp]
         public async Task SetupDatabase() {
-            AppDbContext.ConnectionStringOverride = $"Data Source=ElwigTestDB; Mode=Memory; Foreign Keys=True; Cache=Default";
+            AppDbContext.ConnectionStringOverride = $"Data Source=ElwigTestDB; Mode=Memory; Foreign Keys=True; Cache=Shared";
             Connection = await AppDbContext.ConnectAsync();
             await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Create.sql");
+            await AppDbContext.ExecuteEmbeddedScript(Connection, Assembly.GetExecutingAssembly(), "Tests.Resources.Insert.sql");
         }
 
         [OneTimeTearDown]

Tests/Helpers/BillingDataTest.cs

@@ -26,14 +26,14 @@ namespace Tests.Helpers {
             };
         }
 
-        private static void TestCalcOe(BillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool geb = false) {
+        private static void TestCalcOe(PaymentBillingData data, string bucket, double oe, decimal expected, string? qualid = null, bool geb = false) {
             var (sortid, attrid) = GetSortIdAttrId(bucket);
             var kmw = Utils.OeToKmw(oe);
             var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw);
             Assert.That(Math.Round(v, 6), Is.EqualTo(expected));
         }
 
-        private static void TestCalcKmw(BillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool geb = false) {
+        private static void TestCalcKmw(PaymentBillingData data, string bucket, double kmw, decimal expected, string? qualid = null, bool geb = false) {
             var (sortid, attrid) = GetSortIdAttrId(bucket);
             var oe = Utils.KmwToOe(kmw);
             var v = data.CalculatePrice(sortid, attrid, qualid ?? GetQualId(kmw), geb, oe, kmw);
@@ -42,7 +42,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_01_Flatrate() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -58,7 +58,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_02_Simple() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -93,7 +93,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_03_GreaterThanAndLessThan() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -132,7 +132,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_04_VariantsAndAttributes() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -162,7 +162,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_05_QualityLevel() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -193,7 +193,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_06_ModeOeAndKmw() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -235,7 +235,7 @@ namespace Tests.Helpers {
 
         [Test]
         public void Test_07_MultipleCurves() {
-            var data = BillingData.FromJson("""
+            var data = PaymentBillingData.FromJson("""
                 {
                   "mode": "elwig",
                   "version": 1,
@@ -301,5 +301,49 @@ namespace Tests.Helpers {
                 TestCalcKmw(data, "WRS", 17.0, 0.95m, geb: true);
             });
         }
+
+        [Test]
+        public void Test_08_WgMaster() {
+            var data = PaymentBillingData.FromJson("""
+                {
+                  "mode": "wgmaster",
+                  "Grundbetrag": 0.033,
+                  "GBZS": 0.0,
+                  "Ausgabefaktor": 1.0,
+                  "Rebelzuschlag": 0.0,
+                  "AufschlagVolllieferanten": 0.0,
+                  "AuszahlungSorten": {
+                    "BL/": 0.097,
+                    "BP/": 0.097,
+                    "GV/K": "curve:1",
+                    "SL/": 0.097,
+                    "ZW/": 0.097,
+                    "default": "curve:0"
+                  },
+                  "AuszahlungSortenQualitätsstufe": {
+                    "WEI": 0.005
+                  },
+                  "Kurven": [{
+                    "id": 0,
+                    "mode": "oe",
+                    "data": 0.033,
+                    "geb": 0
+                  }, {
+                    "id": 1,
+                    "mode": "oe",
+                    "data": {
+                      "88oe": 0.032,
+                      "89oe": 0.065
+                    }
+                  }]
+                }
+                """, AttributeVariants);
+            Assert.Multiple(() => {
+                TestCalcOe(data, "GVK", 73, 0.032m);
+                TestCalcOe(data, "ZWS", 74, 0.033m);
+                TestCalcOe(data, "GV", 75, 0.005m, qualid: "WEI");
+                TestCalcOe(data, "GVK", 115, 0.065m);
+            });
+        }
     }
 }

Tests/Resources/Insert.sql

@@ -0,0 +1,53 @@
+-- inserts for DatabaseSetup
+
+INSERT INTO branch (zwstid, name) VALUES
+('X', 'Test');
+
+INSERT INTO wb_gl (glnr, name) VALUES
+(1, 'Matzner Hügel'),
+(2, 'Wolkersdorfer Hochleithen');
+
+INSERT INTO AT_gem (gkz, name) VALUES
+(30828, 'Hohenruppersdorf'),
+(31655, 'Wolkersdorf im Weinviertel');
+
+INSERT INTO wb_gem (gkz, hkid) VALUES
+(30828, 'WLWV'),
+(31655, 'WLWV');
+
+INSERT INTO AT_kg (kgnr, gkz, name) VALUES
+(06109, 30828, 'Hohenruppersdorf'),
+(15209, 31655, 'Münichsthal'),
+(15211, 31655, 'Obersdorf'),
+(15212, 31655, 'Pfösing'),
+(15216, 31655, 'Riedentahl'),
+(15224, 31655, 'Wolkersdorf');
+
+INSERT INTO wb_kg (kgnr, glnr) VALUES
+(06109, 1),
+(15209, 2),
+(15211, 2),
+(15212, 2),
+(15216, 2),
+(15224, 2);
+
+INSERT INTO AT_ort (okz, gkz, kgnr, name) VALUES
+(03524, 30828, 06109, 'Hohenruppersdorf'),
+(05092, 31655, 15211, 'Obersdorf'),
+(05135, 31655, 15209, 'Münichsthal'),
+(05136, 31655, 15212, 'Pfösing'),
+(05137, 31655, 15216, 'Riedenthal'),
+(05138, 31655, 15224, 'Wolkersdorf im Weinviertel');
+
+INSERT INTO AT_plz (plz, ort, blnr, type, internal, addressable, po_box) VALUES
+(2223, 'Hohenruppersdorf',           3, 'PLZ-Adressierung', FALSE, TRUE,  FALSE),
+(2120, 'Wolkersdorf im Weinviertel', 3, 'PLZ-Adressierung', FALSE, TRUE,  TRUE ),
+(2122, 'Ulrichskirchen',             3, 'PLZ-Adressierung', FALSE, TRUE,  FALSE);
+
+INSERT INTO AT_plz_dest (plz, okz, dest) VALUES
+(2223, 03524, 'Hohenruppersdorf'),
+(2120, 05092, 'Obersdorf'),
+(2120, 05138, 'Wolkersdorf im Weinviertel'),
+(2122, 05135, 'Münichsthal'),
+(2122, 05136, 'Pfösing'),
+(2122, 05137, 'Riedenthal');

Tests/Tests.csproj

@@ -18,11 +18,17 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

Tests/fetch-resources.bat

@@ -1 +1 @@
-curl -s "https://www.necronda.net/elwig/files/create.sql?v=12" -u "elwig:ganzGeheim123!" -o "Resources\Create.sql"
+curl -s "https://www.necronda.net/elwig/files/create.sql?v=13" -u "elwig:ganzGeheim123!" -o "Resources\Create.sql"