Bump version to 0.7.0

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

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

.gitea/workflows/deploy.yaml

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

.gitea/workflows/test.yaml

@@ -0,0 +1,29 @@
+name: Test
+on:
+  push:
+    branches: ["**"]
+jobs:
+  test:
+    name: Run tests
+    runs-on: windows-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v1.1
+      - name: Setup NuGet
+        uses: nuget/setup-nuget@v1
+      - name: Restore NuGet packages
+        shell: powershell
+        run: $(& nuget restore Elwig.sln; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Elwig
+        shell: powershell
+        run: $(& msbuild -verbosity:quiet Elwig/Elwig.csproj -property:Configuration=Debug; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Build Tests
+        shell: powershell
+        run: $(& dotnet build Tests; $a=$lastexitcode) | findstr x*; exit $a
+      - name: Run Tests
+        shell: powershell
+        run: |
+          $env:PATH = "$(pwd)\Installer\Files;" + $env:PATH
+          $(& dotnet test Tests; $a=$lastexitcode) | findstr x*; exit $a

.gitignore

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

Elwig/App.xaml

@@ -4,6 +4,7 @@
              xmlns:local="clr-namespace:Elwig"
              xmlns:ctrl="clr-namespace:Elwig.Controls"
              StartupUri="Windows\MainWindow.xaml"
+             Exit="Application_Exit"
              xmlns:ui="http://schemas.modernwpf.com/2019">
     <Application.Resources>
         <ctrl:BoolToStringConverter x:Key="BoolToStarConverter" FalseValue="" TrueValue="*"/>

Elwig/App.xaml.cs

@@ -2,7 +2,6 @@ using System;
 using System.Data;
 using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.IO;
 using Elwig.Helpers;
 using Elwig.Helpers.Weighing;
@@ -24,6 +23,9 @@ namespace Elwig {
 
         protected static App CurrentApp;
         public static int NumWindows => CurrentApp.Windows.Count;
+        public static bool ForceShutdown { get; private set; } = false;
+
+        private readonly DispatcherTimer _autoUpdateTimer = new() { Interval = TimeSpan.FromHours(1) };
 
         public static readonly string DataPath = @"C:\ProgramData\Elwig\";
         public static readonly string ExePath = @"C:\Program Files\Elwig\";
@@ -53,9 +55,10 @@ namespace Elwig {
         public static string? BranchFaxNr { get; private set; }
         public static string? BranchMobileNr { get; private set; }
         public static IList<IScale> Scales { get; private set; }
-        public static ClientParameters Client { get; private set; }
+        public static IList<ICommandScale> CommandScales => Scales.Where(s => s is ICommandScale).Cast<ICommandScale>().ToList();
+        public static IList<IEventScale> EventScales => Scales.Where(s => s is IEventScale).Cast<IEventScale>().ToList();
+        public static ClientParameters Client { get; set; }
 
-        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
 
         public App() : base() {
@@ -63,7 +66,7 @@ namespace Elwig {
             Directory.CreateDirectory(TempPath);
             Directory.CreateDirectory(DataPath);
             MainDispatcher = Dispatcher;
-            Scales = Array.Empty<IScale>();
+            Scales = [];
             CurrentApp = this;
             OverrideCulture();
         }
@@ -86,7 +89,7 @@ namespace Elwig {
         }
 
         protected override async void OnStartup(StartupEventArgs evt) {
-            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split("+")[0] ?? "0.0.0";
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0] ?? "0.0.0";
 
             try {
                 await AppDbUpdater.CheckDb();
@@ -96,7 +99,7 @@ namespace Elwig {
                 return;
             }
 
-            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
+            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = [];
             using (var ctx = new AppDbContext()) {
                 branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
                 try {
@@ -109,29 +112,33 @@ namespace Elwig {
                 BranchNum = branches.Count;
             }
 
-            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
-            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("Temp File Cleanup", () => {
+                Utils.CleanupTempFiles();
+                return Task.CompletedTask;
+            });
+
+            Utils.RunBackground("HTML Initialization", () => Html.Init());
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init());
             Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 
+            if (Config.UpdateAuto && Config.UpdateUrl != null) {
+                if (Utils.HasInternetConnectivity()) {
+                    Utils.RunBackground("Auto Updater", async () => {
+                        await Task.Delay(500);
+                        await CheckForUpdates();
+                    });
+                }
+                _autoUpdateTimer.Tick += new EventHandler(OnAutoUpdateTimer);
+                _autoUpdateTimer.Start();
+            }
+
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
-                var id = s[0];
                 try {
-                    var type = s[1]?.ToLower();
-                    var model = s[2];
-                    var cnx = s[3];
-                    var empty = s[4];
-                    var filling = s[5];
-                    int? limit = s[6] == null ? null : int.Parse(s[6]);
-                    var log = s[7];
-                    if (type == "systec") {
-                        list.Add(new SystecScale(id, model, cnx, empty, filling, limit, log));
-                    } else {
-                        throw new ArgumentException($"Invalid scale type: \"{type}\"");
-                    }
+                    list.Add(Scale.FromConfig(s));
                 } catch (Exception e) {
-                    list.Add(new InvalidScale(id));
-                    MessageBox.Show($"Unable to create scale {s[0]}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    list.Add(new InvalidScale(s.Id));
+                    MessageBox.Show($"Unable to create scale {s.Id}:\n\n{e.Message}", "Scale Error", MessageBoxButton.OK, MessageBoxImage.Error);
                 }
             }
             Scales = list;
@@ -141,26 +148,10 @@ namespace Elwig {
                     MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                     Shutdown();
                 } else {
-                    var entry = branches[Config.Branch.ToLower()];
-                    ZwstId = entry.Item1;
-                    BranchName = entry.Item2;
-                    BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                    BranchAddress = entry.Item5;
-                    BranchPhoneNr = entry.Item6;
-                    BranchFaxNr = entry.Item7;
-                    BranchMobileNr = entry.Item8;
+                    SetBranch(branches[Config.Branch.ToLower()]);
                 }
             } else if (branches.Count == 1) {
-                var entry = branches.First().Value;
-                ZwstId = entry.Item1;
-                BranchName = entry.Item2;
-                BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
-                BranchAddress = entry.Item5;
-                BranchPhoneNr = entry.Item6;
-                BranchFaxNr = entry.Item7;
-                BranchMobileNr = entry.Item8;
+                SetBranch(branches.First().Value);
             } else {
                 MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error);
                 Shutdown();
@@ -169,19 +160,23 @@ namespace Elwig {
             base.OnStartup(evt);
         }
 
-        private void PrintingReadyChanged() {
-            Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs());
+        private async void Application_Exit(object sender, ExitEventArgs evt) {
+            await Pdf.Cleanup();
         }
 
-        protected void OnPrintingReadyChanged(EventArgs evt) {
-            foreach (Window w in Windows) {
-                foreach (var b in ControlUtils.FindAllChildren<Button>(w).Where(b => b.Tag?.ToString() == "Print")) {
-                    b.IsEnabled = IsPrintingReady;
-                }
-                foreach (var i in ControlUtils.FindAllChildren<MenuItem>(w).Where(i => i.Tag?.ToString() == "Print")) {
-                    i.IsEnabled = IsPrintingReady;
-                }
-            }
+        public static void SetBranch(Branch b) {
+            SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
+        }
+
+        private static void SetBranch((string, string, int?, string?, string?, string?, string?, string?) entry) {
+            ZwstId = entry.Item1;
+            BranchName = entry.Item2;
+            BranchPlz = entry.Item3;
+            BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0];  // FIXME
+            BranchAddress = entry.Item5;
+            BranchPhoneNr = entry.Item6;
+            BranchFaxNr = entry.Item7;
+            BranchMobileNr = entry.Item8;
         }
 
         public static async Task HintContextChange() {
@@ -191,6 +186,29 @@ namespace Elwig {
             }
         }
 
+        private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
+            foreach (Window w in CurrentApp.Windows) {
+                if (w is UpdateDialog) return;
+            }
+            if (Utils.HasInternetConnectivity()) {
+                Utils.RunBackground("Auto Updater", CheckForUpdates);
+            }
+        }
+
+        public static async Task CheckForUpdates() {
+            if (Config.UpdateUrl == null) return;
+            var latest = await Utils.GetLatestInstallerUrl(Config.UpdateUrl);
+            if (latest != null && new Version(latest.Value.Version) > new Version(Version)) {
+                await MainDispatcher.BeginInvoke(() => {
+                    var d = new UpdateDialog(latest.Value.Version, latest.Value.Url, latest.Value.Size);
+                    if (d.ShowDialog() == true) {
+                        ForceShutdown = true;
+                        Current.Shutdown();
+                    }
+                });
+            }
+        }
+
         private static T FocusWindow<T>(Func<T> constructor, Predicate<T>? selector = null) where T : Window {
             foreach (Window w in CurrentApp.Windows) {
                 if (w is T t && (selector == null || selector(t))) {
@@ -238,10 +256,6 @@ namespace Elwig {
             return FocusWindow<SeasonFinishWindow>(() => new());
         }
 
-        public static DeliveryConfirmationsWindow FocusDeliveryConfirmations(int year) {
-            return FocusWindow<DeliveryConfirmationsWindow>(() => new(year), w => w.Year == year);
-        }
-
         public static OriginHierarchyWindow FocusOriginHierarchy() {
             return FocusWindow<OriginHierarchyWindow>(() => new());
         }
@@ -252,12 +266,22 @@ namespace Elwig {
             return w;
         }
 
-        public static PaymentVariantsWindow FocusPaymentVariantsWindow(int year) {
+        public static PaymentVariantsWindow FocusPaymentVariants(int year) {
             return FocusWindow<PaymentVariantsWindow>(() => new(year), w => w.Year == year);
         }
 
         public static ChartWindow FocusChartWindow(int year, int avnr) {
             return FocusWindow<ChartWindow>(() => new(year, avnr), w => w.Year == year && w.AvNr == avnr);
         }
+
+        public static MemberAdminWindow FocusMember(int mgnr) {
+            var w = FocusWindow<MemberAdminWindow>(() => new());
+            w.FocusMember(mgnr);
+            return w;
+        }
+
+        public static MailWindow FocusMailWindow(int? year = null) {
+            return FocusWindow<MailWindow>(() => new(year), w => year == null || w.Year == year);
+        }
     }
 }

Elwig/Dialogs/UpdateDialog.xaml

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

Elwig/Dialogs/UpdateDialog.xaml.cs

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

Elwig/Documents/BusinessDocument.cs

@@ -40,19 +40,19 @@ namespace Elwig.Documents {
             return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n";
         }
 
-        public static string PrintSortenaufteilung(Dictionary<string, MemberBucket> buckets) {
-            List<string> attributes = ["_", ""];
-            List<string> names = ["kein Qual.Wein", "ohne Attribut"];
-            List<(string, string)> bucketAttrs = [
-                .. buckets
-                .Where(b => b.Key.Length > 2 && b.Key[2] != '_' && b.Value.DeliveryStrict > 0)
-                .Select(b => (b.Key[2..], b.Value.Name.Split("(")[1][..^1]))
+        public static string PrintSortenaufteilung(List<MemberStat> stats) {
+            List<string> discrs = [""];
+            List<string> names = ["ohne Attr./Bewirt."];
+            List<string> bucketAttrs = [
+                .. stats
+                .Select(s => s.Discr)
                 .Distinct()
-                .OrderBy(v => v.Item1)
+                .Where(s => s.Length > 0)
+                .Order()
             ];
-            names.AddRange(bucketAttrs.Select(b => b.Item2));
+            names.AddRange(bucketAttrs);
             names.Add("Gesamt");
-            attributes.AddRange(bucketAttrs.Select(b => b.Item1));
+            discrs.AddRange(bucketAttrs);
 
             List<double> cols = [40];
             cols.AddRange(names.Select(_ => 125.0 / names.Count));
@@ -62,19 +62,18 @@ namespace Elwig.Documents {
                 string.Join("", names.Select(c => $"<th>{c}</th>")) +
                 "</tr></thead>";
 
-            tbl += string.Join("\n", buckets
-                .GroupBy(b => (b.Key[..2], b.Value.Name.Split("(")[0].Trim()))
-                .Where(g => g.Sum(a => a.Value.DeliveryStrict) > 0)
-                .OrderBy(g => g.Key.Item1)
+            tbl += string.Join("\n", stats
+                .GroupBy(b => b.Variety)
+                .OrderBy(b => b.Key)
                 .Select(g => {
-                    var dict = g.ToDictionary(a => a.Key[2..], a => a.Value);
-                    var vals = attributes.Select(a => dict.TryGetValue(a, out MemberBucket value) ? value.DeliveryStrict : 0).ToList();
-                    return $"<tr><th>{g.Key.Item2}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
-                        $"<td class=\"number\">{dict.Values.Select(v => v.DeliveryStrict).Sum():N0}</td></tr>";
+                    var dict = g.ToDictionary(a => a.Discr, a => a.Weight);
+                    var vals = discrs.Select(a => dict.GetValueOrDefault(a, 0)).ToList();
+                    return $"<tr><th>{g.Key}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
+                        $"<td class=\"number\">{dict.Values.Sum():N0}</td></tr>";
                 })
             );
-            var totalDict = buckets.GroupBy(b => b.Key[2..]).ToDictionary(g => g.Key, g => g.Sum(a => a.Value.DeliveryStrict));
-            var totals = attributes.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
+            var totalDict = stats.GroupBy(s => s.Discr).ToDictionary(g => g.Key, g => g.Sum(a => a.Weight));
+            var totals = discrs.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
             tbl += "<tr class=\"sum bold\"><td></td>" + string.Join("", totals.Select(v => $"<td class=\"number\">{v:N0}</td>")) +
                 $"<td class=\"number\">{totalDict.Values.Sum():N0}</td></tr>";
 

Elwig/Documents/CreditNote.cshtml

@@ -10,8 +10,8 @@
         <colgroup>
             <col style="width: 25mm;"/>
             <col style="width:  5mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 20mm;"/>
+            <col style="width: 24mm;"/>
+            <col style="width: 16mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 15mm;"/>
@@ -25,7 +25,7 @@
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
                 <th rowspan="2" class="narrow">Pos.</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2" style="text-align: left;">Attribut</th>
+                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
                 <th>Preis</th>
@@ -50,7 +50,7 @@
                             <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
-                            <td class="small">@p.Attribute</td>
+                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
                         }

Elwig/Documents/DeliveryConfirmation.cs

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

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -10,8 +10,8 @@
         <colgroup>
             <col style="width: 25mm;"/>
             <col style="width:  5mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 21mm;"/>
+            <col style="width: 24mm;"/>
+            <col style="width: 17mm;"/>
             <col style="width: 19mm;"/>
             <col style="width: 10mm;"/>
             <col style="width: 10mm;"/>
@@ -25,7 +25,7 @@
                 <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
                 <th rowspan="2" class="narrow">Pos.</th>
                 <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2" style="text-align: left;">Attribut</th>
+                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
@@ -53,7 +53,7 @@
                             <td rowspan="@rows">@p.LsNr</td>
                             <td rowspan="@rows">@p.DPNr</td>
                             <td class="small">@p.Variety</td>
-                            <td class="small">@p.Attribute</td>
+                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
                             <td class="small">@p.QualityLevel</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
                             <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
@@ -90,7 +90,7 @@
             </tr>
         </tbody>
     </table>
-    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberBuckets))
+    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
     @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
     <div style="margin-top: 2em;">
         @if (Model.Text != null) {

Elwig/Documents/DeliveryNote.cs

@@ -15,7 +15,7 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
+        public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Delivery = d;
@@ -27,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
+            MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
         }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

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

Elwig/Documents/Document.cs

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

Elwig/Documents/Document.cshtml

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

Elwig/Documents/MemberDataSheet.cs

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

Elwig/Documents/MemberDataSheet.cshtml

@@ -63,8 +63,8 @@
                 <td colspan="5">
                     @if (Model.Member.BillingAddress != null) {
                         @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz
-                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
-                        @("(")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
+                        @(" ")@Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
+                        @(" (")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
                     }
                 </td>
             </tr>
@@ -158,6 +158,7 @@
     }
 
     @if (areaComs.Count != 0) {
+        <br class="area-commitements"/>
         <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2>
         <table class="area-commitements">
             <colgroup>
@@ -196,7 +197,7 @@
                             <td>@areaCom.Rd?.Name</td>
                             <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                             <td class="number">@($"{areaCom.Area:N0}")</td>
-                            <td class="center">@areaCom.WineCult.Name</td>
+                            <td class="center">@areaCom.WineCult?.Name</td>
                             <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
                         </tr>
                         lastContract = contractType.AreaComType.DisplayName;

Elwig/Documents/MemberDataSheet.css

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

Elwig/Elwig.csproj

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

Elwig/Helpers/ActionCommand.cs

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

Elwig/Helpers/AppDbContext.cs

@@ -11,12 +11,14 @@ using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using Elwig.Models.Dtos;
 using System.Reflection;
+using System.Data;
 
 namespace Elwig.Helpers {
 
     public record struct AreaComBucket(int Area, int Obligation, int Right);
     public record struct UnderDelivery(int Weight, int Diff);
     public record struct MemberBucket(string Name, int Area, int Obligation, int Right, int Delivery, int DeliveryStrict, int Payment);
+    public record struct MemberStat(string Variety, string Discr, int Weight);
 
     public class AppDbContext : DbContext {
 
@@ -122,6 +124,21 @@ namespace Elwig.Helpers {
             return await cmd.ExecuteScalarAsync();
         }
 
+        public static async Task<(string Table, long RowId, string Parent, long FkId)[]> ForeignKeyCheck(SqliteConnection cnx) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = "PRAGMA foreign_key_check";
+            using var reader = await cmd.ExecuteReaderAsync();
+            var list = new List<(string, long, string, long)>();
+            while (await reader.ReadAsync()) {
+                var table = reader.GetString(0);
+                var rowid = reader.GetInt64(1);
+                var parent = reader.GetString(2);
+                var fkid = reader.GetInt64(3);
+                list.Add((table, rowid, parent, fkid));
+            }
+            return [.. list];
+        }
+
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) {
             optionsBuilder.UseSqlite(ConnectionString);
             optionsBuilder.UseLazyLoadingProxies();
@@ -159,17 +176,21 @@ namespace Elwig.Helpers {
             return await WineAttributes.FindAsync(attrId) != null;
         }
 
+        public async Task<bool> CultIdExists(string cultId) {
+            return await WineCultivations.FindAsync(cultId) != null;
+        }
+
         public async Task<int> NextMgNr() {
-            int c = await Members.Select(m => m.MgNr).MinAsync();
+            int c = 0;
             (await Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToListAsync())
                 .ForEach(a => { if (a <= c + 1000) c = a; });
             return c + 1;
         }
 
         public async Task<int> NextFbNr() {
-            int c = await AreaCommitments.Select(ac => ac.FbNr).MinAsync();
+            int c = 0;
             (await AreaCommitments.OrderBy(ac => ac.FbNr).Select(ac => ac.FbNr).ToListAsync())
-                .ForEach(a => { if (a <= c + 1000) c = a; });
+                .ForEach(a => { if (a <= c + 10000) c = a; });
             return c + 1;
         }
 
@@ -384,5 +405,31 @@ namespace Elwig.Helpers {
             }
             return buckets;
         }
+
+        public static async Task<List<MemberStat>> GetMemberStats(int year, int mgnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var list = new List<MemberStat>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT v.name AS variety,
+                           COALESCE(a.name, '') || IIF(a.name IS NOT NULL AND c.name IS NOT NULL, ' / ', '') || COALESCE(c.name, '') AS disc,
+                           SUM(weight) AS weight
+                    FROM v_delivery d
+                        LEFT JOIN wine_variety v ON v.sortid = d.sortid
+                        LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                        LEFT JOIN wine_cultivation c ON c.cultid = d.cultid
+                    WHERE d.year = {year} AND d.mgnr = {mgnr}
+                    GROUP BY d.sortid, d.attrid, d.cultid
+                    ORDER BY variety, disc;
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    list.Add(new(reader.GetString(0), reader.GetString(1), reader.GetInt32(2)));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            return list;
+        }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

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

Elwig/Helpers/Billing/Billing.cs

@@ -45,7 +45,15 @@ namespace Elwig.Helpers.Billing {
                 """);
         }
 
-        public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden, SqliteConnection? cnx = null) {
+        public async Task CalculateBuckets(
+            bool? honorGebundenField = null,
+            bool? allowAttributesIntoLower = null,
+            bool? avoidUnderDeliveries = null,
+            SqliteConnection? cnx = null
+         ) {
+            var honorGebunden = honorGebundenField ?? Season.Billing_HonorGebunden;
+            var allowAttrsIntoLower = allowAttributesIntoLower ?? Season.Billing_AllowAttrsIntoLower;
+            var avoidUnderDlvrs = avoidUnderDeliveries ?? Season.Billing_AvoidUnderDeliveries;
             var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
             var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
             var ownCnx = cnx == null;
@@ -125,7 +133,7 @@ namespace Elwig.Helpers.Billing {
                 SET discr = excluded.discr, value = value + excluded.value;
                 """);
 
-            if (!avoidUnderDeliveries) {
+            if (!avoidUnderDlvrs) {
                 if (ownCnx) await cnx.DisposeAsync();
                 return;
             }

Elwig/Helpers/Billing/BillingData.cs

@@ -150,38 +150,33 @@ namespace Elwig.Helpers.Billing {
             return dict;
         }
 
-        protected static Dictionary<string, JsonValue> GetSelection(JsonNode value, IEnumerable<string> vaributes) {
+        protected static Dictionary<RawVaribute, JsonValue> GetSelection(JsonNode value, IEnumerable<RawVaribute> vaributes) {
             if (value is JsonValue flatRate) {
                 return vaributes.ToDictionary(e => e, _ => flatRate);
             } if (value is not JsonObject data) {
                 throw new InvalidOperationException();
             }
-            Dictionary<string, JsonValue> dict;
+            Dictionary<RawVaribute, JsonValue> dict;
             if (data["default"] is JsonValue def) {
                 dict = vaributes.ToDictionary(e => e, _ => def);
             } else {
                 dict = [];
             }
 
-            var varieties = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length == 2);
-            var attributes = data.Where(p => p.Key.StartsWith('/'));
-            var others = data.Where(p => !p.Key.StartsWith('/') && p.Key.Length > 2 && p.Key != "default");
-            foreach (var (idx, v) in varieties) {
+            var conv = data
+                .Where(p => p.Key != "default")
+                .Select(p => (new RawVaribute(p.Key), p.Value))
+                .OrderBy(p => (p.Item1.SortId != null ? 10 : 0) + (p.Item1.AttrId != null ? 12 : 0) + (p.Item1.CultId != null ? 11 : 0))
+                .ToList();
+            foreach (var (idx, v) in conv) {
                 var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                foreach (var i in vaributes.Where(e => e.StartsWith(idx[..^1]))) {
+                foreach (var i in vaributes.Where(e =>
+                        (idx.SortId == null || idx.SortId == e.SortId) &&
+                        (idx.AttrId == null || idx.AttrId == e.AttrId) &&
+                        (idx.CultId == null || idx.CultId == e.CultId))) {
                     dict[i] = curve;
                 }
             }
-            foreach (var (idx, v) in attributes) {
-                var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                foreach (var i in vaributes.Where(e => e[2..] == idx[1..])) {
-                    dict[i] = curve;
-                }
-            }
-            foreach (var (idx, v) in others) {
-                var curve = v?.AsValue() ?? throw new InvalidOperationException();
-                dict[idx.Replace("/", "")] = curve;
-            }
 
             return dict;
         }
@@ -257,7 +252,7 @@ namespace Elwig.Helpers.Billing {
             return curve;
         }
 
-        protected static void CollapsePaymentData(JsonObject data, IEnumerable<string> vaributes, bool useDefault = true) {
+        protected static void CollapsePaymentData(JsonObject data, IEnumerable<RawVaribute> vaributes, bool useDefault = true) {
             Dictionary<string, List<string>> rev1 = [];
             Dictionary<decimal, List<string>> rev2 = [];
             foreach (var (k, v) in data) {
@@ -289,35 +284,50 @@ namespace Elwig.Helpers.Billing {
                     }
                 }
             }
+
             var attributes = data
                 .Select(e => e.Key)
                 .Where(k => k.Length > 3 && k.Contains('/'))
-                .Select(k => "/" + k.Split('/')[1])
+                .Select(k => k.Split('/')[1])
                 .Distinct()
                 .ToList();
             foreach (var idx in attributes) {
-                var len = vaributes.Count(e => e.EndsWith(idx));
+                var len = vaributes.Count(e => $"{e.AttrId}{(e.CultId != null && e.CultId != "" ? "-" : "")}{e.CultId}" == idx);
                 foreach (var (v, ks) in rev1) {
-                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[idx] = v;
+                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
                     }
                 }
                 foreach (var (v, ks) in rev2) {
-                    var myKs = ks.Where(k => k.EndsWith(idx)).ToList();
+                    var myKs = ks.Where(k => k.EndsWith($"/{idx}")).ToList();
                     if (myKs.Count > 1 && ((myKs.Count >= len * 0.5 && useDefault) || myKs.Count == len)) {
                         foreach (var k in myKs) data.Remove(k);
-                        data[idx] = v;
+                        data[(idx.StartsWith('-') && !useDefault ? "" : "/") + idx] = v;
                     }
                 }
             }
+
+            if (!useDefault)
+                return;
+
+            var keys = data.Select(p => p.Key).ToList();
+            foreach (var k in keys) {
+                if (k.Length == 3 && k.EndsWith('/') && !keys.Contains(k[..2])) {
+                    data.Remove(k, out var val);
+                    data.Add(k[..2], val);
+                } else if (k.Contains("/-")) {
+                    data.Remove(k, out var val);
+                    data.Add(k.Replace("/-", "-"), val);
+                }
+            }
         }
 
         public static JsonObject FromGraphEntries(
             IEnumerable<GraphEntry> graphEntries,
             BillingData? origData = null,
-            IEnumerable<string>? vaributes = null,
+            IEnumerable<RawVaribute>? vaributes = null,
             bool useDefaultPayment = true,
             bool useDefaultQuality = true
         ) {
@@ -338,16 +348,18 @@ namespace Elwig.Helpers.Billing {
                     continue;
                 }
                 foreach (var c in entry.Vaributes) {
-                    if (entry.Abgewertet) {
-                        qualityWei[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                    var v = new RawVaribute(c.Variety!.SortId, c.Attribute?.AttrId ?? "", c.Cultivation?.CultId);
+                    if (v.CultId == "") v.CultId = null;
+                    if (entry.Abgewertet) {;
+                        qualityWei[v.ToString()] = node.DeepClone();
                     } else {
-                        payment[$"{c.Variety?.SortId}/{c.Attribute?.AttrId}"] = node.DeepClone();
+                        payment[v.ToString()] = node.DeepClone();
                     }
                 }
             }
 
-            CollapsePaymentData(payment, vaributes ?? payment.Select(e => e.Key).ToList(), useDefaultPayment);
-            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => e.Key).ToList(), useDefaultQuality);
+            CollapsePaymentData(payment, vaributes ?? payment.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultPayment);
+            CollapsePaymentData(qualityWei, vaributes ?? qualityWei.Select(e => new RawVaribute(e.Key)).ToList(), useDefaultQuality);
 
             var data = new JsonObject {
                 ["mode"] = "elwig",

Elwig/Helpers/Billing/BillingVariant.cs

@@ -18,14 +18,10 @@ namespace Elwig.Helpers.Billing {
             Data = PaymentBillingData.FromJson(PaymentVariant.Data, Utils.GetVaributes(Context, Year, onlyDelivered: false));
         }
 
-        public async Task Calculate() {
+        public async Task Calculate(bool? honorGebunden = null, bool? allowAttrsIntoLower = null, bool? avoidUnderDeliveries = null) {
             using var cnx = await AppDbContext.ConnectAsync();
             using var tx = await cnx.BeginTransactionAsync();
-            await CalculateBuckets(
-                Season.Billing_AllowAttrsIntoLower,
-                Season.Billing_AvoidUnderDeliveries,
-                Season.Billing_HonorGebunden,
-                cnx);
+            await CalculateBuckets(honorGebunden, allowAttrsIntoLower, avoidUnderDeliveries, cnx);
             await DeleteInDb(cnx);
             await SetCalcTime(cnx);
             await CalculatePrices(cnx);
@@ -127,20 +123,23 @@ namespace Elwig.Helpers.Billing {
         }
 
         protected async Task CalculatePrices(SqliteConnection cnx) {
-            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string Discr, int Value, double Oe, double Kmw, string QualId)>();
+            var parts = new List<(int Year, int DId, int DPNr, int BktNr, string SortId, string? AttrId, string? CultId, string Discr, int Value, double Oe, double Kmw, string QualId, bool AttrAreaCom)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, b.discr, b.value, d.oe, d.kmw, d.qualid
+                    SELECT d.year, d.did, d.dpnr, b.bktnr, d.sortid, d.attrid, d.cultid, b.discr, b.value, d.oe, d.kmw, d.qualid, COALESCE(a.area_com, TRUE)
                     FROM delivery_part_bucket b
                         JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (b.year, b.did, b.dpnr)
+                        LEFT JOIN v_wine_attribute a ON a.attrid = d.attrid
                     WHERE b.year = {Year}
                     """;
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     parts.Add((
                         reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3),
-                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5), reader.GetString(6),
-                        reader.GetInt32(7), reader.GetDouble(8), reader.GetDouble(9), reader.GetString(10)
+                        reader.GetString(4), reader.IsDBNull(5) ? null : reader.GetString(5),
+                        reader.IsDBNull(6) ? null : reader.GetString(6), reader.GetString(7),
+                        reader.GetInt32(8), reader.GetDouble(9), reader.GetDouble(10), reader.GetString(11),
+                        reader.GetBoolean(12)
                     ));
                 }
             }
@@ -149,8 +148,9 @@ namespace Elwig.Helpers.Billing {
             foreach (var part in parts) {
                 var ungeb = part.Discr == "_";
                 var payAttrId = (part.Discr is "" or "_") ? null : part.Discr;
-                var geb = !ungeb && payAttrId == part.AttrId;
-                var price = Data.CalculatePrice(part.SortId, part.AttrId, part.QualId, geb, part.Oe, part.Kmw);
+                var attrId = part.AttrAreaCom ? payAttrId : part.AttrId;
+                var geb = !ungeb && (payAttrId == attrId || !part.AttrAreaCom);
+                var price = Data.CalculatePrice(part.SortId, attrId, part.CultId, part.QualId, geb, part.Oe, part.Kmw);
                 var priceL = PaymentVariant.Season.DecToDb(price);
                 inserts.Add((part.Year, part.DId, part.DPNr, part.BktNr, priceL, priceL * part.Value));
             }

Elwig/Helpers/Billing/EditBillingData.cs

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

Elwig/Helpers/Billing/PaymentBillingData.cs

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

Elwig/Helpers/Billing/Varibute.cs

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

Elwig/Helpers/ClientParameters.cs

@@ -7,20 +7,20 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers {
     public class ClientParameters {
 
-        public enum Type { Matzen, Winzerkeller };
+        public enum Type { Matzen, Winzerkeller, Weinland, Baden };
 
         public bool IsMatzen => Client == Type.Matzen;
         public bool IsWinzerkeller => Client == Type.Winzerkeller;
-        public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W";
-        public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
-        public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
+        public bool IsWeinland => Client == Type.Weinland;
+        public bool IsBaden => Client == Type.Baden;
+        public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W";
+        public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H";
+        public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
+        public bool IsGrInzersdorf => IsWeinland;
 
-        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
-        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
-        public bool HasRebler() => HasRebler(App.ZwstId);
-        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
-        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
-        public bool HasKisten() => HasKisten(App.ZwstId);
+        public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
+        public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
 
         public string NameToken;
         public string NameShort;
@@ -36,8 +36,8 @@ namespace Elwig.Helpers {
 
         public PostalDest PostalDest {
             set {
-                Plz = value.AtPlz.Plz;
-                Ort = value.AtPlz.Ort.Name;
+                Plz = value.AtPlz!.Plz;
+                Ort = value.AtPlz!.Ort.Name;
             }
         }
         public int Plz;
@@ -61,6 +61,8 @@ namespace Elwig.Helpers {
         public string? TextDeliveryNote;
         public string? TextDeliveryConfirmation;
         public string? TextCreditNote;
+        public string? TextEmailSubject;
+        public string? TextEmailBody;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -72,8 +74,14 @@ namespace Elwig.Helpers {
                 NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX");
                 NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
                 switch (Name) {
-                    case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break;
-                    case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break;
+                    case "Winzergenossenschaft für Matzen und Umgebung":
+                        Client = Type.Matzen; break;
+                    case "Winzerkeller im Weinviertel":
+                        Client = Type.Winzerkeller; break;
+                    case "Winzergenossenschaft Weinland":
+                        Client = Type.Weinland; break;
+                    case "Winzergenossenschaft Baden - Bad Vöslau":
+                        Client = Type.Baden; break;
                 };
 
                 Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
@@ -102,6 +110,10 @@ namespace Elwig.Helpers {
                 if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
                 TextCreditNote = parameters.GetValueOrDefault("TEXT_CREDITNOTE");
                 if (TextCreditNote == "") TextCreditNote = null;
+                TextEmailSubject = parameters.GetValueOrDefault("TEXT_EMAIL_SUBJECT");
+                if (TextEmailSubject == "") TextEmailSubject = null;
+                TextEmailBody = parameters.GetValueOrDefault("TEXT_EMAIL_BODY");
+                if (TextEmailBody == "") TextEmailBody = null;
             } catch {
                 throw new KeyNotFoundException();
             }
@@ -115,7 +127,7 @@ namespace Elwig.Helpers {
                 case 2: deliveryNoteStats = "SHORT"; break;
                 case 3: deliveryNoteStats = "FULL"; break;
             }
-            return new (string, string?)[] {
+            return [
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
                 ("CLIENT_NAME", Name),
@@ -137,7 +149,9 @@ namespace Elwig.Helpers {
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
                 ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
                 ("TEXT_CREDITNOTE", TextCreditNote),
-            };
+                ("TEXT_EMAIL_SUBJECT", TextEmailSubject),
+                ("TEXT_EMAIL_BODY", TextEmailBody)
+            ];
         }
 
         public async Task UpdateValues() {
@@ -157,6 +171,7 @@ namespace Elwig.Helpers {
             }
 
             await cmd.ExecuteNonQueryAsync();
+            await App.HintContextChange();
         }
     }
 }

Elwig/Helpers/Config.cs

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

Elwig/Helpers/Export/Ebics.cs

@@ -2,12 +2,14 @@ using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Security;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Export {
-    public class Ebics(PaymentVar variant, string filename) : IBankingExporter {
+    public class Ebics(PaymentVar variant, string filename, int version) : IBankingExporter {
 
         public static string FileExtension => "xml";
 
@@ -16,6 +18,7 @@ namespace Elwig.Helpers.Export {
         private readonly int Year = variant.Year;
         private readonly string Name = variant.Name;
         private readonly int AvNr = variant.AvNr;
+        private readonly int Version = version;
 
         public void Dispose() {
             GC.SuppressFinalize(this);
@@ -32,6 +35,8 @@ namespace Elwig.Helpers.Export {
         }
 
         public async Task ExportAsync(IEnumerable<Transaction> transactions, IProgress<double>? progress = null) {
+            if (transactions.Any(tx => tx.Amount < 0))
+                throw new ArgumentException("Tranaction amount may not be negative");
             progress?.Report(0.0);
             var nbOfTxs = transactions.Count();
             int count = nbOfTxs + 2, i = 0;
@@ -41,26 +46,24 @@ namespace Elwig.Helpers.Export {
 
             await Writer.WriteLineAsync($"""
                 <?xml version="1.0" encoding="UTF-8"?>
-                <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09"
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                          xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.001.001.09 pain.001.001.09.xsd">
+                <Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.001.001.{Version:00}">
                  <CstmrCdtTrfInitn>
                   <GrpHdr>
                    <MsgId>{msgId}</MsgId>
                    <CreDtTm>{DateTime.UtcNow:o}</CreDtTm>
                    <NbOfTxs>{nbOfTxs}</NbOfTxs>
                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
-                   <InitgPty><Nm>{App.Client.NameFull}</Nm></InitgPty>
+                   <InitgPty><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></InitgPty>
                   </GrpHdr>
                   <PmtInf>
                    <PmtInfId>{pmtInfId}</PmtInfId>
                    <PmtMtd>TRF</PmtMtd>
                    <NbOfTxs>{nbOfTxs}</NbOfTxs>
                    <CtrlSum>{Transaction.FormatAmount(ctrlSum)}</CtrlSum>
-                   <ReqdExctnDt><Dt>{Date:yyyy-MM-dd}</Dt></ReqdExctnDt>
-                   <Dbtr><Nm>{App.Client.NameFull}</Nm></Dbtr>
-                   <DbtrAcct><Id><IBAN>{App.Client.Iban?.Replace(" ", "")}</IBAN></Id></DbtrAcct>
-                   <DbtrAgt><FinInstnId><BICFI>{App.Client.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></DbtrAgt>
+                   <ReqdExctnDt>{(Version >= 8 ? "<Dt>" : "")}{Date:yyyy-MM-dd}{(Version >= 8 ? "</Dt>" : "")}</ReqdExctnDt>
+                   <Dbtr><Nm>{SecurityElement.Escape(App.Client.NameFull)}</Nm></Dbtr>
+                   <DbtrAcct><Id><IBAN>{App.Client.Iban!.Replace(" ", "")}</IBAN></Id></DbtrAcct>
+                   <DbtrAgt><FinInstnId>{(Version >= 4 ? "<BICFI>" : "<BIC>")}{App.Client.Bic ?? "NOTPROVIDED"}{(Version >= 4 ? "</BICFI>" : "</BIC>")}</FinInstnId></DbtrAgt>
                 """);
             progress?.Report(100.0 * ++i / count);
 
@@ -74,16 +77,15 @@ namespace Elwig.Helpers.Export {
                         <PmtId><EndToEndId>{id}</EndToEndId></PmtId>
                         <Amt><InstdAmt Ccy="{tx.Currency}">{Transaction.FormatAmount(tx.Amount)}</InstdAmt></Amt>
                         <Cdtr>
-                         <Nm>{a.Name}</Nm>
+                         <Nm>{SecurityElement.Escape(a.Name[..Math.Min(140, a.Name.Length)])}</Nm>
                          <PstlAdr>
-                          <StrtNm>{a1}</StrtNm><BldgNb>{a2}</BldgNb>
-                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{a.PostalDest.AtPlz?.Ort.Name}</TwnNm>
+                          <StrtNm>{a1?[..Math.Min(70, a1.Length)]}</StrtNm><BldgNb>{SecurityElement.Escape(a2?[..Math.Min(16, a2.Length)])}</BldgNb>
+                          <PstCd>{a.PostalDest.AtPlz?.Plz}</PstCd><TwnNm>{SecurityElement.Escape(a.PostalDest.AtPlz?.Ort.Name)}</TwnNm>
                           <Ctry>{a.PostalDest.Country.Alpha2}</Ctry>
                          </PstlAdr>
                         </Cdtr>
-                        <CdtrAcct><Id><IBAN>{tx.Member.Iban}</IBAN></Id></CdtrAcct>
-                        <CdtrAgt><FinInstnId><BICFI>{tx.Member.Bic ?? "NOTPROVIDED"}</BICFI></FinInstnId></CdtrAgt>
-                        <RmtInf><Ustrd>{info}</Ustrd></RmtInf>
+                        <CdtrAcct><Id><IBAN>{tx.Member.Iban!}</IBAN></Id></CdtrAcct>
+                        <RmtInf><Ustrd>{SecurityElement.Escape(info)}</Ustrd></RmtInf>
                        </CdtTrfTxInf>
                     """);
                 progress?.Report(100.0 * ++i / count);

Elwig/Helpers/HttpClientExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+using System.IO;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers {
+    public static class HttpClientExtensions {
+        public static async Task DownloadAsync(this HttpClient client, string requestUri, Stream destination, IProgress<double>? progress = null, CancellationToken cancellationToken = default) {
+            using var response = await client.GetAsync(requestUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+            var contentLength = response.Content.Headers.ContentLength;
+
+            using var download = await response.Content.ReadAsStreamAsync(cancellationToken);
+            if (progress == null || !contentLength.HasValue) {
+                await download.CopyToAsync(destination, cancellationToken);
+                return;
+            }
+
+            var relativeProgress = new Progress<long>(totalBytes => progress.Report((double)totalBytes / contentLength.Value));
+            await download.CopyToAsync(destination, 81920, relativeProgress, cancellationToken);
+            progress.Report(100.0);
+        }
+    }
+}

Elwig/Helpers/Printing/Html.cs

@@ -8,7 +8,7 @@ namespace Elwig.Helpers.Printing {
         private static RazorLightEngine? Engine = null;
         public static bool IsReady => Engine != null;
 
-        public static async Task Init(Action evtHandler) {
+        public static async Task Init(Action? evtHandler = null) {
             var e = new RazorLightEngineBuilder()
                 .UseFileSystemProject(App.DataPath + "resources")
                 .UseMemoryCachingProvider()
@@ -24,7 +24,7 @@ namespace Elwig.Helpers.Printing {
             await e.CompileTemplateAsync("DeliveryConfirmation");
 
             Engine = e;
-            evtHandler();
+            evtHandler?.Invoke();
         }
 
         public static async Task<string> CompileRenderAsync(string key, object model) {

Elwig/Helpers/Printing/Pdf.cs

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

Elwig/Helpers/StreamExtensions.cs

@@ -0,0 +1,25 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers {
+    public static class StreamExtensions {
+        public static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress<long>? progress = null, CancellationToken cancellationToken = default) {
+            ArgumentNullException.ThrowIfNull(source);
+            if (!source.CanRead) throw new ArgumentException("Has to be readable", nameof(source));
+            ArgumentNullException.ThrowIfNull(destination);
+            if (!destination.CanWrite) throw new ArgumentException("Has to be writable", nameof(destination));
+            ArgumentOutOfRangeException.ThrowIfNegative(bufferSize);
+
+            var buffer = new byte[bufferSize];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await source.ReadAsync(buffer, cancellationToken).ConfigureAwait(false)) != 0) {
+                await destination.WriteAsync(buffer.AsMemory(0, bytesRead), cancellationToken).ConfigureAwait(false);
+                totalBytesRead += bytesRead;
+                progress?.Report(totalBytesRead);
+            }
+        }
+    }
+}

Elwig/Helpers/Utils.cs

@@ -11,9 +11,14 @@ using Elwig.Dialogs;
 using System.Text;
 using System.Numerics;
 using Elwig.Models.Entities;
-using System.IO;
-using ScottPlot.TickGenerators.TimeUnits;
 using Elwig.Helpers.Billing;
+using System.Runtime.InteropServices;
+using System.Net.Http;
+using System.Text.Json.Nodes;
+using System.IO;
+using MailKit.Net.Smtp;
+using MailKit.Security;
+using OpenTK.Compute.OpenCL;
 
 namespace Elwig.Helpers {
     public static partial class Utils {
@@ -25,30 +30,33 @@ namespace Elwig.Helpers {
         public static int CurrentLastSeason => DateTime.Now.Year - (DateTime.Now.Month <= 7 ? 1 : 0);
         public static DateTime Today => (DateTime.Now.Hour >= 3) ? DateTime.Today : DateTime.Today.AddDays(-1);
 
-        public static readonly Regex SerialRegex = GeneratedSerialRegex();
-        public static readonly Regex TcpRegex = GeneratedTcpRegex();
-        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
-        public static readonly Regex FromToRegex = GeneratedFromToRegex();
-        public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
-        public static readonly Regex AddressRegex = GeneratedAddressRegex();
-
         [GeneratedRegex("^serial://([A-Za-z0-9]+):([0-9]+)(,([5-9]),([NOEMSnoems]),(0|1|1\\.5|2|))?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedSerialRegex();
+        public static readonly Regex SerialRegex = GeneratedSerialRegex();
 
         [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedTcpRegex();
+        public static readonly Regex TcpRegex = GeneratedTcpRegex();
 
         [GeneratedRegex(@"^(-?(0?[1-9]|[12][0-9]|3[01])\.(0?[1-9]|1[0-2])\.([0-9]{4})?-?){1,2}$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToDateRegex();
+        public static readonly Regex DateFromToRegex = GeneratedFromToDateRegex();
 
         [GeneratedRegex(@"^([0-9]+([\.,][0-9]+)?)?-([0-9]+([\.,][0-9]+)?)?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToRegex();
+        public static readonly Regex FromToRegex = GeneratedFromToRegex();
 
         [GeneratedRegex(@"^([0-9]{1,2}:[0-9]{2})?-([0-9]{1,2}:[0-9]{2})?$", RegexOptions.Compiled)]
         private static partial Regex GeneratedFromToTimeRegex();
+        public static readonly Regex FromToTimeRegex = GeneratedFromToTimeRegex();
 
         [GeneratedRegex(@"^(.*?) +([0-9].*)$", RegexOptions.Compiled)]
         private static partial Regex GeneratedAddressRegex();
+        public static readonly Regex AddressRegex = GeneratedAddressRegex();
+
+        [GeneratedRegex(@"[^A-Za-z0-9ÄÜÖẞäöüß-]+")]
+        private static partial Regex GeneratedInvalidFileNamePartsRegex();
+        public static readonly Regex InvalidFileNamePartsRegex = GeneratedInvalidFileNamePartsRegex();
 
         public static readonly string GroupSeparator = "\u202F";
         public static readonly string UnitSeparator = "\u00A0";
@@ -63,7 +71,9 @@ namespace Elwig.Helpers {
             return PhoneNrTypes.Where(t => t.Key == type).Select(t => t.Value).FirstOrDefault(type);
         }
 
-        private static readonly ushort[] Crc16ModbusTable = {
+        private static readonly string[] TempWildcards = ["*.html", "*.pdf", "*.exe"];
+
+        private static readonly ushort[] Crc16ModbusTable = [
             0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
             0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
             0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
@@ -96,7 +106,7 @@ namespace Elwig.Helpers {
             0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
             0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
             0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,
-        };
+        ];
 
         public static SerialPort OpenSerialConnection(string connection) {
             var m = SerialRegex.Match(connection);
@@ -329,7 +339,7 @@ namespace Elwig.Helpers {
 
         public static (string, string?) SplitName(string fullName, string? familyName) {
             if (familyName == null || familyName == "") return (fullName, null);
-            var p0 = fullName.ToLower().IndexOf(familyName.ToLower());
+            var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
             if (p0 == -1) return (fullName, null);
             var p1 = fullName.IndexOf(" und ");
             var p2 = fullName.ToLower().LastIndexOf(" und ");
@@ -348,9 +358,9 @@ namespace Elwig.Helpers {
         }
 
         public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
-            HashSet<IEnumerable<T>> output = new();
+            HashSet<IEnumerable<T>> output = [];
             for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
-                List<T> t = new();
+                List<T> t = [];
                 for (int j = 0; j < 30; j++) {
                     var e = input.ElementAtOrDefault(j);
                     if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
@@ -362,11 +372,11 @@ namespace Elwig.Helpers {
             return output.OrderByDescending(l => l.Count());
         }
 
-        public static List<string> GetVaributes(AppDbContext ctx, int year, bool withSlash = false, bool onlyDelivered = true) {
-            var varieties = ctx.WineVarieties.Select(v => v.SortId).ToList();
+        public static List<RawVaribute> GetVaributes(AppDbContext ctx, int year, bool onlyDelivered = true) {
+            var varieties = ctx.WineVarieties.Select(v => new RawVaribute(v.SortId, "", null)).ToList();
             var delivered = ctx.DeliveryParts
                .Where(d => d.Year == year)
-               .Select(d => $"{d.SortId}{(withSlash ? "/" : "")}{d.AttrId}")
+               .Select(d => new RawVaribute(d.SortId, d.AttrId ?? "", d.CultId ?? ""))
                .Distinct()
                .ToList();
             return [.. (onlyDelivered ? delivered : delivered.Union(varieties)).Order()];
@@ -375,9 +385,52 @@ namespace Elwig.Helpers {
         public static List<Varibute> GetVaributeList(AppDbContext ctx, int year, bool onlyDelivered = true) {
             var varieties = ctx.WineVarieties.ToDictionary(v => v.SortId, v => v);
             var attributes = ctx.WineAttributes.ToDictionary(a => a.AttrId, a => a);
-            return GetVaributes(ctx, year, false, onlyDelivered)
-                .Select(s => new Varibute(varieties[s[..2]], s.Length > 2 ? attributes[s[2..]] : null))
+            var cultivations = ctx.WineCultivations.ToDictionary(c => c.CultId, c => c);
+            return GetVaributes(ctx, year, onlyDelivered)
+                .Select(s => new Varibute(s, varieties, attributes, cultivations))
                 .ToList();
         }
+
+        [LibraryImport("wininet.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool InternetGetConnectedState(out int description, int reservedValue);
+
+        public static bool HasInternetConnectivity() {
+            return InternetGetConnectedState(out var _, 0);
+        }
+
+        public static async Task<(string Version, string Url, long Size)?> GetLatestInstallerUrl(string url) {
+            try {
+                using var client = new HttpClient() {
+                    Timeout = TimeSpan.FromSeconds(5),
+                };
+                var res = JsonNode.Parse(await client.GetStringAsync(url));
+                var data = res!["data"]![0]!;
+                return ((string)data["version"]!, (string)data["url"]!, (int)data["size"]!);
+            } catch {
+                return null;
+            }
+        }
+
+        public static void CleanupTempFiles() {
+            var dir = new DirectoryInfo(App.TempPath);
+            foreach (var file in TempWildcards.SelectMany(dir.EnumerateFiles)) {
+                file.Delete();
+            }
+        }
+
+        public static string NormalizeFileName(string filename) {
+            return InvalidFileNamePartsRegex.Replace(filename.Replace('/', '-'), "_");
+        }
+
+        public static async Task<SmtpClient?> GetSmtpClient() {
+            if (App.Config.Smtp == null)
+                return null;
+            var (host, port, mode, username, password, _) = App.Config.Smtp.Value;
+            var client = new SmtpClient();
+            await client.ConnectAsync(host, port, mode == "starttls" ? SecureSocketOptions.StartTls : SecureSocketOptions.None);
+            await client.AuthenticateAsync(username, password);
+            return client;
+        }
     }
 }

Elwig/Helpers/Validator.cs

@@ -454,9 +454,9 @@ namespace Elwig.Helpers {
             if (input.Text.Length < 2 || !ctx.SortIdExists(input.Text[0..2]).GetAwaiter().GetResult()) {
                 return new(false, "Ungültige Sorte");
             } else if (input.Text.Length >= 3) {
-                var attr = input.Text[2..];
-                if (!ctx.AttrIdExists(attr).GetAwaiter().GetResult()) {
-                    return new(false, "Ungültiges Attribut");
+                var disc = input.Text[2..];
+                if (!ctx.AttrIdExists(disc).GetAwaiter().GetResult() && !ctx.CultIdExists(disc).GetAwaiter().GetResult()) {
+                    return new(false, "Ungültiges Attribut/Bewirt.");
                 }
             }
 
@@ -589,11 +589,6 @@ namespace Elwig.Helpers {
             return new(true, null);
         }
 
-        public static ValidationResult CheckGstNr(TextBox input, bool required) {
-            // TODO
-            return new(true, "Not implemented yet");
-        }
-
         public static ValidationResult CheckGradatoinOe(TextBox input, bool required) {
             var res = CheckInteger(input, required, 3);
             if (!res.IsValid) {

Elwig/Helpers/Weighing/AveryEventScale.cs

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

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -1,64 +0,0 @@
-using System;
-using System.IO;
-using System.IO.Ports;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Elwig.Helpers.Weighing {
-    public class GassnerScale : IScale {
-
-        protected SerialPort Serial = null;
-        protected StreamReader Reader;
-        protected StreamWriter Writer;
-
-        public string Manufacturer => "Gassner";
-        public int InternalScaleNr => 1;
-        public string Model { get; private set; }
-        public string ScaleId { get; private set; }
-        public bool IsReady { get; private set; }
-        public bool HasFillingClearance { get; private set; }
-        public int? WeightLimit { get; private set; }
-        public string? LogPath { get; private set; }
-
-        public GassnerScale(string id, string model, string connection) {
-            ScaleId = id;
-            Model = model;
-            IsReady = true;
-            HasFillingClearance = false;
-
-            if (!connection.StartsWith("serial:"))
-                throw new ArgumentException("Unsupported scheme");
-
-            Serial = Utils.OpenSerialConnection(connection);
-            Writer = new(Serial.BaseStream, Encoding.ASCII, -1, true);
-            Reader = new(Serial.BaseStream, Encoding.ASCII, false, -1, true);
-        }
-
-        public void Dispose() {
-            Writer.Close();
-            Reader.Close();
-            Serial.Close();
-            GC.SuppressFinalize(this);
-        }
-
-        public async Task<WeighingResult> Weigh(bool incIdentNr) {
-            await Writer.WriteAsync(incIdentNr ? "\x05" : "?");
-            // TODO receive response
-            return new();
-        }
-
-        public async Task<WeighingResult> GetCurrentWeight() {
-            return await Weigh(false);
-        }
-
-        public async Task<WeighingResult> Weigh() {
-            return await Weigh(true);
-        }
-
-        public async Task Empty() { }
-
-        public async Task GrantFillingClearance() { }
-
-        public async Task RevokeFillingClearance() { }
-    }
-}

Elwig/Helpers/Weighing/ICommandScale.cs

@@ -0,0 +1,35 @@
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Weighing {
+    /// <summary>
+    /// Interface for controlling a a scale which responds to commands sent to it
+    /// </summary>
+    public interface ICommandScale : IScale {
+        /// <summary>
+        /// Get the current weight on the scale without performing a weighing process
+        /// </summary>
+        /// <returns>Result of the weighing process (probably without a weighing id)</returns>
+        Task<WeighingResult> GetCurrentWeight();
+
+        /// <summary>
+        /// Perform a weighing process
+        /// </summary>
+        /// <returns>Result of the weighing process (including a weighing id)</returns>
+        Task<WeighingResult> Weigh();
+
+        /// <summary>
+        /// Empty the scale container or grant clearance to do so
+        /// </summary>
+        Task Empty();
+
+        /// <summary>
+        /// Grant clearance to fill the scale container
+        /// </summary>
+        Task GrantFillingClearance();
+
+        /// <summary>
+        /// Revoke clearance to fill the scale container
+        /// </summary>
+        Task RevokeFillingClearance();
+    }
+}

Elwig/Helpers/Weighing/IEventScale.cs

@@ -0,0 +1,11 @@
+namespace Elwig.Helpers.Weighing {
+    /// <summary>
+    /// Interface for controlling a a scale which automatically sends weighing updates
+    /// </summary>
+    public interface IEventScale : IScale {
+
+        public event EventHandler<WeighingEventArgs> WeighingEvent;
+
+        delegate void EventHandler<WeighingEventArgs>(object sender, WeighingEventArgs args);
+    }
+}

Elwig/Helpers/Weighing/IScale.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
     /// <summary>
-    /// Interface for controlling a industrial scale
+    /// Interface for controlling a industrial scale (industrial terminal, "IT")
     /// </summary>
     public interface IScale : IDisposable {
         /// <summary>
@@ -45,32 +44,5 @@ namespace Elwig.Helpers.Weighing {
         /// Where to log the requests and responses from the scale to
         /// </summary>
         string? LogPath { get; }
-
-        /// <summary>
-        /// Get the current weight on the scale without performing a weighing process
-        /// </summary>
-        /// <returns>Result of the weighing process (probably without a weighing id)</returns>
-        Task<WeighingResult> GetCurrentWeight();
-
-        /// <summary>
-        /// Perform a weighing process
-        /// </summary>
-        /// <returns>Result of the weighing process (including a weighing id)</returns>
-        Task<WeighingResult> Weigh();
-
-        /// <summary>
-        /// Empty the scale container or grant clearance to do so
-        /// </summary>
-        Task Empty();
-
-        /// <summary>
-        /// Grant clearance to fill the scale container
-        /// </summary>
-        Task GrantFillingClearance();
-
-        /// <summary>
-        /// Revoke clearance to fill the scale container
-        /// </summary>
-        Task RevokeFillingClearance();
     }
 }

Elwig/Helpers/Weighing/InvalidScale.cs

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

Elwig/Helpers/Weighing/Scale.cs

@@ -0,0 +1,95 @@
+using System.IO.Ports;
+using System.IO;
+using System.Net.Sockets;
+using System;
+
+namespace Elwig.Helpers.Weighing {
+    public abstract class Scale : IDisposable {
+
+        protected enum Output { RTS, DTR, OUT1, OUT2 };
+
+        protected SerialPort? Serial = null;
+        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
+        protected TcpClient? Tcp = null;
+        protected Stream Stream;
+
+        protected readonly Output? EmptyMode = null;
+        protected readonly Output? FillingClearanceMode = null;
+        protected readonly int EmptyDelay;
+
+        public int? WeightLimit { get; private set; }
+        public string? LogPath { get; private set; }
+
+        public static IScale FromConfig(ScaleConfig config) {
+            int? limit = config.Limit != null ? int.Parse(config.Limit) : null;
+            if (config.Type == "SysTec-IT") {
+                return new SysTecITScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
+            } else if (config.Type == "Avery-Async") {
+                return new AveryEventScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log);
+            } else {
+                throw new ArgumentException($"Invalid scale type: \"{config.Type}\"");
+            }
+        }
+
+        protected Scale(string cnx, string? empty, string? filling, int? limit, string? log) {
+            if (cnx.StartsWith("serial:")) {
+                Serial = Utils.OpenSerialConnection(cnx);
+                Stream = Serial.BaseStream;
+            } else if (cnx.StartsWith("tcp:")) {
+                Tcp = Utils.OpenTcpConnection(cnx);
+                Stream = Tcp.GetStream();
+            } else {
+                throw new ArgumentException($"Unsupported scheme: \"{cnx.Split(':')[0]}\"");
+            }
+
+            LogPath = log;
+
+            if (empty != null) {
+                var parts = empty.Split(':');
+                if (parts.Length == 3) {
+                    if (parts[0] != Serial?.PortName)
+                        ControlSerialEmpty = Utils.OpenSerialConnection($"serial://{parts[0]}:9600");
+                } else if (parts.Length != 2) {
+                    throw new ArgumentException("Invalid value for 'empty'");
+                }
+                EmptyMode = ConvertOutput(parts[^2]);
+                EmptyDelay = int.Parse(parts[^1]);
+            }
+
+            WeightLimit = limit;
+            if (filling != null) {
+                var parts = filling.Split(':');
+                if (parts.Length == 2) {
+                    if (parts[0] != Serial?.PortName)
+                        ControlSerialFilling = parts[0] != ControlSerialEmpty?.PortName ? Utils.OpenSerialConnection($"serial://{parts[0]}:9600") : ControlSerialEmpty;
+                } else if (parts.Length != 1) {
+                    throw new ArgumentException("Invalid value for 'filling'");
+                }
+                FillingClearanceMode = ConvertOutput(parts[^1]);
+            }
+
+            if (FillingClearanceMode != null && WeightLimit == null)
+                throw new ArgumentException("Weight limit has to be set, if filling clearance supervision is enabled");
+        }
+
+        public void Dispose() {
+            Stream.Close();
+            Serial?.Close();
+            ControlSerialEmpty?.Close();
+            ControlSerialFilling?.Close();
+            Tcp?.Close();
+            GC.SuppressFinalize(this);
+        }
+
+        protected static Output? ConvertOutput(string? value) {
+            return value switch {
+                null => null,
+                "RTS" => Output.RTS,
+                "DTR" => Output.DTR,
+                "OUT1" => Output.OUT1,
+                "OUT2" => Output.OUT2,
+                _ => throw new ArgumentException($"Invalid value for argument: '{value}'"),
+            };
+        }
+    }
+}

Elwig/Helpers/Weighing/SchemberScale.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Threading.Tasks;
-
-namespace Elwig.Helpers.Weighing {
-    // TODO implement SchemberScale
-    public class SchemberScale : IScale {
-
-        public string Manufacturer => "Schember";
-        public string Model => throw new NotImplementedException();
-        public string ScaleId => throw new NotImplementedException();
-        public int InternalScaleNr => throw new NotImplementedException();
-        public bool IsReady => throw new NotImplementedException();
-        public bool HasFillingClearance => throw new NotImplementedException();
-        public int? WeightLimit => throw new NotImplementedException();
-        public string? LogPath => throw new NotImplementedException();
-
-        public void Dispose() {
-            throw new NotImplementedException();
-        }
-
-        public Task Empty() {
-            throw new NotImplementedException();
-        }
-
-        public Task<WeighingResult> GetCurrentWeight() {
-            throw new NotImplementedException();
-        }
-
-        public Task GrantFillingClearance() {
-            throw new NotImplementedException();
-        }
-
-        public Task RevokeFillingClearance() {
-            throw new NotImplementedException();
-        }
-
-        public Task<WeighingResult> Weigh() {
-            throw new NotImplementedException();
-        }
-    }
-}

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -1,23 +1,11 @@
 using System;
 using System.IO;
 using System.IO.Ports;
-using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Elwig.Helpers.Weighing {
-    public class SystecScale : IScale {
-
-        protected enum Output { RTS, DTR, OUT1, OUT2 };
-
-        protected SerialPort? Serial = null;
-        protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
-        protected TcpClient? Tcp = null;
-        protected Stream Stream;
-
-        protected readonly Output? EmptyMode = null;
-        protected readonly Output? FillingClearanceMode = null;
-        protected readonly int EmptyDelay;
+    public class SysTecITScale : Scale, ICommandScale {
 
         public string Manufacturer => "SysTec";
         public int InternalScaleNr => 1;
@@ -25,72 +13,15 @@ namespace Elwig.Helpers.Weighing {
         public string ScaleId { get; private set; }
         public bool IsReady { get; private set; }
         public bool HasFillingClearance { get; private set; }
-        public int? WeightLimit { get; private set; }
-        public string? LogPath { get; private set; }
 
-        public SystecScale(string id, string model, string connection, string? empty = null, string? filling = null, int? limit = null, string? log = null) {
+        public SysTecITScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) :
+            base(cnx, empty, filling, limit, log) {
             ScaleId = id;
             Model = model;
             IsReady = true;
             HasFillingClearance = false;
-            LogPath = log;
-
-            if (connection.StartsWith("serial:")) {
-                Serial = Utils.OpenSerialConnection(connection);
-                Stream = Serial.BaseStream;
-            } else if (connection.StartsWith("tcp:")) {
-                Tcp = Utils.OpenTcpConnection(connection);
-                Stream = Tcp.GetStream();
-            } else {
-                throw new ArgumentException("Unsupported scheme");
-            }
-
-            if (empty != null) {
-                var parts = empty.Split(':');
-                if (parts.Length == 3) {
-                    if (parts[0] != Serial?.PortName)
-                        ControlSerialEmpty = Utils.OpenSerialConnection($"serial://{parts[0]}:9600");
-                } else if (parts.Length != 2) {
-                    throw new ArgumentException("Invalid value for 'empty'");
-                }
-                EmptyMode = ConvertOutput(parts[^2]);
-                EmptyDelay = int.Parse(parts[^1]);
-            }
-
-            WeightLimit = limit;
-            if (filling != null) {
-                var parts = filling.Split(':');
-                if (parts.Length == 2) {
-                    if (parts[0] != Serial?.PortName)
-                        ControlSerialFilling = parts[0] != ControlSerialEmpty?.PortName ? Utils.OpenSerialConnection($"serial://{parts[0]}:9600") : ControlSerialEmpty;
-                } else if (parts.Length != 1) {
-                    throw new ArgumentException("Invalid value for 'filling'");
-                }
-                FillingClearanceMode = ConvertOutput(parts[^1]);
-            }
-
-            if (FillingClearanceMode != null && WeightLimit == null)
-                throw new ArgumentException("Weight limit has to be set, if filling clearance supervision is enabled");
-        }
-
-        public void Dispose() {
-            Stream.Close();
-            Serial?.Close();
-            ControlSerialEmpty?.Close();
-            ControlSerialFilling?.Close();
-            Tcp?.Close();
-            GC.SuppressFinalize(this);
-        }
-
-        protected static Output? ConvertOutput(string? value) {
-            return value switch {
-                null => null,
-                "RTS" => Output.RTS,
-                "DTR" => Output.DTR,
-                "OUT1" => Output.OUT1,
-                "OUT2" => Output.OUT2,
-                _ => throw new ArgumentException($"Invalid value for argument: '{value}'"),
-            };
+            Stream.WriteTimeout = 250;
+            Stream.ReadTimeout = 11000;
         }
 
         protected async Task SendCommand(string command) {
@@ -105,7 +36,7 @@ namespace Elwig.Helpers.Weighing {
                 line = await reader.ReadLineAsync();
                 if (LogPath != null) await File.AppendAllTextAsync(LogPath, $"{line}\r\n");
             }
-            if (line == null || line.Length < 4 || !line.StartsWith("<") || !line.EndsWith(">")) {
+            if (line == null || line.Length < 4 || !line.StartsWith('<') || !line.EndsWith('>')) {
                 throw new IOException("Invalid response from scale");
             }
 
@@ -162,7 +93,7 @@ namespace Elwig.Helpers.Weighing {
             var crc16      = line[52..60].Trim();
 
             if (Utils.CalcCrc16Modbus(record[..54]) != ushort.Parse(crc16)) {
-                throw new IOException($"Invalid response from scale: Invalid CRC16 checksum ({crc16} != {Utils.CalcCrc16Modbus(record[..54]).ToString()})");
+                throw new IOException($"Invalid response from scale: Invalid CRC16 checksum ({crc16} != {Utils.CalcCrc16Modbus(record[..54])})");
             } else if (unit != "kg") {
                 throw new IOException($"Unsupported unit in weighing response: '{unit}'");
             }

Elwig/Helpers/Weighing/WeighingEventArgs.cs

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

Elwig/Helpers/Weighing/WeighingResult.cs

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

Elwig/Models/Dtos/AreaComUnderDeliveyData.cs

@@ -83,17 +83,17 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string Locality { get; set; }
+        public required string Locality { get; set; }
         [Column("bucket")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
         [Column("area")]
         public int Area { get; set; }
         [Column("min_kg")]

Elwig/Models/Dtos/CreditNoteData.cs

@@ -48,7 +48,7 @@ namespace Elwig.Models.Dtos {
         }
 
         private static async Task<IEnumerable<CreditNoteRowSingle>> FromDbSet(DbSet<CreditNoteRowSingle> table, int year, int avnr) {
-            return await table.FromSql($"""
+            return await table.FromSqlRaw($"""
                 SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name AS ort, m.address, m.iban, c.tgnr, s.year, s.precision,
                        p.amount - p.net_amount AS surcharge,
                        c.net_amount, c.prev_net_amount, c.vat, c.vat_amount, c.gross_amount, c.modifiers, c.prev_modifiers, c.amount,
@@ -77,7 +77,7 @@ namespace Elwig.Models.Dtos {
         public string Address;
         public int Plz;
         public string Locality;
-        public string Iban;
+        public string? Iban;
         public string TgNr;
         public decimal Sum;
         public decimal? Surcharge;
@@ -101,7 +101,7 @@ namespace Elwig.Models.Dtos {
             Address = row.Address;
             Plz = row.Plz;
             Locality = row.Locality;
-            Iban = Utils.FormatIban(row.Iban);
+            Iban = row.Iban != null ? Utils.FormatIban(row.Iban) : null;
             TgNr = $"{row.Year}/{row.TgNr}";
             Total = Utils.DecFromDb(row.NetAmount, prec1);
             Surcharge = (row.Surcharge == null || row.Surcharge == 0) ? null : Utils.DecFromDb((long)row.Surcharge, prec2);
@@ -133,25 +133,25 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string LocalityFull { get; set; }
+        public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
         [Column("iban")]
-        public string Iban { get; set; }
+        public string? Iban { get; set; }
         [Column("year")]
         public int Year { get; set; }
         [Column("precision")]
         public byte Precision { get; set; }
         [Column("tgnr")]
-        public string TgNr { get; set; }
+        public required string TgNr { get; set; }
         [Column("surcharge")]
         public long? Surcharge { get; set; }
         [Column("net_amount")]

Elwig/Models/Dtos/CreditNoteDeliveryData.cs

@@ -43,10 +43,11 @@ namespace Elwig.Models.Dtos {
             return await table.FromSqlRaw($"""
                 SELECT d.year, c.tgnr, v.avnr, d.mgnr, d.did, d.lsnr, d.dpnr, d.weight, d.modifiers,
                        b.bktnr, d.sortid, b.discr, b.value, pb.price, pb.amount, p.net_amount, p.amount AS total_amount,
-                       s.name AS variety, a.name AS attribute, q.name AS quality_level, d.oe, d.kmw
+                       s.name AS variety, a.name AS attribute, c.name AS cultivation, q.name AS quality_level, d.oe, d.kmw
                 FROM v_delivery d
                     JOIN wine_variety s ON s.sortid = d.sortid
                     LEFT JOIN wine_attribute a ON a.attrid = d.attrid
+                    LEFT JOIN wine_cultivation c ON c.cultid = d.cultid
                     JOIN wine_quality_level q ON q.qualid = d.qualid
                     LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
                     LEFT JOIN payment_variant v ON v.year = d.year
@@ -70,6 +71,7 @@ namespace Elwig.Models.Dtos {
         public int DPNr;
         public string Variety;
         public string? Attribute;
+        public string? Cultivation;
         public string[] Modifiers;
         public string QualityLevel;
         public (double Oe, double Kmw) Gradation;
@@ -88,6 +90,7 @@ namespace Elwig.Models.Dtos {
             DPNr = f.DPNr;
             Variety = f.Variety;
             Attribute = f.Attribute;
+            Cultivation = f.Cultivation;
             var modifiers = (IEnumerable<Modifier>)(f.Modifiers ?? "").Split(',')
                 .Select(m => season?.Modifiers.FirstOrDefault(s => s.ModId == m))
                 .Where(m => m != null)
@@ -122,7 +125,7 @@ namespace Elwig.Models.Dtos {
         [Column("did")]
         public int DId { get; set; }
         [Column("lsnr")]
-        public string LsNr { get; set; }
+        public required string LsNr { get; set; }
         [Column("dpnr")]
         public int DPNr { get; set; }
         [Column("weight")]
@@ -132,9 +135,9 @@ namespace Elwig.Models.Dtos {
         [Column("bktnr")]
         public int BktNr { get; set; }
         [Column("sortid")]
-        public string SortId { get; set; }
+        public required string SortId { get; set; }
         [Column("discr")]
-        public string Discr { get; set; }
+        public required string Discr { get; set; }
         [Column("value")]
         public int Value { get; set; }
         [Column("price")]
@@ -146,11 +149,13 @@ namespace Elwig.Models.Dtos {
         [Column("total_amount")]
         public long? TotalAmount { get; set; }
         [Column("variety")]
-        public string Variety { get; set; }
+        public required string Variety { get; set; }
         [Column("attribute")]
         public string? Attribute { get; set; }
+        [Column("cultivation")]
+        public string? Cultivation { get; set; }
         [Column("quality_level")]
-        public string QualityLevel { get; set; }
+        public required string QualityLevel { get; set; }
         [Column("oe")]
         public double Oe { get; set; }
         [Column("kmw")]

Elwig/Models/Dtos/DataTable.cs

@@ -36,7 +36,7 @@ namespace Elwig.Models.Dtos {
                 var elType = type?.GetElementType();
                 return type != null && type.IsValueType && type.Name.StartsWith("ValueTuple") ? type.GetFields().Select(f => f.FieldType) :
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Select(f => f.FieldType) :
-                       new Type?[] { type };
+                       [type];
             }).ToList();
             ColumnSpans = ColumnTypes.Select(type => {
                 var elType = type?.GetElementType();
@@ -44,7 +44,7 @@ namespace Elwig.Models.Dtos {
                        type != null && elType != null && type.IsArray && elType.IsValueType && elType.Name.StartsWith("ValueTuple") ? elType.GetFields().Length : 1;
             }).ToList();
             ColumnWidths = colNames.Select(c => c.Item4).ToList();
-            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? Array.Empty<string?>()).ToList();
+            ColumnUnits = colNames.Select(c => c.Item3?.Split("|").Select(p => p.Length == 0 ? null : p).ToArray() ?? []).ToList();
         }
 
         public DataTable(string name, string fullName, IEnumerable<T> rows, IEnumerable<(string, string, string?)>? colNames = null) :

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -73,6 +73,7 @@ namespace Elwig.Models.Dtos {
         public int DPNr;
         public string Variety;
         public string? Attribute;
+        public string? Cultivation;
         public string QualityLevel;
         public (double Oe, double Kmw) Gradation;
         public string[] Modifiers;
@@ -85,6 +86,7 @@ namespace Elwig.Models.Dtos {
             DPNr = p.DPNr;
             Variety = p.Variety.Name;
             Attribute = p.Attribute?.Name;
+            Cultivation = p.Cultivation?.Name;
             QualityLevel = p.Quality.Name;
             Gradation = (p.Oe, p.Kmw);
             Modifiers = p.Modifiers

Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs

@@ -99,17 +99,17 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string Locality { get; set; }
+        public required string Locality { get; set; }
         [Column("bucket")]
-        public string VtrgId { get; set; }
+        public required string VtrgId { get; set; }
         [Column("area")]
         public int Area { get; set; }
         [Column("weight")]

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -49,15 +49,15 @@ namespace Elwig.Models.Dtos {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("family_name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
         [Column("given_name")]
-        public string GivenName { get; set; }
+        public required string GivenName { get; set; }
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
         [Column("plz")]
         public int Plz { get; set; }
         [Column("ort")]
-        public string LocalityFull { get; set; }
+        public required string LocalityFull { get; set; }
         [NotMapped]
         public string Locality => LocalityFull.Split(",")[0];
         [Column("business_shares")]

Elwig/Models/Dtos/Transaction.cs

@@ -1,4 +1,5 @@
 using Elwig.Models.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -14,12 +15,13 @@ namespace Elwig.Models.Dtos {
 
         public static IEnumerable<Transaction> FromPaymentVariant(PaymentVar variant) {
             return variant.Credits
+                .Where(c => c.Member.Iban != null)
                 .OrderBy(c => c.TgNr)
                 .Select(c => new Transaction(c))
                 .ToList();
         }
 
-        public static string FormatAmountCent(long cents) => $"{cents / 100}.{cents % 100:00}";
+        public static string FormatAmountCent(long cents) => $"{cents / 100}.{Math.Abs(cents % 100):00}";
 
         public static string FormatAmount(decimal amount) => FormatAmountCent((int)(amount * 100));
     }

Elwig/Models/Entities/AT_Gem.cs

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

Elwig/Models/Entities/AT_Kg.cs

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

Elwig/Models/Entities/AT_Ort.cs

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

Elwig/Models/Entities/AT_Plz.cs

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

Elwig/Models/Entities/AT_PlzDest.cs

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

Elwig/Models/Entities/AreaCom.cs

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

Elwig/Models/Entities/AreaComType.cs

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

Elwig/Models/Entities/BillingAddr.cs

@@ -9,24 +9,24 @@ namespace Elwig.Models.Entities {
         public int MgNr { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("country")]
         public int CountryNum { get; set; }
 
         [Column("postal_dest")]
-        public string PostalDestId { get; set; }
+        public required string PostalDestId { get; set; }
 
         [Column("address")]
-        public string Address { get; set; }
+        public required string Address { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [ForeignKey("CountryNum")]
-        public virtual Country Country { get; private set; }
+        public virtual Country Country { get; private set; } = null!;
 
         [ForeignKey("CountryNum, PostalDestId")]
-        public virtual PostalDest PostalDest { get; private set; }
+        public virtual PostalDest PostalDest { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/Branch.cs

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

Elwig/Models/Entities/ClientParam.cs

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

Elwig/Models/Entities/Country.cs

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

Elwig/Models/Entities/Credit.cs

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

Elwig/Models/Entities/Currency.cs

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

Elwig/Models/Entities/Delivery.cs

@@ -16,7 +16,7 @@ namespace Elwig.Models.Entities {
         public int DId { get; set; }
 
         [Column("date")]
-        public string DateString { get; set; }
+        public required string DateString { get; set; }
 
         [NotMapped]
         public DateOnly Date {
@@ -43,31 +43,31 @@ namespace Elwig.Models.Entities {
         }
 
         [Column("zwstid")]
-        public string ZwstId { get; set; }
+        public required string ZwstId { get; set; }
 
         [ForeignKey("ZwstId")]
-        public virtual Branch Branch { get; private set; }
+        public virtual Branch Branch { get; private set; } = null!;
 
         [Column("lnr")]
         public int LNr { get; set; }
 
         [Column("lsnr")]
-        public string LsNr { get; set; }
+        public required string LsNr { get; set; }
 
         [Column("mgnr")]
         public int MgNr { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [Column("comment")]
         public string? Comment { get; set; }
 
         [ForeignKey("Year")]
-        public virtual Season Season { get; private set; }
+        public virtual Season Season { get; private set; } = null!;
 
         [InverseProperty("Delivery")]
-        public virtual ISet<DeliveryPart> Parts { get; private set; }
+        public virtual ISet<DeliveryPart> Parts { get; private set; } = null!;
         [NotMapped]
         public IEnumerable<DeliveryPart> FilteredParts => PartFilter == null ? Parts : Parts.Where(p => PartFilter(p));
 

Elwig/Models/Entities/DeliveryPart.cs

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

Elwig/Models/Entities/DeliveryPartBucket.cs

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

Elwig/Models/Entities/DeliveryPartModifier.cs

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

Elwig/Models/Entities/Member.cs

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

Elwig/Models/Entities/MemberEmailAddr.cs

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

Elwig/Models/Entities/MemberHistory.cs

@@ -9,7 +9,7 @@ namespace Elwig.Models.Entities {
         public int MgNr { get; set; }
 
         [Column("date")]
-        public string DateString { get; set; }
+        public required string DateString { get; set; }
         [NotMapped]
         public DateOnly Date {
             get => DateOnly.ParseExact(DateString, "yyyy-MM-dd");
@@ -20,12 +20,12 @@ namespace Elwig.Models.Entities {
         public int BusinessShares { get; set; }
 
         [Column("type")]
-        public string Type { get; set; }
+        public required string Type { get; set; }
 
         [Column("comment")]
         public string? Comment { get; set; }
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/MemberTelNr.cs

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

Elwig/Models/Entities/Modifier.cs

@@ -11,13 +11,13 @@ namespace Elwig.Models.Entities {
         public int Year { get; set; }
 
         [Column("modid")]
-        public string ModId { get; set; }
+        public required string ModId { get; set; }
 
         [Column("ordering")]
         public int Ordering { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("abs")]
         public long? AbsValue { get; set; }
@@ -44,7 +44,7 @@ namespace Elwig.Models.Entities {
         public bool IsQuickSelect { get; set; }
 
         [ForeignKey("Year")]
-        public virtual Season Season { get; private set; }
+        public virtual Season Season { get; private set; } = null!;
 
         public string ValueStr =>
             (Abs != null) ? $"{Utils.GetSign(Abs.Value)}{Math.Abs(Abs.Value).ToString("0." + string.Concat(Enumerable.Repeat('0', Season.Precision)))}\u00a0{Season.Currency.Symbol}/kg" :

Elwig/Models/Entities/PaymentDeliveryPart.cs

@@ -46,9 +46,9 @@ namespace Elwig.Models.Entities {
         public decimal Amount => Variant.Season.DecFromDb(AmountValue);
 
         [ForeignKey("Year, AvNr")]
-        public virtual PaymentVar Variant { get; private set; }
+        public virtual PaymentVar Variant { get; private set; } = null!;
 
         [ForeignKey("Year, DId, DPNr")]
-        public virtual DeliveryPart DeliveryPart { get; private set; }
+        public virtual DeliveryPart DeliveryPart { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/PaymentDeliveryPartBucket.cs

@@ -36,9 +36,9 @@ namespace Elwig.Models.Entities {
         }
 
         [ForeignKey("Year, AvNr")]
-        public virtual PaymentVar Variant { get; private set; }
+        public virtual PaymentVar Variant { get; private set; } = null!;
 
         [ForeignKey("Year, DId, DPNr")]
-        public virtual DeliveryPart DeliveryPart { get; private set; }
+        public virtual DeliveryPart DeliveryPart { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/PaymentMember.cs

@@ -13,7 +13,6 @@ namespace Elwig.Models.Entities {
         [Column("mgnr")]
         public int MgNr { get; set; }
 
-
         [Column("net_amount")]
         public long NetAmountValue { get; set; }
         [NotMapped]
@@ -44,10 +43,10 @@ namespace Elwig.Models.Entities {
         public decimal Amount => Variant.Season.DecFromDb(AmountValue);
 
         [ForeignKey("Year, AvNr")]
-        public virtual PaymentVar Variant { get; private set; }
+        public virtual PaymentVar Variant { get; private set; } = null!;
 
         [ForeignKey("MgNr")]
-        public virtual Member Member { get; private set; }
+        public virtual Member Member { get; private set; } = null!;
 
         [InverseProperty("Payment")]
         public virtual Credit? Credit { get; private set; }

Elwig/Models/Entities/PaymentVar.cs

@@ -13,10 +13,10 @@ namespace Elwig.Models.Entities {
         public int AvNr { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("date")]
-        public string DateString { get; set; }
+        public required string DateString { get; set; }
 
         [NotMapped]
         public DateOnly Date {
@@ -43,18 +43,18 @@ namespace Elwig.Models.Entities {
         public string? Comment { get; set; }
 
         [Column("data")]
-        public string Data { get; set; }
+        public required string Data { get; set; }
 
         [ForeignKey("Year")]
-        public virtual Season Season { get; private set; }
+        public virtual Season Season { get; private set; } = null!;
 
         [InverseProperty("Variant")]
-        public virtual ISet<PaymentMember> MemberPayments { get; private set; }
+        public virtual ISet<PaymentMember> MemberPayments { get; private set; } = null!;
 
         [InverseProperty("Variant")]
-        public virtual ISet<PaymentDeliveryPart> DeliveryPartPayments { get; private set; }
+        public virtual ISet<PaymentDeliveryPart> DeliveryPartPayments { get; private set; } = null!;
 
         [InverseProperty("Variant")]
-        public virtual ISet<Credit> Credits { get; private set; }
+        public virtual ISet<Credit> Credits { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/PostalDest.cs

@@ -8,10 +8,10 @@ namespace Elwig.Models.Entities {
         public int CountryNum { get; private set; }
 
         [Column("id")]
-        public string Id { get; private set; }
+        public string Id { get; private set; } = null!;
 
         [ForeignKey("CountryNum")]
-        public virtual Country Country { get; private set; }
+        public virtual Country Country { get; private set; } = null!;
 
         [ForeignKey("Id")]
         public virtual AT_PlzDest? AtPlz { get; private set; }

Elwig/Models/Entities/Season.cs

@@ -11,7 +11,7 @@ namespace Elwig.Models.Entities {
         public int Year { get; set; }
 
         [Column("currency")]
-        public string CurrencyCode { get; set; }
+        public required string CurrencyCode { get; set; }
 
         [Column("precision")]
         public byte Precision { get; set; }
@@ -98,16 +98,16 @@ namespace Elwig.Models.Entities {
         }
 
         [ForeignKey("CurrencyCode")]
-        public virtual Currency Currency { get; private set; }
+        public virtual Currency Currency { get; private set; } = null!;
 
         [InverseProperty("Season")]
-        public virtual ISet<Modifier> Modifiers { get; private set; }
+        public virtual ISet<Modifier> Modifiers { get; private set; } = null!;
 
         [InverseProperty("Season")]
-        public virtual ISet<PaymentVar> PaymentVariants { get; private set; }
+        public virtual ISet<PaymentVar> PaymentVariants { get; private set; } = null!;
 
         [InverseProperty("Season")]
-        public virtual ISet<Delivery> Deliveries { get; private set; }
+        public virtual ISet<Delivery> Deliveries { get; private set; } = null!;
 
         public decimal DecFromDb(long value) {
             return Utils.DecFromDb(value, Precision);

Elwig/Models/Entities/WbGem.cs

@@ -8,12 +8,12 @@ namespace Elwig.Models.Entities {
         public int Gkz { get; private set; }
 
         [Column("hkid")]
-        public string HkId { get; private set; }
+        public string HkId { get; private set; } = null!;
 
         [ForeignKey("Gkz")]
-        public virtual AT_Gem AtGem { get; private set; }
+        public virtual AT_Gem AtGem { get; private set; } = null!;
 
         [ForeignKey("HkId")]
-        public virtual WineOrigin Origin { get; private set; }
+        public virtual WineOrigin Origin { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/WbGl.cs

@@ -9,9 +9,9 @@ namespace Elwig.Models.Entities {
         public int GlNr { get; private set; }
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [InverseProperty("Gl")]
-        public virtual ISet<WbKg> Kgs { get; private set; }
+        public virtual ISet<WbKg> Kgs { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/WbKg.cs

@@ -12,16 +12,19 @@ namespace Elwig.Models.Entities {
         public int? GlNr { get; set; }
 
         [ForeignKey("KgNr")]
-        public virtual AT_Kg AtKg { get; private set; }
+        public virtual AT_Kg AtKg { get; private set; } = null!;
 
         [ForeignKey("GlNr")]
-        public virtual WbGl Gl { get; private set; }
+        public virtual WbGl Gl { get; private set; } = null!;
 
         [InverseProperty("Kg")]
-        public virtual ISet<WbRd> Rds { get; private set; }
+        public virtual ISet<WbRd> Rds { get; private set; } = null!;
+
+        [InverseProperty("DefaultWbKg")]
+        public virtual ISet<Member> Members { get; private set; } = null!;
 
         [NotMapped]
-        public WbGem Gem => AtKg.Gem.WbGem;
+        public WbGem Gem => AtKg.Gem.WbGem!;
 
         [NotMapped]
         public WineOrigin Origin => Gem.Origin;

Elwig/Models/Entities/WbRd.cs

@@ -11,9 +11,9 @@ namespace Elwig.Models.Entities {
         public int RdNr { get; set; }
         
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [ForeignKey("KgNr")]
-        public virtual WbKg Kg { get; private set; }
+        public virtual WbKg Kg { get; private set; } = null!;
     }
 }

Elwig/Models/Entities/WineAttr.cs

@@ -6,10 +6,10 @@ namespace Elwig.Models.Entities {
     [Table("wine_attribute"), PrimaryKey("AttrId"), Index("Name", IsUnique = true)]
     public class WineAttr {
         [Column("attrid")]
-        public string AttrId { get; set; }
+        public required string AttrId { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("active")]
         public bool IsActive { get; set; }
@@ -23,13 +23,6 @@ namespace Elwig.Models.Entities {
         [Column("fill_lower")]
         public int FillLower { get; set; }
 
-        public WineAttr() { }
-
-        public WineAttr(string attrId, string name) {
-            AttrId = attrId;
-            Name = name;
-        }
-
         public override string ToString() {
             return Name;
         }

Elwig/Models/Entities/WineCult.cs

@@ -6,12 +6,16 @@ namespace Elwig.Models.Entities {
     [Table("wine_cultivation"), PrimaryKey("CultId"), Index("Name", IsUnique = true)]
     public class WineCult {
         [Column("cultid")]
-        public string CultId { get; set; }
+        public required string CultId { get; set; }
 
         [Column("name")]
-        public string Name { get; set; }
+        public required string Name { get; set; }
 
         [Column("description")]
         public string? Description { get; set; }
+
+        public override string ToString() {
+            return Name;
+        }
     }
 }

Elwig/Models/Entities/WineOrigin.cs

@@ -9,7 +9,7 @@ namespace Elwig.Models.Entities {
     [Table("wine_origin"), PrimaryKey("HkId"), Index("Name", IsUnique = true)]
     public class WineOrigin {
         [Column("hkid")]
-        public string HkId { get; private set; }
+        public string HkId { get; private set; } = null!;
 
         [Column("parent_hkid")]
         public string? ParentHkId { get; private set; }
@@ -18,16 +18,16 @@ namespace Elwig.Models.Entities {
         public virtual WineOrigin? Parent { get; private set; }
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [Column("blnr")]
         public int? BlNr { get; private set; }
 
         [InverseProperty("Origin")]
-        public virtual ISet<WbGem> Gems { get; private set; }
+        public virtual ISet<WbGem> Gems { get; private set; } = null!;
 
         [InverseProperty("Parent")]
-        public virtual ISet<WineOrigin> Children { get; private set; }
+        public virtual ISet<WineOrigin> Children { get; private set; } = null!;
 
         public int Level => (Parent?.Level + 1) ?? 0;
 

Elwig/Models/Entities/WineQualLevel.cs

@@ -7,7 +7,7 @@ namespace Elwig.Models.Entities {
     [Table("wine_quality_level"), PrimaryKey("QualId")]
     public class WineQualLevel : IEquatable<WineQualLevel> {
         [Column("qualid")]
-        public string QualId { get; private set; }
+        public string QualId { get; private set; } = null!;
 
         [Column("origin_level")]
         public int? OriginLevel { get; private set; }
@@ -22,7 +22,7 @@ namespace Elwig.Models.Entities {
         public double? MinOe => MinKmw != null ? Utils.KmwToOe((double)MinKmw) : null;
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         public string MinKmwStr => (MinKmw == null) ? "" : $"(mind. {MinKmw:#.0}°)";
 

Elwig/Models/Entities/WineVar.cs

@@ -5,13 +5,13 @@ namespace Elwig.Models.Entities {
     [Table("wine_variety"), PrimaryKey("SortId")]
     public class WineVar {
         [Column("sortid")]
-        public string SortId { get; private set; }
+        public string SortId { get; private set; } = null!;
 
         [Column("type")]
-        public string Type { get; private set; }
+        public string Type { get; private set; } = null!;
 
         [Column("name")]
-        public string Name { get; private set; }
+        public string Name { get; private set; } = null!;
 
         [Column("comment")]
         public string? Comment { get; private set; }

Elwig/Resources/Schemas/PaymentVariantData.json

@@ -43,7 +43,7 @@
         }
       },
       "patternProperties": {
-        "^([A-Z]{2})?(\/[A-Z]*)?$": {
+        "^([A-Z]{2})?(\/[A-Z]*)?(-[A-Z][A-Z0-9]*)?$": {
           "type": ["number", "string"],
           "pattern": "^curve:[0-9]+$"
         }
@@ -64,7 +64,7 @@
               }
             },
             "patternProperties": {
-              "^([A-Z]{2})?(\/[A-Z]*)?$": {
+              "^([A-Z]{2})?(\/[A-Z]*)?(-[A-Z][A-Z0-9]*)?$": {
                 "type": ["number", "string"],
                 "pattern": "^curve:[0-9]+$"
               }

Elwig/Resources/Sql/04-05.sql

@@ -1,6 +1,6 @@
 -- schema version 4 to 5
 
-CREATE TABLE _area_commitment_type (
+CREATE TABLE area_commitment_type_new (
     vtrgid         TEXT NOT NULL CHECK (vtrgid = sortid || COALESCE(attrid, '') || disc),
     sortid         TEXT NOT NULL,
     attrid         TEXT,
@@ -20,13 +20,15 @@ CREATE TABLE _area_commitment_type (
         ON DELETE RESTRICT
 ) STRICT;
 
-INSERT INTO _area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
+INSERT INTO area_commitment_type_new (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
 SELECT vtrgid, sortid, attrid_1, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount FROM area_commitment_type;
 
+PRAGMA foreign_keys = OFF;
 PRAGMA writable_schema = ON;
 DROP TABLE area_commitment_type;
-ALTER TABLE _area_commitment_type RENAME TO area_commitment_type;
+ALTER TABLE area_commitment_type_new RENAME TO area_commitment_type;
 PRAGMA writable_schema = OFF;
+PRAGMA foreign_keys = ON;
 
 ALTER TABLE delivery_part ADD COLUMN attrid TEXT DEFAULT NULL REFERENCES wine_attribute (attrid)
     ON UPDATE CASCADE

Elwig/Resources/Sql/10-11.sql

@@ -22,10 +22,12 @@ CREATE TABLE payment_delivery_part_new (
 INSERT INTO payment_delivery_part_new (year, did, dpnr, avnr, net_amount, mod_abs, mod_rel)
 SELECT year, did, dpnr, avnr, net_amount, mod_abs, mod_rel
 FROM payment_delivery_part;
+PRAGMA foreign_keys = OFF;
 PRAGMA writable_schema = ON;
 DROP TABLE payment_delivery_part;
 ALTER TABLE payment_delivery_part_new RENAME TO payment_delivery_part;
 PRAGMA writable_schema = OFF;
+PRAGMA foreign_keys = ON;
 
 DROP TRIGGER IF EXISTS t_payment_delivery_part_i;
 CREATE TRIGGER t_payment_delivery_part_i

Elwig/Resources/Sql/15-16.sql

@@ -0,0 +1,9 @@
+-- schema version 15 to 16
+
+INSERT INTO AT_plz_dest (plz, okz, dest)
+VALUES (2560,  3388, 'Grillenberg');
+
+DELETE FROM AT_plz_dest WHERE (plz, okz) = (2561, 3388);
+
+UPDATE AT_ort SET kgnr = 23351 WHERE okz = 5280;
+UPDATE AT_ort SET kgnr = 4311 WHERE okz = 3388;

Elwig/Resources/Sql/16-17.sql

@@ -0,0 +1,12 @@
+-- schema version 16 to 17
+
+CREATE VIEW v_virtual_season AS
+SELECT year, max_kg_per_ha
+FROM season
+UNION
+SELECT strftime('%Y', date()) + 0, (SELECT max_kg_per_ha FROM season ORDER BY year DESC LIMIT 1);
+
+PRAGMA writable_schema = ON;
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'season s', 'v_virtual_season s')
+WHERE type = 'view' AND name = 'v_area_commitment_bucket_strict';
+PRAGMA writable_schema = OFF;

Elwig/Resources/Sql/17-18.sql

@@ -0,0 +1,97 @@
+-- schema version 17 to 18
+
+ALTER TABLE delivery_part ADD COLUMN cultid TEXT DEFAULT NULL;
+
+PRAGMA writable_schema = ON;
+UPDATE sqlite_schema SET sql = REPLACE(sql, CHAR(10) ||
+    ') STRICT',
+    ',' || CHAR(10) ||
+    '    CONSTRAINT fk_delivery_part_wine_cultivation FOREIGN KEY (cultid) REFERENCES wine_cultivation (cultid)' || CHAR(10) ||
+    '        ON UPDATE CASCADE' || CHAR(10) ||
+    '        ON DELETE RESTRICT' || CHAR(10) ||
+    ') STRICT')
+WHERE type = 'table' AND name = 'delivery_part';
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'gerebelt  ', 'net_weight')
+WHERE type = 'table' AND name = 'delivery_part';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'CHECK (cultid REGEXP ''^[A-Z]+$'')', 'CHECK (cultid REGEXP ''^[A-Z][A-Z0-9]*$'')')
+WHERE type = 'table' AND name = 'wine_cultivation';
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, 'cultid    TEXT    NOT NULL', 'cultid    TEXT             DEFAULT NULL')
+WHERE type = 'table' AND name = 'area_commitment';
+
+DROP VIEW v_delivery;
+CREATE VIEW v_delivery AS
+SELECT p.year, p.did, p.dpnr,
+       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+       m.mgnr, m.family_name, m.given_name,
+       p.sortid, a.attrid, p.cultid,
+       p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid,
+       p.hkid, p.kgnr, p.rdnr,
+       p.net_weight, p.gebunden,
+       p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+       p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
+       GROUP_CONCAT(o.modid) AS modifiers,
+       d.comment, p.comment AS part_comment
+FROM delivery_part p
+    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+    JOIN member m ON m.mgnr = d.mgnr
+    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+GROUP BY p.year, p.did, p.dpnr
+ORDER BY p.year, p.did, p.dpnr, o.modid;
+
+CREATE VIEW v_wine_attribute AS
+SELECT a.attrid, name, active, max_kg_per_ha, strict, fill_lower,
+       COUNT(t.attrid) > 0 AS area_com
+FROM wine_attribute a
+    LEFT JOIN area_commitment_type t ON t.attrid = a.attrid
+GROUP BY a.attrid;
+
+DROP VIEW v_delivery_bucket_strict;
+CREATE VIEW v_delivery_bucket_strict AS
+SELECT year, mgnr,
+       sortid || IIF(min_quw OR NOT COALESCE(area_com, TRUE), COALESCE(a.attrid, ''), '_') AS bucket,
+       sortid, IIF(min_quw OR NOT COALESCE(area_com, TRUE), a.attrid, NULL) AS attrid,
+       SUM(weight) AS weight,
+       min_quw OR NOT COALESCE(area_com, TRUE) AS valid
+FROM v_delivery d
+    LEFT JOIN v_wine_attribute a ON a.attrid = d.attrid
+GROUP BY year, mgnr, bucket
+ORDER BY year, mgnr, bucket;
+
+DROP VIEW v_delivery_bucket;
+CREATE VIEW v_delivery_bucket AS
+SELECT year, mgnr, bucket, weight
+FROM v_delivery_bucket_strict
+WHERE attrid IS NOT NULL OR NOT valid
+UNION ALL
+SELECT b.year, b.mgnr, b.sortid,
+       SUM(b.weight) AS weight
+FROM v_delivery_bucket_strict b
+    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+WHERE valid AND (a.strict IS NULL OR a.strict = FALSE)
+GROUP BY b.year, b.mgnr, b.sortid
+ORDER BY year, mgnr, bucket;
+
+PRAGMA schema_version = 1701;
+PRAGMA writable_schema = OFF;
+
+----------------------------------------------------------------
+
+UPDATE area_commitment SET cultid = NULL WHERE cultid = 'N';
+DELETE FROM wine_cultivation WHERE cultid = 'N';
+UPDATE wine_cultivation SET cultid = 'B', name = 'Bio', description = 'AT-BIO-302' WHERE cultid = 'BIO';
+UPDATE wine_cultivation SET description = 'Kontrollierte Integrierte Produktion' WHERE cultid = 'KIP';
+
+UPDATE area_commitment SET cultid = 'B', vtrgid = SUBSTR(vtrgid, 1, 2) WHERE vtrgid LIKE '__B';
+UPDATE area_commitment SET cultid = 'B' WHERE vtrgid LIKE '__HU';
+DELETE FROM area_commitment_type WHERE attrid = 'B';
+UPDATE delivery_part SET cultid = 'B', attrid = NULL WHERE attrid = 'B';
+UPDATE delivery_part SET cultid = 'B' WHERE attrid = 'HU';
+DELETE FROM wine_attribute WHERE attrid = 'B';
+UPDATE wine_attribute SET name = 'Huber' WHERE attrid = 'HU';
+UPDATE wine_attribute SET max_kg_per_ha = NULL WHERE max_kg_per_ha = 10000;
+
+UPDATE payment_variant SET data = REPLACE(REPLACE(REPLACE(data, '/B', '-B'), '/"', '"'), '/-', '-');

Elwig/Windows/AreaComAdminWindow.xaml

@@ -184,7 +184,7 @@
 
                     <Label Content="Parzelle(n):" Margin="10,70,0,0" Grid.Column="0"/>
                     <TextBox x:Name="GstNrInput" Margin="0,70,10,0" Grid.Column="1" HorizontalAlignment="Stretch"
-                             TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
+                             TextChanged="TextBox_TextChanged"/>
 
                     <Label Content="Fläche:" Margin="10,100,0,0" Grid.Column="0"/>
                     <ctrl:UnitTextBox x:Name="AreaInput" Unit="m²" TextChanged="IntegerInput_TextChanged"