App: Fix wolkersdorf im weinviertel branch name issue

Elwig/App.xaml.cs

@@ -127,7 +127,7 @@ namespace Elwig {
                     ZwstId = entry.Item1;
                     BranchName = entry.Item2;
                     BranchPlz = entry.Item3;
-                    BranchLocation = entry.Item4;
+                    BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
                     BranchAddress = entry.Item5;
                     BranchPhoneNr = entry.Item6;
                     BranchFaxNr = entry.Item7;
@@ -138,7 +138,7 @@ namespace Elwig {
                 ZwstId = entry.Item1;
                 BranchName = entry.Item2;
                 BranchPlz = entry.Item3;
-                BranchLocation = entry.Item4;
+                BranchLocation = entry.Item4?.Split(" im ")[0];  // FIXME
                 BranchAddress = entry.Item5;
                 BranchPhoneNr = entry.Item6;
                 BranchFaxNr = entry.Item7;

Elwig/Dialogs/DeliveryConfirmationsDialog.xaml

@@ -0,0 +1,37 @@
+<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsDialog"
+                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                     xmlns:local="clr-namespace:Elwig.Windows"
+                     mc:Ignorable="d"
+                     ResizeMode="NoResize"
+                     Loaded="Window_Loaded"
+                     Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600">
+    <Grid>
+        <GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <StackPanel Margin="5,5,0,5">
+                <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
+                <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
+                <RadioButton GroupName="Order" x:Name="OrderPlzInput" Content="PLZ, Ort, Name"/>
+            </StackPanel>
+        </GroupBox>
+
+        <CheckBox x:Name="AllMembersInput" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,100,10,10">
+            <TextBlock>Auch Mitglieder ohne<LineBreak/>Lieferungen miteinbeziehen</TextBlock>
+        </CheckBox>
+
+        <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
+
+        <Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="180" Margin="10,10,10,74" Height="27" Tag="Print" IsEnabled="False"
+                Click="TestButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+        <Button x:Name="ShowButton" Content="Vorschau" FontSize="14" Width="180" Margin="10,10,10,42" Height="27" Tag="Print" IsEnabled="False"
+                Click="ShowButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+        <Button x:Name="PrintButton" Content="Drucken" FontSize="14" Width="180" Margin="10,10,10,10" Height="27" Tag="Print" IsEnabled="False"
+                Click="PrintButton_Click"
+                VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs

@@ -0,0 +1,113 @@
+using Elwig.Documents;
+using Elwig.Models;
+using Elwig.Windows;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Dialogs {
+    public partial class DeliveryConfirmationsDialog : ContextWindow {
+
+        public readonly int Year;
+
+        public DeliveryConfirmationsDialog(int year) {
+            InitializeComponent();
+            Year = year;
+            Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig";
+            TextElement.Text = App.Client.TextDeliveryConfirmation;
+            if (!App.Config.Debug) {
+                TestButton.Visibility = Visibility.Hidden;
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            TestButton.IsEnabled = App.IsPrintingReady;
+            ShowButton.IsEnabled = App.IsPrintingReady;
+            PrintButton.IsEnabled = App.IsPrintingReady;
+        }
+
+        protected override async Task OnRenewContext() { }
+
+        private async Task UpdateTextParameter() {
+            var text = TextElement.Text;
+            if (text.Length == 0) text = null;
+            if (text != App.Client.TextDeliveryConfirmation) {
+                App.Client.TextDeliveryConfirmation = text;
+                await App.Client.UpdateValues();
+            }
+        }
+
+        private async Task Generate(int mode) {
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            await UpdateTextParameter();
+
+            IQueryable<Member> members;
+            if (AllMembersInput.IsChecked == true) {
+                members = Context.Members.Where(m => m.IsActive);
+            } else {
+                members = Context.Members.FromSqlRaw($"""
+                    SELECT m.*
+                    FROM member m
+                        INNER JOIN delivery d ON d.mgnr = m.mgnr
+                    WHERE d.year = {Year}
+                    GROUP BY m.mgnr
+                    """);
+            }
+
+            if (OrderMgNrInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.MgNr);
+            } else if (OrderNameInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            } else if (OrderPlzInput.IsChecked == true) {
+                members = members
+                    .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                    .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                    .ThenBy(m => m.FamilyName)
+                    .ThenBy(m => m.GivenName)
+                    .ThenBy(m => m.MgNr);
+            }
+
+            IEnumerable<Member> list = await members.ToListAsync();
+            if (mode == 0) {
+                var r = new Random().Next(0, 10);
+                list = list.Where((_, n) => n % 10 == r);
+            }
+
+            using var doc = await Document.Merge(list.Select(m => new DeliveryConfirmation(Context, Year, m))); ;
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+
+            if (mode < 2) {
+                doc.Show();
+                return;
+            }
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+            Close();
+        }
+
+        private async void TestButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(0);
+        }
+
+        private async void ShowButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(1);
+        }
+
+        private async void PrintButton_Click(object sender, RoutedEventArgs evt) {
+            await Generate(2);
+        }
+    }
+}

Elwig/Documents/CreditNote.cshtml

@@ -4,7 +4,7 @@
 @{ Layout = "BusinessDocument"; }
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-creditnote.css"/>
 @{
-    var bucketNum = Model.BucketNames.Length;
+    var binNum = Model.BinNames.Length;
 }
 <main>
     <h1>@Model.Title</h1>
@@ -30,7 +30,7 @@
                 <th rowspan="3" style="text-align: left;">Attribut(e)</th>
                 <th rowspan="2" colspan="2">Gradation</th>
                 <th colspan="2">Zu-/Abschläge</th>
-                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
+                <th colspan="2">@Raw(string.Join("<br/>", Model.BinNames))</th>
                 <th rowspan="2">Betrag</th>
             </tr>
             <tr>
@@ -61,21 +61,23 @@
                 var pmt = part.Payment;
                 var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
                 var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
+                <tr class="first @(binNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
+                    <td rowspan="@binNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
+                    <td rowspan="@binNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
+                    <td rowspan="@binNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
+                    <td rowspan="@binNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
+                    <td rowspan="@binNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                    <td rowspan="@binNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
+                    <td rowspan="@binNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
+                    <td rowspan="@binNum" class="rel">@rel</td>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
+                    <!--FIXME price-->
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                    @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(0)?.Value, 0))
+                    <td rowspan="@binNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
                 </tr>
-                @for (int i = 1; i < bucketNum; i++) {
+                @for (int i = 1; i < binNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
+                    <tr class="@(i == binNum - 1 ? "last" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
+                        <!--FIXME price-->
+                        @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(i)?.Value, 0))
                     </tr>
                 }
                 last = part.SortId;

Elwig/Documents/CreditNote.cshtml.cs

@@ -10,7 +10,7 @@ namespace Elwig.Documents {
         public Credit Credit;
         public string? Text;
         public string CurrencySymbol;
-        public string[] BucketNames;
+        public string[] BinNames;
         public int Precision;
         public IEnumerable<DeliveryPart> Parts;
 
@@ -27,7 +27,7 @@ namespace Elwig.Documents {
             Text = App.Client.TextDeliveryNote;
             DocumentId = $"Tr.-Gutschr. {c.TgId}";
             CurrencySymbol = c.Payment.Variant.Season.Currency.Symbol ?? c.Payment.Variant.Season.Currency.Code;
-            BucketNames = c.Payment.Variant.BucketNames;
+            BinNames = new string[0]; // FIXME
             Precision = c.Payment.Variant.Season.Precision;
             Parts = ctx.DeliveryParts.FromSql($"""
                 SELECT p.*

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -0,0 +1,166 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
+@model Elwig.Documents.DeliveryConfirmation
+@{ Layout = "BusinessDocument"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliveryconfirmation.css"/>
+<main>
+    <h1>@Model.Title</h1>
+    <table class="delivery-confirmation">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 20mm;"/>
+            <col style="width: 21mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 15mm;"/>
+            <col style="width: 12mm;"/>
+            <col style="width: 14mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2">Pos.</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2" style="text-align: left;">Attribut(e)</th>
+                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
+                <th colspan="2">Gradation</th>
+                <th colspan="2">Flächenbindung</th>
+                <th>Gewicht</th>
+                <th>Davon<br/>abzuwerten</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th colspan="2">[kg]</th>
+                <th>[kg]</th>
+                <th>[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                var lastSortId = "";
+            }
+            @foreach (var p in Model.Deliveries) {
+                var bins = p.Bins.Where(b => b.Value > 0).OrderByDescending(b => b.BinNr).ToArray();
+                var rowsBins = bins.Length;
+                var mods = p.Modifiers.Select(m => m.Name).ToArray();
+                var rowsMod = mods.Length + 1;
+                var rows = Math.Max(rowsBins, rowsMod);
+                var first = true;
+                @for (int i = 0; i < rows; i++) {
+                    <tr class="@(first ? "first" : "") @(p.SortId != lastSortId && lastSortId != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
+                        @if (first) {
+                            <td rowspan="@rows">@p.Delivery.LsNr</td>
+                            <td rowspan="@rows">@p.DPNr</td>
+                            <td class="small">@p.Variant.Name</td>
+                            <td class="small">@p.AttributesString</td>
+                            <td class="small">@p.Quality.Name</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Oe:N0}")</td>
+                            <td rowspan="@rows" class="grad">@($"{p.Kmw:N1}")</td>
+                        }
+                        @if (i > 0 && i <= mods.Length) {
+                            <td colspan="3" class="mod">@(mods[i - 1])</td>
+                        } else if (i > 0) {
+                            <td colspan="3"></td>
+                        }
+                        @if (i < bins.Length) {
+                            var bin = bins[i];
+                            <td class="geb">@(bin.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{bin.Discr}"):</td>
+                            <td class="weight">@($"{bin.Value:N0}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                        @if (i == bins.Length - 1) {
+                            <td class="weight">@($"{p.Weight:N0}")</td>
+                        } else {
+                            <td></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="weight"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastSortId = p.SortId;
+                }
+            }
+            <tr class="sum">
+                <td colspan="8">Gesamt:</td>
+                <td colspan="2" class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table>
+    <table class="delivery-confirmation-stats">
+        <colgroup>
+            <col style="width: 45mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 19mm;"/>
+            <col style="width: 16mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 17mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th><b>Lese @Model.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th>Lieferpflicht</th>
+                <th>Lieferrecht</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
+                <th>Zugeteilt</th>
+                <th>Geliefert</th>
+            </tr>
+        </thead>
+        <tbody>
+            @{
+                string FormatRow(int mode, int obligation, int right, int sum, int? payment = null) {
+                    var isGa = mode == 0;
+                    payment ??= sum;
+                    return $"<td>{(mode == 1 ? "" : obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : right == 0 ? "-" : $"{right:N0}")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment < obligation ? $"<b>{obligation - payment:N0}\x3c/b>" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : payment >= obligation && sum <= right ? $"{right - sum:N0}" : "-")}</td>" +
+                        $"<td>{(mode == 1 ? "" : obligation == 0 && right == 0 ? "-" : (sum > right ? ((isGa ? "<b>" : "") + $"{sum - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
+                        $"<td>{(mode != 2 ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" +
+                        $"<td>{sum:N0}</td>";
+                }
+                var mBins = Model.MemberBins.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
+                var fbVars = mBins.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
+                var fbs = mBins.Where(b => fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
+                var rem = mBins.Where(b => !fbVars.Contains(b.Key)).OrderBy(b => b.Value.Item1);
+            }
+            <tr>
+                <th>Gesamtlieferung lt. gez. GA</th>
+                @Raw(FormatRow(0, Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Year).Sum(d => d.Weight)))
+            </tr>
+            @if (rem.Any()) {
+                <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in rem) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(1, obligation, right, sum, payment))
+                </tr>
+            }
+            @if (fbs.Any()){
+                <tr class="subheading"><th colspan="8">Flächenbindungen:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in fbs) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(2, obligation, right, sum, payment))
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div class="text" style="margin-top: 2em;">
+        @if (Model.Text != null) {
+            <p class="comment" style="white-space: pre-wrap; break-inside: avoid;">@Model.Text</p>
+        }
+    </div>
+</main>

Elwig/Documents/DeliveryConfirmation.cshtml.cs

@@ -0,0 +1,36 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class DeliveryConfirmation : BusinessDocument {
+
+        public int Year;
+        public IEnumerable<DeliveryPart> Deliveries;
+        public string? Text = App.Client.TextDeliveryConfirmation;
+        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m) :
+            base($"Anlieferungsbestätigung {year}", m) {
+            Year = year;
+            ShowDateAndLocation = true;
+            UseBillingAddress = true;
+            IncludeSender = true;
+            // FIXME footer in merged documents
+            //DocumentId = $"Anl.-Best. {Year}/{m.MgNr}";
+            Deliveries = ctx.DeliveryParts.FromSqlRaw($"""
+                SELECT p.*
+                FROM v_delivery v
+                    JOIN delivery_part p ON (p.year, p.did, p.dpnr) = (v.year, v.did, v.dpnr)
+                WHERE (v.year, v.mgnr) = ({Year}, {m.MgNr})
+                ORDER BY v.sortid, v.abgewertet ASC,
+                         COALESCE(LENGTH(v.attributes), 0) ASC, attribute_prio DESC, COALESCE(v.attributes, '~'),
+                         v.kmw DESC, v.lsnr, v.dpnr
+                """)
+                .ToList();
+            MemberBins = ctx.GetMemberBins(Year, m.MgNr).GetAwaiter().GetResult();
+        }
+    }
+}

Elwig/Documents/DeliveryJournal.cshtml.cs

@@ -18,8 +18,7 @@ namespace Elwig.Documents {
 
         public DeliveryJournal(string filter, IQueryable<DeliveryPart> deliveries) :
             this(filter, deliveries
-                .Include(p => p.Delivery)
+                .Include(p => p.Delivery).ThenInclude(d => d.Member)
-                .Include(p => p.Delivery.Member)
                 .Include(p => p.Variant)
                 .ToList()) { }
 

Elwig/Documents/DeliveryNote.cshtml

@@ -5,44 +5,6 @@
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
 <main>
 <h1>@Model.Title</h1>
-@{
-    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-}
-<script>
-    document.addEventListener("DOMContentLoaded", () => {
-        const hidden = document.getElementsByClassName("hidden")[0];
-        const table = document.getElementsByClassName("delivery")[0];
-        const stats = document.getElementById("delivery-stats");
-        const mm = px2mm(0, hidden.offsetTop + hidden.offsetHeight);
-        const heightTable = px2mm(table.offsetTop, hidden.offsetTop + hidden.offsetHeight);
-
-        if (mm >= heightA4 - heightFooter) {
-            if (heightTable + 10 >= heightMain) {
-                // force page break in table
-                const tblOff = px2mm(0, table.offsetTop);
-                let last = null;
-                for (const tr of table.getElementsByTagName("tr")) {
-                    if (!tr.classList.contains("main")) continue;
-                    const mm2 = tblOff + px2mm(0, tr.offsetTop);
-                    if (mm2 >= heightA4 - heightFooter) {
-                        last.classList.add("page-break");
-                        break;
-                    }
-                    last = tr;
-                }
-            } else {
-                // force page break
-                const hr = document.createElement("hr");
-                hr.classList.add("page-break");
-                table.before(hr);
-
-                const p = document.createElement("p");
-                p.innerText = "Siehe nächste Seite."
-                hr.before(p);
-            }
-        }
-    });
-</script>
 <table class="delivery">
     <colgroup>
         <col style="width: 10.00mm;"/>
@@ -113,9 +75,8 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
+@if (Model.DisplayStats > 0) {
-    <div id="delivery-stats">
+    <table class="delivery-note-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
-        <table class="delivery-stats">
         <colgroup>
             <col style="width: 45mm;"/>
             <col style="width: 20mm;"/>
@@ -131,7 +92,7 @@
                 <th>Lieferpflicht</th>
                 <th>Lieferrecht</th>
                 <th>Unterliefert</th>
-                    <th>Noch zu liefern</th>
+                <th>Noch lieferbar</th>
                 <th>Überliefert</th>
                 <th>Geliefert</th>
             </tr>
@@ -147,27 +108,31 @@
                         $"<td>{sum:N0}</td>";
                 }
                 var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                    var buckets = Model.MemberBuckets.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
+                var bins = Model.MemberBins.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
             }
             <tr>
-                    <th>Gesamtlieferung</th>
+                <th>Gesamtlieferung lt. gez. GA</th>
                 @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
             </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
+            @if (Model.DisplayStats > 1) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
+                <tr class="subheading">
+                    <th>Flächenbindungen:</th>
+                </tr>
+                @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBins.OrderBy(b => b.Key)) {
+                    if (right > 0 || obligation > 0 || (sum > 0 && bins[id[..2]] > 1 && !id.EndsWith('_'))) {
                         <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
                             <th>@name</th>
                             @Raw(FormatRow(obligation, right, sum))
                         </tr>
                     }
                 }
+            }
         </tbody>
     </table>
-    </div>
 }
 </main>
 @for (int i = 0; i < 2; i++) {
-    <div class="@(i == 0 ? "hidden" : "bottom")">
+    <div class="text @(i == 0 ? "hidden" : "bottom")">
         @if (Model.Text != null) {
             <p class="comment">@Model.Text</p>
         }

Elwig/Documents/DeliveryNote.cshtml.cs

@@ -7,7 +7,13 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public IEnumerable<(string, string, int, int, int)> MemberBuckets;
+        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+
+        // 0 - none
+        // 1 - GA only
+        // 2 - GA only and area commitments of varieties from delivery note
+        // 3 - full
+        public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
         public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
@@ -21,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBuckets = ctx.GetMemberBuckets(d.Member, d.Year).GetAwaiter().GetResult();
+            MemberBins = ctx.GetMemberBins(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/Document.cshtml

@@ -7,13 +7,6 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <script>
-        const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25;
-        const heightMain = heightA4 - heightFooter - heightHeader;
-        function px2mm(px1, px2) {
-            return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10;
-        }
-    </script>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
     <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
 </head>

Elwig/Documents/Document.cshtml.cs

@@ -29,7 +29,7 @@ namespace Elwig.Documents {
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
-            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div>";
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
             Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
                 .Item(c.NameFull).NextLine()
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
@@ -100,6 +100,8 @@ namespace Elwig.Documents {
                 name = "DeliveryJournal";
             } else if (this is Letterhead) {
                 name = "Letterhead";
+            } else if (this is DeliveryConfirmation) {
+                name = "DeliveryConfirmation";
             } else {
                 throw new InvalidOperationException("Invalid document object");
             }
@@ -132,7 +134,7 @@ namespace Elwig.Documents {
 
         public void Show() {
             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
-            Pdf.Show(_pdfFile.NewReference(), Title);
+            Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
         }
 
         private class InternalDocument : Document {

Elwig/Documents/Html.cs

@@ -21,6 +21,7 @@ namespace Elwig.Documents {
             await e.CompileTemplateAsync("CreditNote");
             await e.CompileTemplateAsync("DeliveryJournal");
             await e.CompileTemplateAsync("Letterhead");
+            await e.CompileTemplateAsync("DeliveryConfirmation");
 
             Engine = e;
             evtHandler();

Elwig/Documents/style-deliveryconfirmation.css

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

Elwig/Documents/style-deliverynote.css

@@ -39,11 +39,9 @@ table.delivery tr.tight.first td {
     padding-bottom: 0;
 }
 
-/* FIXME update version of WeasyPrint
 table.delivery tr.tight:has(+ tr:not(.tight)) td {
     padding-bottom: 0.5mm !important;
 }
-*/
 
 table.delivery tr.sum {
     border-top: 0.5pt solid black;
@@ -54,45 +52,45 @@ table.delivery tr.sum td {
     padding-top: 1mm;
 }
 
-table.delivery-stats {
+table.delivery-note-stats {
     font-size: 8pt;
     break-inside: avoid;
     break-after: avoid;
 }
 
-table.delivery-stats.expanded th,
+table.delivery-note-stats th,
-table.delivery-stats.expanded td {
+table.delivery-note-stats td {
-    padding: 0.25mm 0;
-}
-
-table.delivery-stats:not(.expanded) th,
-table.delivery-stats:not(.expanded) td {
     padding: 0.125mm 0;
 }
 
-table.delivery-stats:not(.expanded) tr.optional {
+table.delivery-note-stats:not(.expanded) tr.optional {
     display: none;
 }
 
-table.delivery-stats thead th {
+table.delivery-note-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-note-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-note-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
+table.delivery-note-stats thead th {
     font-weight: normal;
     font-style: italic;
     text-align: right;
 }
 
-table.delivery-stats thead th:first-child {
+table.delivery-note-stats thead th:first-child {
     text-align: left;
 }
 
-table.delivery-stats.expanded tbody {
+table.delivery-note-stats td {
-    font-size: 10pt;
-}
-
-table.delivery-stats td {
     text-align: right;
 }
 
-table.delivery-stats tbody th {
+table.delivery-note-stats tbody th {
     font-weight: normal;
     font-style: italic;
     text-align: left;

Elwig/Documents/style.css

@@ -40,15 +40,20 @@ header {
 
 header .name {
     font-size: 18pt;
-    margin-top: 10mm;
+    margin-top: 8mm;
     font-weight: bold;
 }
 
 header .suffix {
-    font-size: 12pt;
+    font-size: 14pt;
     font-weight: bold;
 }
 
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
+}
+
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;

Elwig/Elwig.csproj

@@ -7,7 +7,7 @@
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.3.7</Version>
+    <Version>0.4.1</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 

Elwig/Helpers/AppDbContext.cs

@@ -53,6 +53,10 @@ namespace Elwig.Helpers {
 
         public static string ConnectionString => $"Data Source=\"{App.Config.DatabaseFile}\"; Foreign Keys=True; Mode=ReadWrite; Cache=Default";
 
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, (int, int)>>> _memberRightsAndObligations = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBins = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBins = new();
+
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
                 try {
@@ -206,26 +210,101 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
+        private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
-            using var cnx = await ConnectAsync();
+            var ownCnx = cnx == null;
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
+            cnx ??= await ConnectAsync();
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
+            var bins = new Dictionary<int, Dictionary<string, (int, int)>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, min_kg, max_kg FROM v_area_commitment_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var vtrgid = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberRightsAndObligations[year] = bins;
+        }
 
-            var list = new List<(string, string, int, int, int)>();
+        private async Task FetchMemberDeliveryBins(int year, SqliteConnection? cnx = null) {
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
+            var ownCnx = cnx == null;
-                var s = await WineVarieties.FindAsync(id[..2]);
+            cnx ??= await ConnectAsync();
+            var bins = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_delivery_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bin = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][bin] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberDeliveryBins[year] = bins;
+        }
+
+        private async Task FetchMemberPaymentBins(int year, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var bins = new Dictionary<int, Dictionary<string, int>>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_payment_bin WHERE year = {year}";
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    var mgnr = reader.GetInt32(0);
+                    var bin = reader.GetString(1);
+                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
+                    bins[mgnr][bin] = reader.GetInt32(2);
+                }
+            }
+            if (ownCnx) await cnx.DisposeAsync();
+            _memberPaymentBins[year] = bins;
+        }
+
+        public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberRightsAndObligations.ContainsKey(year))
+                await FetchMemberRightsAndObligations(year, cnx);
+            return _memberRightsAndObligations[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberDeliveryBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBins.ContainsKey(year))
+                await FetchMemberDeliveryBins(year, cnx);
+            return _memberDeliveryBins[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, int>> GetMemberPaymentBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberPaymentBins.ContainsKey(year))
+                await FetchMemberPaymentBins(year, cnx);
+            return _memberPaymentBins[year].GetValueOrDefault(mgnr, new());
+        }
+
+        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBins(int year, int mgnr, SqliteConnection? cnx = null) {
+            var ownCnx = cnx == null;
+            cnx ??= await ConnectAsync();
+            var rightsAndObligations = await GetMemberRightsAndObligations(year, mgnr, cnx);
+            var deliveryBins = await GetMemberDeliveryBins(year, mgnr, cnx);
+            var paymentBins = await GetMemberPaymentBins(year, mgnr, cnx);
+            if (ownCnx) await cnx.DisposeAsync();
+
+            var bins = new Dictionary<string, (string, int, int, int, int)>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBins.Keys).Union(paymentBins.Keys)) {
+                var variety = await WineVarieties.FindAsync(id[..2]);
                 var attrIds = id[2..];
-                var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
+                var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
-                var name = (s?.Name ?? "") + (a.Count > 0 ? $" ({string.Join(" / ", a.Select(a => a.Name))})" : "");
+                var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
-                list.Add((
+                bins[id] = (
-                    id, name,
+                    name,
-                    rights.TryGetValue(id, out var v1) ? v1 : 0,
+                    rightsAndObligations.GetValueOrDefault(id).Item1,
-                    obligations.TryGetValue(id, out var v2) ? v2 : 0,
+                    rightsAndObligations.GetValueOrDefault(id).Item2,
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
+                    deliveryBins.GetValueOrDefault(id),
-                ));
+                    paymentBins.GetValueOrDefault(id)
+                );
             }
-
+            return bins;
-            return list;
         }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -4,11 +4,11 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 2;
+        public static readonly int RequiredSchemaVersion = 4;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4
         };
 
         private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
@@ -80,6 +80,138 @@ namespace Elwig.Helpers {
             ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL))");
         }
 
-        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) { }
+        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bin (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+                    binnr    INTEGER NOT NULL,
+
+                    discr    TEXT    NOT NULL,
+                    value    INTEGER NOT NULL,
+
+                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr, binnr),
+                    CONSTRAINT fk_delivery_part_bin_delivery_part FOREIGN KEY (year, did, dpnr) REFERENCES delivery_part (year, did, dpnr)
+                        ON UPDATE CASCADE
+                        ON DELETE CASCADE
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT year, did, dpnr, 0, '_', bucket_2 + bucket_3
+                FROM payment_delivery_part
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                SELECT d.year, d.did, d.dpnr, 1, COALESCE(attributes, ''), bucket_1
+                FROM payment_delivery_part p
+                    JOIN v_delivery d ON (d.year, d.did, d.dpnr) = (p.year, p.did, p.dpnr)
+                WHERE COALESCE(bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9) IS NOT NULL
+                ON CONFLICT DO NOTHING;
+                """);
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_1");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_2");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_3");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_4");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_5");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_6");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_7");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_8");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_delivery_part DROP COLUMN bucket_9");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_1_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_2_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_3_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_4_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_5_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_6_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_7_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_8_name");
+            ExecuteNonQuery(cnx, "ALTER TABLE payment_variant DROP COLUMN bucket_9_name");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN gebunden INTEGER CHECK (gebunden IN (TRUE, FALSE)) DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT s.*, GROUP_CONCAT(o.modid) AS modifiers
+                FROM (SELECT p.year, p.did, p.dpnr,
+                             d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                             m.mgnr, m.family_name, m.given_name,
+                             p.sortid, p.weight, p.kmw, ROUND(p.kmw * (4.54 + 0.022 * p.kmw), 0) AS oe, p.qualid, p.hkid, p.kgnr, p.rdnr,
+                             p.gerebelt, p.gebunden,
+                             p.qualid IN (SELECT l.qualid FROM wine_quality_level l WHERE NOT l.predicate AND (p.kmw >= l.min_kmw OR l.min_kmw IS NULL) ORDER BY l.min_kmw DESC LIMIT 1,100) AS abgewertet,
+                             p.qualid NOT IN ('WEI', 'RSW', 'LDW') AS min_quw,
+                             GROUP_CONCAT(a.attrid) AS attributes,
+                             COALESCE(SUM(a.fill_lower_bins), 0) AS attribute_prio,
+                             d.comment, p.comment AS part_comment
+                    FROM delivery_part p
+                        JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                        JOIN member m ON m.mgnr = d.mgnr
+                        LEFT JOIN delivery_part_attribute pa ON (pa.year, pa.did, pa.dpnr) = (p.year, p.did, p.dpnr)
+                        LEFT JOIN wine_attribute a ON a.attrid = pa.attrid
+                    GROUP BY p.year, p.did, p.dpnr
+                    ORDER BY p.year, p.did, p.dpnr, a.attrid) s
+                LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (s.year, s.did, s.dpnr)
+                GROUP BY s.year, s.lsnr, s.dpnr
+                ORDER BY s.year, s.lsnr, s.dpnr, o.modid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_bucket");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, REPLACE(COALESCE(attributes, ''), ',', ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, bin;
+                """);
+
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
+        }
+
+        private static void UpdateDbSchema_3_To_4(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bin AS
+                SELECT d.year, d.mgnr,
+                       sortid || discr AS bin,
+                       SUM(value) AS weight
+                FROM v_delivery d
+                    JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bin
+                HAVING SUM(value) > 0
+                ORDER BY d.year, d.mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bin AS
+                SELECT s.year, c.mgnr,
+                       c.vtrgid AS bin,
+                       CAST(ROUND(SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000.0, 0) AS INTEGER) AS max_kg
+                FROM area_commitment c, season s
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                WHERE (year_from IS NULL OR year_from <= s.year) AND
+                      (year_to IS NULL OR year_to >= s.year)
+                GROUP BY s.year, c.mgnr, c.vtrgid
+                ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;
+                """);
+        }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -1,4 +1,5 @@
 using Microsoft.Data.Sqlite;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -6,125 +7,199 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class Billing {
 
-        private readonly int Year;
+        protected readonly int Year;
-        private readonly int AvNr;
+        protected readonly AppDbContext Context;
-        private readonly AppDbContext Context;
+        protected readonly Dictionary<string, string> Attributes;
-        private readonly Dictionary<string, string> Attributes;
+        protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        private readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
+        protected readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
-        private readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
 
-        public Billing(int year, int avnr) {
+        public Billing(int year) {
             Year = year;
-            AvNr = avnr;
             Context = new AppDbContext();
             Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
             Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
             AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId1, v.AttrId2, v.Discriminator, v.MinKgPerHa, v.MaxKgPerHa, v.PenaltyAmount));
         }
 
-        protected async Task DeleteInDb() {
+        public async Task FinishSeason() {
             using var cnx = await AppDbContext.ConnectAsync();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+                cmd.CommandText = $"""
+                    UPDATE season
+                    SET (start_date, end_date) = (SELECT MIN(date), MAX(date) FROM delivery WHERE year = {Year})
+                    WHERE year = {Year}
+                    """;
                 await cmd.ExecuteNonQueryAsync();
             }
+
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                cmd.CommandText = $"DELETE FROM delivery_part_bin WHERE year = {Year}";
                 await cmd.ExecuteNonQueryAsync();
             }
         }
 
-        public async Task Calculate() {
+        public async Task CalculateBins(bool allowAttrsIntoLowerBins, bool avoidUnderDeliveries, bool honorGebunden) {
-            await DeleteInDb();
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.FillLowerBins);
-            var tasks = new List<Task>();
+            var attrForced = attrVals.Where(a => a.Value == 0).Select(a => a.Key).ToArray();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMember(mgnr)));
-            }
-            await Task.WhenAll(tasks);
-        }
-
-        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(int mgnr, int year, SqliteConnection cnx) {
-            var rights = new Dictionary<string, int>();
-            var obligations = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT t.vtrgid,
-                       SUM(COALESCE(area * min_kg_per_ha, 0)) / 10000 AS min_kg,
-                       SUM(COALESCE(area * max_kg_per_ha, 0)) / 10000 AS max_kg
-                FROM area_commitment c
-                JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
-                WHERE mgnr = {mgnr} AND (year_from IS NULL OR year_from <= {year}) AND (year_to IS NULL OR year_to >= {year})
-                GROUP BY t.vtrgid
-                ORDER BY LENGTH(t.vtrgid) DESC, t.vtrgid
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var vtrgid = reader.GetString(0);
-                obligations[vtrgid] = reader.GetInt32(1);
-                rights[vtrgid] = reader.GetInt32(2);
-            }
-
-            return (rights, obligations);
-        }
-
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
-            var buckets = new Dictionary<string, int>();
-
-            using var cmd = cnx.CreateCommand();
-            cmd.CommandText = $"""
-                SELECT bucket, weight
-                FROM v_bucket
-                WHERE (year, mgnr) = ({year}, {mgnr})
-                """;
-
-            var reader = await cmd.ExecuteReaderAsync();
-            while (await reader.ReadAsync()) {
-                var bucket = reader.GetString(0);
-                buckets[bucket] = reader.GetInt32(1);
-            }
-
-            return buckets;
-        }
-
-        protected async Task CalculateMember(int mgnr) {
             using var cnx = await AppDbContext.ConnectAsync();
-            var (rights, obligations) = await GetMemberRightsObligations(mgnr, Year, cnx);
+            await Context.GetMemberRightsAndObligations(Year, 0, cnx);
+            var inserts = new List<(int, int, int, string, int)>();
 
-            var deliveries = new List<(int, int, string, int, double, string, string[], string[])>();
+            var deliveries = new List<(int, int, int, string, int, double, string, string[], string[], bool?)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden
                     FROM v_delivery
-                    WHERE (year, mgnr) = ({Year}, {mgnr})
+                    WHERE year = {Year}
-                    ORDER BY kmw DESC, weight DESC, did, dpnr
+                    ORDER BY mgnr, sortid, abgewertet ASC, {(honorGebunden ? "gebunden IS NOT NULL DESC, gebunden DESC," : "")}
+                             COALESCE(LENGTH(attributes), 0) ASC, attribute_prio DESC, COALESCE(attributes, '~'),
+                             kmw DESC, lsnr, dpnr
                     """;
-                var reader = await cmd.ExecuteReaderAsync();
+                using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     deliveries.Add((
-                        reader.GetInt32(0), reader.GetInt32(1), reader.GetString(2), reader.GetInt32(3),
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4),
-                        reader.GetDouble(4), reader.GetString(5), reader.GetString(6).Split(","), reader.GetString(7).Split(",")
+                        reader.GetDouble(5), reader.GetString(6),
+                        reader.IsDBNull(7) ? Array.Empty<string>() : reader.GetString(7).Split(",").Order().ToArray(),
+                        reader.IsDBNull(8) ? Array.Empty<string>() : reader.GetString(8).Split(",").Order().ToArray(),
+                        reader.IsDBNull(9) ? null : reader.GetBoolean(9)
                     ));
                 }
             }
 
-            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
+            int lastMgNr = 0;
-                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
+            Dictionary<string, (int, int)>? rightsAndObligations = null;
+            Dictionary<string, int> used = new();
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
+                    used = new();
+                }
+                if ((honorGebunden && gebunden == false) ||
+                    rightsAndObligations == null || rightsAndObligations.Count == 0 ||
+                    qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
+                {
+                    // Explizit als ungebunden markiert,
+                    // Mitglied hat keine Flächenbindungen, oder
                     // Nicht mindestens Qualitätswein (QUW)
-                    using var cmd = cnx.CreateCommand();
+                    // -> ungebunden
-                    // TODO
+                    inserts.Add((did, dpnr, 0, "_", weight));
-                    cmd.CommandText = $"""
-                        INSERT INTO payment_delivery_part (year, did, dpnr, avnr, mod_abs, mod_rel, )
-                        VALUES ({Year}, {did}, {dpnr}, {AvNr}, )
-                        """;
-                    await cmd.ExecuteNonQueryAsync();
                     continue;
                 }
 
-                // TODO
+                if (attributes.Length > 2)
+                    throw new NotSupportedException();
+
+                int w = weight;
+                foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rightsAndObligations.ContainsKey(key)) {
+                        int i = 4;
+                        if (c == 1) {
+                            i = (p.ElementAt(0) == attributes[0]) ? 2 : 3;
+                        } else if (c == 0) {
+                            i = 1;
+                        }
+                        var u = used.GetValueOrDefault(key, 0);
+                        var vr = Math.Max(0, Math.Min(rightsAndObligations[key].Item1 - u, w));
+                        var vo = Math.Max(0, Math.Min(rightsAndObligations[key].Item2 - u, w));
+                        var v = (attributes.Length == 0 || attributes.Select(a => attrVals[a]).Min() == 2) ? vr : vo;
+                        used[key] = u + v;
+                        inserts.Add((did, dpnr, i, key[2..], v));
+                        w -= v;
+                    }
+                    if (w == 0 || !allowAttrsIntoLowerBins) break;
+                }
+                inserts.Add((did, dpnr, 0, "_", w));
+                lastMgNr = mgnr;
             }
 
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                    ON CONFLICT DO UPDATE
+                    SET discr = excluded.discr, value = value + excluded.value
+                    """;
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            if (!avoidUnderDeliveries)
+                return;
+
+            var underDeliveries = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bin, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bin c
+                        LEFT JOIN v_payment_bin p ON (p.year, p.mgnr, p.bin) = (c.year, c.mgnr, c.bin)
+                    WHERE c.year = {Year} AND LENGTH(c.bin) = 2 AND diff < 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    underDeliveries[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            var fittingBins = new Dictionary<(int, string), int>();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    SELECT c.mgnr, c.bin, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bin c
+                        LEFT JOIN v_payment_bin p ON (p.year, p.mgnr, p.bin) = (c.year, c.mgnr, c.bin)
+                    WHERE c.year = {Year} AND LENGTH(c.bin) = 3 AND diff > 0
+                    """;
+                using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync()) {
+                    fittingBins[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                }
+            }
+
+            foreach (var item in fittingBins) {
+                var mgnr = item.Key.Item1;
+                var id = item.Key.Item2[..2];
+                var attr = item.Key.Item2[2..];
+                var available = item.Value;
+                var needed = -underDeliveries.GetValueOrDefault((mgnr, id), 0);
+                if (needed <= 0) continue;
+
+                var fittingDeliveries = new List<(int, int, int, int)>();
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        SELECT d.did, d.dpnr, d.weight, b.value
+                        FROM v_delivery d
+                            JOIN delivery_part_bin b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}'
+                        WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attributes = '{attr}'
+                        ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC
+                        """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        fittingDeliveries.Add((
+                            reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetInt32(3)
+                        ));
+                    }
+                }
+
+                var changes = new List<(int, int, int, int)>();
+                foreach (var (did, dpnr, _, w) in fittingDeliveries) {
+                    int v = Math.Min(needed, w);
+                    needed -= v;
+                    changes.Add((did, dpnr, 1, v));
+                    changes.Add((did, dpnr, 2, w - v));
+                    if (needed == 0) break;
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                        VALUES {string.Join(",\n       ", changes.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+            }
         }
     }
 }

Elwig/Helpers/Billing/BillingVariant.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Elwig.Helpers.Billing {
+    public class BillingVariant : Billing {
+
+        private readonly int AvNr;
+
+        public BillingVariant(int year, int avnr) : base(year) {
+            AvNr = avnr;
+        }
+
+        protected async Task DeleteInDb() {
+            using var cnx = await AppDbContext.ConnectAsync();
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_delivery_part WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                await cmd.ExecuteNonQueryAsync();
+            }
+        }
+
+        public async Task CalculatePrices() {
+            await DeleteInDb();
+            var tasks = new List<Task>();
+            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
+                tasks.Add(Task.Run(() => CalculateMemberPrices(mgnr)));
+            }
+            await Task.WhenAll(tasks);
+        }
+
+        protected async Task CalculateMemberPrices(int mgnr) {
+
+        }
+    }
+}

Elwig/Helpers/ClientParameters.cs

@@ -20,6 +20,10 @@ namespace Elwig.Helpers {
         public string Name;
         public string? NameSuffix;
         public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;
 
@@ -51,7 +55,10 @@ namespace Elwig.Helpers {
         public decimal VatReduced;
         public decimal VatFlatRate;
 
+        public int ModeDeliveryNoteStats;
+
         public string? TextDeliveryNote;
+        public string? TextDeliveryConfirmation;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
 
@@ -85,14 +92,31 @@ namespace Elwig.Helpers {
                 VatReduced = decimal.Parse((parameters["VAT_REDUCED"] ?? "").Replace(".", ","));
                 VatFlatRate = decimal.Parse((parameters["VAT_FLATRATE"] ?? "").Replace(".", ","));
 
+                switch (parameters.GetValueOrDefault("MODE_DELIVERYNOTE_STATS", "SHORT")?.ToUpper()) {
+                    case "NONE": ModeDeliveryNoteStats = 0; break;
+                    case "GA_ONLY": ModeDeliveryNoteStats = 1; break;
+                    case "SHORT": ModeDeliveryNoteStats = 2; break;
+                    case "FULL": ModeDeliveryNoteStats = 3; break;
+                }
+
                 Sender2 = parameters.GetValueOrDefault("DOCUMENT_SENDER") ?? "";
                 TextDeliveryNote = parameters.GetValueOrDefault("TEXT_DELIVERYNOTE");
+                if (TextDeliveryNote == "") TextDeliveryNote = null;
+                TextDeliveryConfirmation = parameters.GetValueOrDefault("TEXT_DELIVERYCONFIRMATION");
+                if (TextDeliveryConfirmation == "") TextDeliveryConfirmation = null;
             } catch {
                 throw new KeyNotFoundException();
             }
         }
 
         private IEnumerable<(string, string?)> GetParamValues() {
+            string deliveryNoteStats = "SHORT";
+            switch (ModeDeliveryNoteStats) {
+                case 0: deliveryNoteStats = "NONE"; break;
+                case 1: deliveryNoteStats = "GA_ONLY"; break;
+                case 2: deliveryNoteStats = "SHORT"; break;
+                case 3: deliveryNoteStats = "FULL"; break;
+            }
             return new (string, string?)[] {
                 ("CLIENT_NAME_TOKEN", NameToken),
                 ("CLIENT_NAME_SHORT", NameShort),
@@ -115,8 +139,10 @@ namespace Elwig.Helpers {
                 ("VAT_NORMAL", VatNormal.ToString().Replace(",", ".")),
                 ("VAT_REDUCED", VatReduced.ToString().Replace(",", ".")),
                 ("VAT_FLATRATE", VatFlatRate.ToString().Replace(",", ".")),
+                ("MODE_DELIVERYNOTE_STATS", deliveryNoteStats),
                 ("DOCUMENT_SENDER", Sender2),
                 ("TEXT_DELIVERYNOTE", TextDeliveryNote),
+                ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
             };
         }
 

Elwig/Helpers/Utils.cs

@@ -326,5 +326,20 @@ namespace Elwig.Helpers {
                 return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
             }
         }
+
+        public static IEnumerable<IEnumerable<T>> Permutate<T>(IEnumerable<T> input, IEnumerable<T>? forced = null) {
+            HashSet<IEnumerable<T>> output = new();
+            for (int i = 0; i < Math.Pow(2, input.Count()); i++) {
+                List<T> t = new();
+                for (int j = 0; j < 30; j++) {
+                    var e = input.ElementAtOrDefault(j);
+                    if (e != null && ((forced?.Contains(e) ?? false) || (i & (1 << j)) != 0)) {
+                        t.Add(e);
+                    }
+                }
+                output.Add(t);
+            }
+            return output.OrderByDescending(l => l.Count());
+        }
     }
 }

Elwig/Models/DeliveryPart.cs

@@ -75,6 +75,9 @@ namespace Elwig.Models {
         [Column("lesewagen")]
         public bool? IsLesewagen { get; set; }
 
+        [Column("gebunden")]
+        public bool? IsGebunden { get; set; }
+
         [Column("temperature")]
         public double? Temperature { get; set; }
 
@@ -113,5 +116,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public string OriginString => Origin.OriginString + "\n" + (Kg?.Gl != null ? $" / {Kg.Gl.Name}" : "") + (Kg != null ? $" / {Kg.AtKg.Gem.Name} / KG {Kg.AtKg.Name}" : "") + (Rd != null ? $" / Ried {Rd.Name}" : "");
+
+        [InverseProperty("Part")]
+        public virtual ISet<DeliveryPartBin> Bins { get; private set; }
     }
 }

Elwig/Models/DeliveryPartBin.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr")]
+    public class DeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("binnr")]
+        public int BinNr { get; set; }
+
+        [Column("discr")]
+        public string Discr { get; set; }
+
+        [Column("value")]
+        public int Value { get; set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart Part { get; private set; }
+    }
+}

Elwig/Models/PaymentDeliveryPart.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace Elwig.Models {
     [Table("payment_delivery_part"), PrimaryKey("Year", "DId", "DPNr", "AvNr")]
@@ -34,109 +32,6 @@ namespace Elwig.Models {
             set => ModRelValue = (double)value;
         }
 
-        [Column("bucket_1")]
-        public int? Bucket1 { get; set; }
-
-        [Column("bucket_2")]
-        public int? Bucket2 { get; set; }
-
-        [Column("bucket_3")]
-        public int? Bucket3 { get; set; }
-
-        [Column("bucket_4")]
-        public int? Bucket4 { get; set; }
-
-        [Column("bucket_5")]
-        public int? Bucket5 { get; set; }
-
-        [Column("bucket_6")]
-        public int? Bucket6 { get; set; }
-
-        [Column("bucket_7")]
-        public int? Bucket7 { get; set; }
-
-        [Column("bucket_8")]
-        public int? Bucket8 { get; set; }
-
-        [Column("bucket_9")]
-        public int? Bucket9 { get; set; }
-
-        [NotMapped]
-        public int[] Buckets => (new int?[] { Bucket1, Bucket2, Bucket3, Bucket4, Bucket5, Bucket6, Bucket7, Bucket8, Bucket9 })
-            .Where(b => b != null).Select(b => b.Value).ToArray();
-
-        [Column("price_1")]
-        public long? Price1Value { get; set; }
-        [NotMapped]
-        public decimal? Price1 {
-            get => Price1Value != null ? Variant.Season.DecFromDb(Price1Value.Value) : null;
-            set => Price1Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-        }
-
-        [Column("price_2")]
-        public long? Price2Value { get; set; }
-        [NotMapped]
-        public decimal? Price2 {
-			get => Price2Value != null ? Variant.Season.DecFromDb(Price2Value.Value) : null;
-			set => Price2Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_3")]
-        public long? Price3Value { get; set; }
-        [NotMapped]
-        public decimal? Price3 {
-			get => Price3Value != null ? Variant.Season.DecFromDb(Price3Value.Value) : null;
-			set => Price3Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_4")]
-        public long? Price4Value { get; set; }
-        [NotMapped]
-        public decimal? Price4 {
-			get => Price4Value != null ? Variant.Season.DecFromDb(Price4Value.Value) : null;
-			set => Price4Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_5")]
-        public long? Price5Value { get; set; }
-        [NotMapped]
-        public decimal? Price5 {
-			get => Price5Value != null ? Variant.Season.DecFromDb(Price5Value.Value) : null;
-			set => Price5Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_6")]
-        public long? Price6Value { get; set; }
-        [NotMapped]
-        public decimal? Price6 {
-			get => Price6Value != null ? Variant.Season.DecFromDb(Price6Value.Value) : null;
-			set => Price6Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_7")]
-        public long? Price7Value { get; set; }
-        [NotMapped]
-        public decimal? Price7 {
-			get => Price7Value != null ? Variant.Season.DecFromDb(Price7Value.Value) : null;
-			set => Price7Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_8")]
-        public long? Price8Value { get; set; }
-        [NotMapped]
-        public decimal? Price8 {
-			get => Price8Value != null ? Variant.Season.DecFromDb(Price8Value.Value) : null;
-			set => Price8Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
-        [Column("price_9")]
-        public long? Price9Value { get; set; }
-        [NotMapped]
-        public decimal? Price9 {
-			get => Price9Value != null ? Variant.Season.DecFromDb(Price9Value.Value) : null;
-			set => Price9Value = value != null ? Variant.Season.DecToDb(value.Value) : null;
-		}
-
         [Column("amount")]
         public long? AmountValue { get; set; }
         [NotMapped]
@@ -145,10 +40,6 @@ namespace Elwig.Models {
             set => AmountValue = value != null ? Variant.Season.DecToDb(value.Value) : null;
         }
 
-        [NotMapped]
-        public decimal[] Prices => (new decimal?[] { Price1, Price2, Price3, Price4, Price5, Price6, Price7, Price8, Price9 })
-            .Where(p => p != null).Select(p => p.Value).ToArray();
-
         [ForeignKey("Year, AvNr")]
         public virtual PaymentVar Variant { get; private set; }
 

Elwig/Models/PaymentDeliveryPartBin.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("payment_delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr", "AvNr")]
+    public class PaymentDeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [Column("binnr")]
+        public int BinNr { get; set; }
+
+        [Column("avnr")]
+        public int AvNr { get; set; }
+
+        [Column("price")]
+        public long PriceValue { get; set; }
+        [NotMapped]
+        public decimal Price {
+            get => Variant.Season.DecFromDb(PriceValue);
+            set => PriceValue = Variant.Season.DecToDb(value);
+        }
+
+        [Column("amount")]
+        public long AmountValue { get; set; }
+        [NotMapped]
+        public decimal Amount {
+            get => Variant.Season.DecFromDb(AmountValue);
+            set => AmountValue = Variant.Season.DecToDb(value);
+        }
+
+        [ForeignKey("Year, AvNr")]
+        public virtual PaymentVar Variant { get; private set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart DeliveryPart { get; private set; }
+    }
+}

Elwig/Models/PaymentVar.cs

@@ -40,37 +40,6 @@ namespace Elwig.Models {
         [Column("calc_time")]
         public int? CalcTime { get; set; }
 
-        [Column("bucket_1_name")]
-        public string? Bucket1Name { get; set; }
-
-        [Column("bucket_2_name")]
-        public string? Bucket2Name { get; set; }
-
-        [Column("bucket_3_name")]
-        public string? Bucket3Name { get; set; }
-
-        [Column("bucket_4_name")]
-        public string? Bucket4Name { get; set; }
-
-        [Column("bucket_5_name")]
-        public string? Bucket5Name { get; set; }
-
-        [Column("bucket_6_name")]
-        public string? Bucket6Name { get; set; }
-
-        [Column("bucket_7_name")]
-        public string? Bucket7Name { get; set; }
-
-        [Column("bucket_8_name")]
-        public string? Bucket8Name { get; set; }
-
-        [Column("bucket_9_name")]
-        public string? Bucket9Name { get; set; }
-
-        [NotMapped]
-        public string[] BucketNames => (new string?[] { Bucket1Name, Bucket2Name, Bucket3Name, Bucket4Name, Bucket5Name, Bucket6Name, Bucket7Name, Bucket8Name, Bucket9Name })
-			.Where(n => n != null).Select(n => n ?? "").ToArray();
-
         [Column("comment")]
         public string? Comment { get; set; }
 

Elwig/Models/WineAttr.cs

@@ -13,6 +13,9 @@ namespace Elwig.Models {
         [Column("max_kg_per_ha")]
         public int? MaxKgPerHa { get; set; }
 
+        [Column("fill_lower_bins")]
+        public int FillLowerBins { get; set; }
+
         [Column("active")]
         public bool IsActive { get; set; }
         public override string ToString() {

Elwig/Windows/AreaComAdminWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Elwig.Windows"
         mc:Ignorable="d"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        Title="Flächenbindungen - Elwig" Height="480" Width="850"
+        Title="Flächenbindungen - Elwig" Height="480" Width="1100"
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Label">
@@ -52,7 +52,7 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="330"/>
+            <ColumnDefinition Width="340"/>
         </Grid.ColumnDefinitions>
 
         <Menu Grid.ColumnSpan="2" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
@@ -74,13 +74,15 @@
                     <DataGridTextColumn Header="Katastralgemeinde"  Binding="{Binding Kg.AtKg.Name}"  Width="6*"/>
                     <DataGridTextColumn Header="Ried"               Binding="{Binding Rd.Name}"       Width="4*"/>
                     <DataGridTextColumn Header="Parzelle"           Binding="{Binding GstNr}"         Width="4*"/>
-                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="4*">
+                    <DataGridTextColumn Header="Fläche"             Binding="{Binding Area, StringFormat='{}{0:N0} m²'}" Width="3*">
                         <DataGridTextColumn.CellStyle>
                             <Style>
                                 <Setter Property="TextBlock.TextAlignment" Value="Right"/>
                             </Style>
                         </DataGridTextColumn.CellStyle>
                     </DataGridTextColumn>
+                    <DataGridTextColumn Header="Sorte"           Binding="{Binding AreaComType.WineVar.Name}" Width="4*"/>
+                    <DataGridTextColumn Header="Attribut"           Binding="{Binding AreaComType.WineAttr1.Name}" Width="3*"/>
                 </DataGrid.Columns>
             </DataGrid>
 

Elwig/Windows/BaseDataWindow.xaml

@@ -215,7 +215,45 @@
 
             </TabItem>
             <TabItem Header="Textelemente">
+                <ScrollViewer VerticalScrollBarVisibility="Visible">
+                    <StackPanel>
+                        <GroupBox Header="Lieferschein" Margin="10,10,10,10" Height="180">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="370"/>
+                                </Grid.ColumnDefinitions>
 
+                                <TextBox x:Name="TextElementDeliveryNote" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                                <GroupBox Grid.Column="1" Header="Tabelle zur Gesamtlieferung" Margin="10,10,10,10" VerticalAlignment="Center">
+                                    <StackPanel Margin="5,5,0,5">
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteNone" Content="Verbergen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteGaOnly" Content="Nur Gesamtlieferung lt. Geschäftsanteilen anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteShort" Content="Nur Gesamtlieferung und Flächenbindungen von auf dem&#xA;Lieferschein angeführten Sorten anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                        <RadioButton GroupName="ModeDeliveryNote" x:Name="ModeDeliveryNoteFull" Content="Vollständig anzeigen"
+                                                     Checked="RadioButton_Changed" Unchecked="RadioButton_Changed"/>
+                                    </StackPanel>
+                                </GroupBox>
+                            </Grid>
+                        </GroupBox>
+                        <GroupBox Header="Anlieferungsbestätigung" Margin="10,10,10,10" Height="250">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+
+                                <TextBox x:Name="TextElementDeliveryConfirmation" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
+                                         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Height="Auto"
+                                         TextChanged="TextBox_TextChanged"/>
+                            </Grid>
+                        </GroupBox>
+                    </StackPanel>
+                </ScrollViewer>
             </TabItem>
         </TabControl>
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -201,6 +201,15 @@ namespace Elwig.Windows {
             ClientEmailAddressInput.Text = p.EmailAddress;
             ClientWebsiteInput.Text = p.Website;
 
+            TextElementDeliveryNote.Text = p.TextDeliveryNote;
+            switch (p.ModeDeliveryNoteStats) {
+                case 0: ModeDeliveryNoteNone.IsChecked = true; break;
+                case 1: ModeDeliveryNoteGaOnly.IsChecked = true; break;
+                case 2: ModeDeliveryNoteShort.IsChecked = true; break;
+                case 3: ModeDeliveryNoteFull.IsChecked = true; break;
+            }
+            TextElementDeliveryConfirmation.Text = p.TextDeliveryConfirmation;
+
             FinishInputFilling();
         }
 
@@ -222,6 +231,10 @@ namespace Elwig.Windows {
             p.EmailAddress = ClientEmailAddressInput.Text.Length > 0 ? ClientEmailAddressInput.Text : null;
             p.Website = ClientWebsiteInput.Text.Length > 0 ? ClientWebsiteInput.Text : null;
 
+            p.TextDeliveryNote = TextElementDeliveryNote.Text.Length > 0 ? TextElementDeliveryNote.Text : null;
+            p.ModeDeliveryNoteStats = (ModeDeliveryNoteNone.IsChecked == true) ? 0 : (ModeDeliveryNoteGaOnly.IsChecked == true) ? 1 : (ModeDeliveryNoteShort.IsChecked == true) ? 2 : (ModeDeliveryNoteFull.IsChecked == true) ? 3 : 2;
+            p.TextDeliveryConfirmation = TextElementDeliveryConfirmation.Text.Length > 0 ? TextElementDeliveryConfirmation.Text : null;
+
             await p.UpdateValues();
         }
 

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -438,6 +438,10 @@
                     <Label Content="Ried:" Margin="10,70,0,10" Grid.Column="0"/>
                     <ComboBox x:Name="WineRdInput" Margin="0,70,10,10" Grid.Column="1"
                               DisplayMemberPath="Name"/>
+
+                    <CheckBox x:Name="GebundenInput" Content="Gebunden" Margin="10,105,0,0" Grid.Column="0" Grid.ColumnSpan="2" IsThreeState="True"
+                              VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
                 </Grid>
             </GroupBox>
         </Grid>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -227,6 +227,15 @@ namespace Elwig.Windows {
                 GerebeltGewogenInput.IsEnabled = true;
                 UnsetDefaultValue(GerebeltGewogenInput);
             }
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+                GebundenInput.IsChecked = null;
+                GebundenInput.IsEnabled = false;
+                SetDefaultValue(GebundenInput);
+            } else {
+                GebundenInput.IsChecked = null;
+                GebundenInput.IsEnabled = true;
+                UnsetDefaultValue(GebundenInput);
+            }
 
             WineQualityLevelInput.IsEnabled = false;
 
@@ -309,7 +318,7 @@ namespace Elwig.Windows {
             var filter = TextFilter.ToList();
             if (filter.Count > 0) {
                 var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
-                var qual = await Context.WineQualityLevels.ToDictionaryAsync(q => q.QualId, q => q);
+                var qual = await Context.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
                 var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
                 var zwst = await Context.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
                 var attr = await Context.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(" ")[0], a => a);
@@ -581,6 +590,7 @@ namespace Elwig.Windows {
             }
 
             StatusVarieties.ToolTip = StatusVarieties.Text;
+            // TODO display Weight/Gradation with newlines in ToolTip and grouped by sortid AND attributes
             StatusWeight.ToolTip = StatusWeight.Text;
             StatusGradation.ToolTip = StatusGradation.Text;
         }
@@ -701,6 +711,7 @@ namespace Elwig.Windows {
             AcidInput.Text = (p != null && p.Acid != null) ? $"{p.Acid:N1}" : "";
             LesewagenInput.IsChecked = p?.IsLesewagen ?? false;
             HandPickedInput.IsChecked = p?.IsHandPicked;
+            GebundenInput.IsChecked = p?.IsGebunden;
 
             ScaleId = p?.ScaleId;
             WeighingId = p?.WeighingId;
@@ -758,6 +769,7 @@ namespace Elwig.Windows {
             p.IsGerebelt = GerebeltGewogenInput.IsChecked ?? false;
             p.IsHandPicked = HandPickedInput.IsChecked;
             p.IsLesewagen = LesewagenInput.IsChecked;
+            p.IsGebunden = GebundenInput.IsChecked;
             p.Temperature = (TemperatureInput.Text == "") ? null : double.Parse(TemperatureInput.Text);
             p.Acid = (AcidInput.Text == "") ? null : double.Parse(AcidInput.Text);
             p.Comment = (PartCommentInput.Text == "") ? null : PartCommentInput.Text;

Elwig/Windows/MainWindow.xaml

@@ -8,6 +8,8 @@
         Loaded="Window_Loaded">
     <Window.Resources>
         <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
             <Setter Property="FontSize" Value="14"/>
             <Setter Property="Padding" Value="9,3"/>
             <Setter Property="Height" Value="32"/>
@@ -30,28 +32,32 @@
             </Grid.ColumnDefinitions>
             <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
                    HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
-            <Label Grid.Column="1" Content="Elwig" FontSize="32"
+            <TextBlock Grid.Column="1" FontSize="32" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
-                   HorizontalAlignment="Left" Margin="0,10,0,0" VerticalAlignment="Top"/>
+                Elwig
-            <Label Grid.Column="1" Content="Elektonische Winzer-"
+            </TextBlock>
-                   HorizontalAlignment="Left" Margin="0,55,0,0" VerticalAlignment="Top"/>
+            <TextBlock Grid.Column="1" HorizontalAlignment="Left" Margin="0,50,0,0" VerticalAlignment="Top" LineHeight="14" LineStackingStrategy="BlockLineHeight">
-            <Label Grid.Column="1" Content="genossenschaftsverwaltung"
+                Elektonische Winzer-<LineBreak/>
-                   HorizontalAlignment="Left" Margin="0,70,0,0" VerticalAlignment="Top"/>
+                genossenschaftsverwaltung
+            </TextBlock>
+            <TextBlock x:Name="VersionField" Grid.Column="1" FontSize="10" HorizontalAlignment="Left" Margin="0,80,0,0" VerticalAlignment="Top">
+                Version: ?
+            </TextBlock>
         </Grid>
 
         <Button x:Name="MemberAdminButton" Content="Mitglieder" Click="MemberAdminButton_Click"
-                Margin="50,160,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,160,0,0"/>
         <Button x:Name="ReceiptButton" Content="Übernahme" Click="ReceiptButton_Click"
-                Margin="50,200,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,200,0,0"/>
         <Button x:Name="DeliveryAdminButton" Content="Lieferungen" Click="DeliveryAdminButton_Click"
-                Margin="50,240,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,240,0,0"/>
-        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
+        <Button x:Name="SeasonFinishButton" Content="Leseabschluss" Click="SeasonFinishButton_Click"
-                Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,280,0,0"/>
         <Button x:Name="BaseDataButton" Content="Stammdaten" Click="BaseDataButton_Click"
-                Margin="50,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,320,0,0"/>
 
         <Button x:Name="TestWindowButton" Content="Test Fenster" Click="TestWindowButton_Click"
-                Margin="260,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,280,0,0"/>
         <Button x:Name="QueryWindowButton" Content="Datenbankabfragen" Click="QueryWindowButton_Click"
-                Margin="260,320,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="260,320,0,0"/>
     </Grid>
 </Window>

Elwig/Windows/MainWindow.xaml.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using System.Windows;
 
 namespace Elwig.Windows {
@@ -5,6 +6,8 @@ namespace Elwig.Windows {
 
         public MainWindow() {
             InitializeComponent();
+            var v = Assembly.GetExecutingAssembly().GetName().Version;
+            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}");
             if (!App.Config.Debug) {
                 TestWindowButton.Visibility = Visibility.Hidden;
                 //QueryWindowButton.Visibility = Visibility.Hidden;
@@ -52,8 +55,8 @@ namespace Elwig.Windows {
             w.Show();
         }
 
-        private void PaymentWindowButton_Click(object sender, RoutedEventArgs e) {
+        private void SeasonFinishButton_Click(object sender, RoutedEventArgs e) {
-            var w = new ChartWindow();
+            var w = new SeasonFinishWindow();
             w.Show();
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -51,12 +51,16 @@
                           Click="Menu_Member_SendEmail_Click"/>
             </MenuItem>
             <MenuItem Header="Drucken">
+                <MenuItem x:Name="Menu_Print_Letterhead" Header="Briefkopf drucken"
+                          Click="Menu_Print_Letterhead_Click"/>
                 <MenuItem Header="Stammdatenblatt drucken"/>
                 <MenuItem Header="Briefköpfe drucken">
                     <MenuItem x:Name="Menu_Print_Letterheads_MgNr" Header="nach MgNr. sortiert" IsEnabled="False" Tag="Print"
                               Click="Menu_Print_Letterheads_MgNr_Click"/>
                     <MenuItem x:Name="Menu_Print_Letterheads_Name" Header="nach Name sortiert" IsEnabled="False" Tag="Print"
                               Click="Menu_Print_Letterheads_Name_Click"/>
+                    <MenuItem x:Name="Menu_Print_Letterheads_Plz" Header="nach PLZ, Ort, Name sortiert" IsEnabled="False" Tag="Print"
+                              Click="Menu_Print_Letterheads_Plz_Click"/>
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Rundschreiben">

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -141,7 +141,7 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(DefaultKgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
             await RefreshMemberList();
             StatusMembers.Text = $"Mitglieder: {await Context.Members.CountAsync(m => m.IsActive):N0} ({await Context.Members.CountAsync():N0})";
-            StatusBusinessShares.Text = $"Geschäftsanteile: {await Context.Members.SumAsync(m => m.BusinessShares):N0}";
+            StatusBusinessShares.Text = $"Geschäftsanteile: {await Context.Members.Where(m => m.IsActive).SumAsync(m => m.BusinessShares):N0} ({await Context.Members.SumAsync(m => m.BusinessShares):N0})";
         }
 
         private void SetPhoneNrInput(int nr, string? type, string? number, string? comment) {
@@ -272,50 +272,71 @@ namespace Elwig.Windows {
         }
 
         private void Menu_Member_SendEmail_Click(object sender, RoutedEventArgs evt) {
-            Utils.MailTo(((Member)MemberList.SelectedItem).EmailAddresses.Select(a => a.Address));
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Utils.MailTo(m.EmailAddresses.Select(a => a.Address));
+        }
+
+        private async void Menu_Print_Letterhead_Click(object sender, RoutedEventArgs evt) {
+            if (MemberList.SelectedItem is not Member m)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            using var doc = new Letterhead(m);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private async Task PrintLetterheads(int ordering) {
+            var n = await Context.Members.CountAsync(m => m.IsActive);
+            var res = MessageBox.Show(
+                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
+                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
+            if (res != MessageBoxResult.Yes)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var members = Context.Members.Where(m => m.IsActive && m.ContactViaPost);
+            switch (ordering) {
+                case 0: members = members
+                        .OrderBy(m => m.MgNr);
+                    break;
+                case 1: members = members
+                        .OrderBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+                case 2: members = members
+                        .OrderBy(m => m.PostalDest.AtPlz.Plz)
+                        .ThenBy(m => m.PostalDest.AtPlz.Ort.Name)
+                        .ThenBy(m => m.FamilyName)
+                        .ThenBy(m => m.GivenName)
+                        .ThenBy(m => m.MgNr);
+                    break;
+            }
+            using var doc = await Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
         }
 
         private async void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
-            var n = await Context.Members.CountAsync(m => m.IsActive);
+            await PrintLetterheads(0);
-            var res = MessageBox.Show(
-                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
-                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-            if (res != MessageBoxResult.Yes)
-                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            using var doc = await Document.Merge(Context.Members
-                .Where(m => m.IsActive && m.ContactViaPost)
-                .OrderBy(m => m.MgNr)
-                .Select(m => new Letterhead(m)));
-            await doc.Generate();
-            Mouse.OverrideCursor = null;
-            if (App.Config.Debug) {
-                doc.Show();
-            } else {
-                await doc.Print();
-            }
         }
 
         private async void Menu_Print_Letterheads_Name_Click(object sender, RoutedEventArgs evt) {
-            var n = await Context.Members.CountAsync(m => m.IsActive);
+            await PrintLetterheads(1);
-            var res = MessageBox.Show(
-                $"Sollen wirklich {n} Seiten gedruckt werden?", "Ausdruck Bestätigen",
-                MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
-            if (res != MessageBoxResult.Yes)
-                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            using var doc = await Document.Merge(Context.Members
-                .Where(m => m.IsActive && m.ContactViaPost)
-                .OrderBy(m => m.FamilyName)
-                .ThenBy(m => m.GivenName)
-                .Select(m => new Letterhead(m)));
-            await doc.Generate();
-            Mouse.OverrideCursor = null;
-            if (App.Config.Debug) {
-                doc.Show();
-            } else {
-                await doc.Print();
         }
+
+        private async void Menu_Print_Letterheads_Plz_Click(object sender, RoutedEventArgs evt) {
+            await PrintLetterheads(2);
         }
 
         private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -601,12 +622,14 @@ namespace Elwig.Windows {
             StatusAreaCommitment.Text = $"Gebundene Fläche: {m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";
 
             Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;
+            Menu_Print_Letterhead.IsEnabled = true;
 
             FinishInputFilling();
         }
 
         new protected void ClearInputs(bool validate = false) {
             Menu_Member_SendEmail.IsEnabled = false;
+            Menu_Print_Letterhead.IsEnabled = false;
             StatusDeliveriesLastSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason - 1}): -";
             StatusDeliveriesThisSeason.Text = $"Lieferungen ({Utils.CurrentLastSeason}): -";
             StatusAreaCommitment.Text = "Gebundene Fläche: -";

Elwig/Windows/SeasonFinishWindow.xaml

@@ -0,0 +1,50 @@
+<local:ContextWindow x:Class="Elwig.Windows.SeasonFinishWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Loaded="Window_Loaded"
+        Title="Leseabschluss - Elwig" Height="450" Width="800">
+    <Window.Resources>
+        <Style TargetType="Button">
+            <Setter Property="VerticalAlignment" Value="Top"/>
+            <Setter Property="HorizontalAlignment" Value="Left"/>
+            <Setter Property="FontSize" Value="14"/>
+            <Setter Property="Padding" Value="9,3"/>
+            <Setter Property="Height" Value="32"/>
+            <Setter Property="Width" Value="200"/>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Label Content="Saison:" Margin="50,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Padding="2,4,2,4" Height="25"/>
+        <xctk:IntegerUpDown Name="SeasonInput" Height="25" Width="56" FontSize="14" Minimum="1000" Maximum="9999"
+                            Margin="110,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
+                            ValueChanged="SeasonInput_ValueChanged"/>
+
+        <Button x:Name="CalculateBinsButton" Content="Aufteilung Berechnen"
+                Click="CalculateBinsButton_Click"
+                Margin="50,80,0,0"/>
+        <CheckBox x:Name="AllowAttrIntoLowerBinsInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen" IsChecked="True"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,68,0,0"/>
+        <CheckBox x:Name="AvoidUnderDeliveriesInput" Content="Unterlieferungen durch Abzug bei &quot;besseren&quot; Flächenbindungen vermeiden" IsChecked="True"
+                  VerticalAlignment="Top" HorizontalAlignment="Left" Margin="255,88,0,0"/>
+        <CheckBox x:Name="HonorGebundenInput" Margin="255,108,0,0" VerticalAlignment="Top">
+            <TextBlock>Bei Lieferungen das Feld <Italic>Gebunden</Italic> berücksichtigen</TextBlock>
+        </CheckBox>
+
+        <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
+                Click="DeliveryConfirmationButton_Click"
+                Margin="50,122,0,0"/>
+
+        <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
+                Click="OverUnderDeliveryButton_Click"
+                Margin="50,164,0,0"/>
+
+        <Button x:Name="PaymentButton" Content="Auszahlung"
+                Click="PaymentButton_Click"
+                Margin="50,206,0,0"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -0,0 +1,155 @@
+using Elwig.Dialogs;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Microsoft.Win32;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
+
+namespace Elwig.Windows {
+    public partial class SeasonFinishWindow : ContextWindow {
+        public SeasonFinishWindow() {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            SeasonInput.Value = Utils.CurrentLastSeason;
+        }
+
+        protected override async Task OnRenewContext() {
+            SeasonInput_ValueChanged(null, null);
+        }
+
+        private async void SeasonInput_ValueChanged(object? sender, RoutedEventArgs? evt) {
+            var s0 = await Context.Seasons.FindAsync(SeasonInput.Value);
+            var s1 = await Context.Seasons.FindAsync(SeasonInput.Value + 1);
+            var valid = (s0 != null);
+            var last = (s1 == null);
+            CalculateBinsButton.IsEnabled = valid && last;
+            DeliveryConfirmationButton.IsEnabled = valid;
+            OverUnderDeliveryButton.IsEnabled = valid;
+        }
+
+        private async void CalculateBinsButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            CalculateBinsButton.IsEnabled = false;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new Billing(year);
+            await b.FinishSeason();
+            await b.CalculateBins(
+                AllowAttrIntoLowerBinsInput.IsChecked ?? false,
+                AvoidUnderDeliveriesInput.IsChecked ?? false,
+                HonorGebundenInput.IsChecked ?? false);
+            Mouse.OverrideCursor = null;
+            CalculateBinsButton.IsEnabled = true;
+        }
+
+        private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new DeliveryConfirmationsDialog(year);
+            d.Show();
+        }
+
+        private async void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var d = new SaveFileDialog() {
+                FileName = $"Über-Unterlieferungen-{year}.csv",
+                DefaultExt = "csv",
+                Filter = "CSV-Datei (*.csv)|*.csv",
+                Title = $"Über-/Unterlieferungen {year} speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == false)
+                return;
+
+            Mouse.OverrideCursor = Cursors.AppStarting;
+
+            try {
+                using var file = new StreamWriter(d.FileName, false, Encoding.Latin1);
+                using var cnx = await AppDbContext.ConnectAsync();
+                await file.WriteLineAsync($"Auswertungen {year};;;;;;;;;;;");
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Über-/Unterlieferungen lt. gez. GA;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;GA;Lieferpflicht;Lieferrecht;Geliefert;Über-/Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address, m.business_shares,
+                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_OBLIGATION') AS min_kg,
+                           m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_RIGHT') AS max_kg,
+                           COALESCE(SUM(d.weight), 0) AS sum
+                    FROM member m
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                        LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = {year}
+                    WHERE m.active = 1
+                    GROUP BY d.year, m.mgnr
+                    ORDER BY sum = 0 DESC, 100.0 * sum / max_kg, m.mgnr;
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4);
+                        var addr = reader.GetString(5);
+                        var ga = reader.GetInt32(6);
+                        var minKg = reader.GetInt32(7);
+                        var maxKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        var s1 = sum < minKg ? $"{sum - minKg}" : sum > maxKg ? $"{sum - maxKg}" : "";
+                        var s2 = sum < minKg ? $"{sum * 100.0 / minKg - 100.0:0.0}" : sum > maxKg ? $"{sum * 100.0 / maxKg - 100:0.0}" : "";
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{ga};{minKg};{maxKg};{sum};{s1};{s2}");
+                    }
+                }
+
+                await file.WriteLineAsync($";;;;;;;;;;;");
+                await file.WriteLineAsync($"Unterlieferungen lt. Flächenbindungen;;;;;;;;;;;");
+                await file.WriteLineAsync($"MgNr;Name;Vorname;Adresse;PLZ;Ort;Vertrag;Lieferpflicht;Lieferrecht;Geliefert;Unterliefert;Prozent");
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                    SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address,
+                           c.bin, c.min_kg, c.max_kg, b.weight
+                    FROM member m
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                        JOIN v_area_commitment_bin c ON c.mgnr = m.mgnr AND c.year = {year}
+                        LEFT JOIN v_payment_bin b ON (b.mgnr, b.bin) = (m.mgnr, c.bin) AND b.year = {year}
+                    WHERE m.active = 1 AND b.weight < c.min_kg
+                    ORDER BY m.mgnr, c.bin
+                    """;
+                    using var reader = await cmd.ExecuteReaderAsync();
+                    while (await reader.ReadAsync()) {
+                        var mgnr = reader.GetInt32(0);
+                        var familyName = reader.GetString(1);
+                        var givenName = reader.GetString(2);
+                        var plz = reader.GetInt32(3);
+                        var ort = reader.GetString(4);
+                        var addr = reader.GetString(5);
+                        var id = reader.GetString(6);
+                        var minKg = reader.GetInt32(7);
+                        var maxKg = reader.GetInt32(8);
+                        var sum = reader.GetInt32(9);
+                        await file.WriteLineAsync($"{mgnr};{familyName};{givenName};{addr};{plz};{ort};{id};{minKg};{maxKg};{sum};{sum - minKg};{sum * 100.0 / minKg - 100.0:0.0}");
+                    }
+                }
+
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            Mouse.OverrideCursor = null;
+        }
+
+        private void PaymentButton_Click(object sender, RoutedEventArgs evt) {
+            var w = new ChartWindow();
+            w.Show();
+        }
+    }
+}

Elwig/Windows/TestWindow.xaml.cs

@@ -1,5 +1,6 @@
 using Elwig.Documents;
 using Elwig.Helpers;
+using Elwig.Helpers.Billing;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Linq;