Billing: honor gebunden field

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,21 @@
                 var pmt = part.Payment;
                 var abs = pmt?.ModAbs == null || pmt?.ModAbs == 0 ? "-" : pmt?.ModAbs.ToString("0." + string.Concat(Enumerable.Repeat('0', Model.Precision)));
                 var rel = pmt?.ModRel == null || pmt?.ModRel == 0 ? "-" : $"{pmt?.ModRel * 100:0.00##}";
-                <tr class="first @(bucketNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
-                    <td rowspan="@bucketNum" class="lsnr">@part.Delivery.LsNr</td>
-                    <td rowspan="@bucketNum" class="dpnr">@part.DPNr</td>
-                    <td rowspan="@bucketNum" class="variant">@part.Variant.Name</td>
-                    <td rowspan="@bucketNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
-                    <td rowspan="@bucketNum" class="oe">@($"{part.Oe:N0}")</td>
-                    <td rowspan="@bucketNum" class="kmw">@($"{part.Kmw:N1}")</td>
-                    <td rowspan="@bucketNum" class="abs">@abs</td>
-                    <td rowspan="@bucketNum" class="rel">@rel</td>
-                    @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
-                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                <tr class="first @(binNum <= 1 ? "last" : "") @(last != null && last != part.SortId ? "new" : "")">
+                    <td rowspan="@binNum" class="lsnr">@part.Delivery.LsNr</td>
+                    <td rowspan="@binNum" class="dpnr">@part.DPNr</td>
+                    <td rowspan="@binNum" class="variant">@part.Variant.Name</td>
+                    <td rowspan="@binNum" class="attribute">@string.Join(" / ", part.PartAttributes.Select(a => a.AttrId))</td>
+                    <td rowspan="@binNum" class="oe">@($"{part.Oe:N0}")</td>
+                    <td rowspan="@binNum" class="kmw">@($"{part.Kmw:N1}")</td>
+                    <td rowspan="@binNum" class="abs">@abs</td>
+                    <td rowspan="@binNum" class="rel">@rel</td>
+                    @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(0), pmt?.Prices?.ElementAtOrDefault(0)))
+                    <td rowspan="@binNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
                 </tr>
-                @for (int i = 1; i < bucketNum; i++) {
-                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
-                        @Raw(FormatRow(pmt?.Buckets?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
+                @for (int i = 1; i < binNum; i++) {
+                    <tr class="@(i == binNum - 1 ? "last" : "")">
+                        @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(i), pmt?.Prices?.ElementAtOrDefault(i)))
                     </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 = c.Payment.Variant.Season.BinNames;
             Precision = c.Payment.Variant.Season.Precision;
             Parts = ctx.DeliveryParts.FromSql($"""
                 SELECT p.*

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -0,0 +1,100 @@
+@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/>abwerten</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.Select((b, n) => (b, n + 1)).Where(b => b.Item1 > 0).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 (b, n) = bins[i];
+                            string name = "";
+                            switch (n) {
+                                case 1: name = $"geb. {p.SortId}{string.Join("", p.Attributes.Order().Select(a => a.AttrId).Take(2))}"; break;
+                                case 2: name = $"geb. {p.SortId}{p.Attributes.Select(a => a.AttrId).Order().FirstOrDefault()}"; break;
+                                case 3: name = $"geb. {p.SortId}{p.Attributes.Select(a => a.AttrId).Order().Skip(1).FirstOrDefault()}"; break;
+                                case 4: name = $"geb. {p.SortId}"; break;
+                                case 5: name = "ungeb."; break;
+                            }
+                            <td class="geb">@name:</td>
+                            <td class="weight">@($"{b:N0}")</td>
+                        } else {
+                            <td colspan="2"></td>
+                        }
+                        @if (first) {
+                            <td rowspan="@rows" class="weight">@($"{p.Weight:N0}")</td>
+                            <td rowspan="@rows" class="weight"></td>
+                            first = false;
+                        }
+                    </tr>
+                    lastSortId = p.SortId;
+                }
+            }
+            <tr class="sum">
+                <td colspan="8">Gesamt:</td>
+                <td colspan="2" style="text-align: right;">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table>
+</main>

Elwig/Documents/DeliveryConfirmation.cshtml.cs

@@ -0,0 +1,32 @@
+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 DeliveryConfirmation(AppDbContext ctx, int year, Member m) :
+            base($"Anlieferungsbestätigung {year} – {((IAddress?)m.BillingAddress ?? m).Name}", m) {
+            Year = year;
+            ShowDateAndLocation = true;
+            UseBillingAddress = 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();
+        }
+    }
+}

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.Member)
+                .Include(p => p.Delivery).ThenInclude(d => d.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,9 @@
 @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-stats">
+        <table class="delivery-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
             <colgroup>
                 <col style="width: 45mm;"/>
                 <col style="width: 20mm;"/>
@@ -147,18 +109,23 @@
                             $"<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.Item1[..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 (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
+                @if (Model.DisplayStats > 1) {
+                    <tr class="subheading">
+                        <th>Flächenbindungen:</th>
+                    </tr>
+                    @foreach (var (id, name, right, obligation, sum) in Model.MemberBins.OrderBy(b => b.Item1)) {
+                        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>

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 IEnumerable<(string, string, 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.Member, d.Year).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");
             }

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,70 @@
+
+table.delivery-confirmation {
+    font-size: 10pt;
+}
+
+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;
+}

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;
+    padding-bottom: 0.5mm !important;
 }
-*/
 
 table.delivery tr.sum {
     border-top: 0.5pt solid black;
@@ -60,13 +58,8 @@ table.delivery-stats {
     break-after: avoid;
 }
 
-table.delivery-stats.expanded th,
-table.delivery-stats.expanded td {
-    padding: 0.25mm 0;
-}
-
-table.delivery-stats:not(.expanded) th,
-table.delivery-stats:not(.expanded) td {
+table.delivery-stats th,
+table.delivery-stats td {
     padding: 0.125mm 0;
 }
 
@@ -74,6 +67,15 @@ table.delivery-stats:not(.expanded) tr.optional {
     display: none;
 }
 
+table.delivery-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery-stats.expanded tr.subheading:not(:has(~ tr)),
+table.delivery-stats tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
 table.delivery-stats thead th {
     font-weight: normal;
     font-style: italic;
@@ -84,10 +86,6 @@ table.delivery-stats thead th:first-child {
     text-align: left;
 }
 
-table.delivery-stats.expanded tbody {
-    font-size: 10pt;
-}
-
 table.delivery-stats td {
     text-align: right;
 }

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/Helpers/AppDbContext.cs

@@ -206,13 +206,13 @@ namespace Elwig.Helpers {
             }
         }
 
-        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBuckets(Member m, int year) {
+        public async Task<IEnumerable<(string, string, int, int, int)>> GetMemberBins(Member m, int year) {
             using var cnx = await ConnectAsync();
-            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(m.MgNr, year, cnx);
-            var buckets = await Billing.Billing.GetMemberBucketWeights(m.MgNr, year, cnx);
+            var (rights, obligations) = await Billing.Billing.GetMemberRightsObligations(cnx, year, m.MgNr);
+            var bins = await Billing.Billing.GetMemberBinWeights(m.MgNr, year, cnx);
 
             var list = new List<(string, string, int, int, int)>();
-            foreach (var id in rights.Keys.Union(obligations.Keys).Union(buckets.Keys)) {
+            foreach (var id in rights.Keys.Union(obligations.Keys).Union(bins.Keys)) {
                 var s = await WineVarieties.FindAsync(id[..2]);
                 var attrIds = id[2..];
                 var a = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
@@ -221,7 +221,7 @@ namespace Elwig.Helpers {
                     id, name,
                     rights.TryGetValue(id, out var v1) ? v1 : 0,
                     obligations.TryGetValue(id, out var v2) ? v2 : 0,
-                    buckets.TryGetValue(id, out var v3) ? v3 : 0
+                    bins.TryGetValue(id, out var v3) ? v3 : 0
                 ));
             }
 

Elwig/Helpers/AppDbUpdater.cs

@@ -4,7 +4,7 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 2;
+        public static readonly int RequiredSchemaVersion = 3;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
@@ -80,6 +80,121 @@ 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, "ALTER TABLE season ADD COLUMN bin_1_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_2_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_3_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_4_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_5_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_6_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_7_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_8_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN bin_9_name TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, """
+                UPDATE season
+                SET bin_1_name = n.bucket_1_name,
+                    bin_2_name = n.bucket_2_name,
+                    bin_3_name = n.bucket_3_name,
+                    bin_4_name = n.bucket_4_name,
+                    bin_5_name = n.bucket_5_name,
+                    bin_6_name = n.bucket_6_name,
+                    bin_7_name = n.bucket_7_name,
+                    bin_8_name = n.bucket_8_name,
+                    bin_9_name = n.bucket_9_name
+                FROM (SELECT year, bucket_1_name, bucket_2_name, bucket_3_name, bucket_4_name, bucket_5_name, bucket_6_name, bucket_7_name, bucket_8_name, bucket_9_name
+                      FROM payment_variant GROUP BY year HAVING avnr = MAX(avnr)) AS n
+                WHERE season.year = n.year
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bin (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+
+                    bin_1 INTEGER DEFAULT NULL,
+                    bin_2 INTEGER DEFAULT NULL,
+                    bin_3 INTEGER DEFAULT NULL,
+                    bin_4 INTEGER DEFAULT NULL,
+                    bin_5 INTEGER DEFAULT NULL,
+                    bin_6 INTEGER DEFAULT NULL,
+                    bin_7 INTEGER DEFAULT NULL,
+                    bin_8 INTEGER DEFAULT NULL,
+                    bin_9 INTEGER DEFAULT NULL,
+
+                    CONSTRAINT pk_delivery_part_bin PRIMARY KEY (year, did, dpnr),
+                    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, bin_1, bin_2, bin_3, bin_4, bin_5, bin_6, bin_7, bin_8, bin_9)
+                SELECT year, did, dpnr, bucket_1, bucket_2, bucket_3, bucket_4, bucket_5, bucket_6, bucket_7, bucket_8, bucket_9
+                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, "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) 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;
+                """);
+
+            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, "ALTER TABLE wine_attribute ADD COLUMN fill_lower_bins INTEGER NOT NULL CHECK (fill_lower_bins IN (0, 1, 2)) DEFAULT 0");
+
+            ExecuteNonQuery(cnx, "UPDATE delivery_part_bin SET bin_2 = bin_2 + bin_3, bin_3 = NULL WHERE bin_4 IS NULL");
+        }
     }
 }

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,194 @@ using System.Threading.Tasks;
 namespace Elwig.Helpers.Billing {
     public class Billing {
 
-        private readonly int Year;
-        private readonly int AvNr;
-        private readonly AppDbContext Context;
-        private readonly Dictionary<string, string> Attributes;
-        private readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
-        private readonly Dictionary<string, (string, string?, string?, string?, int?, int?, decimal?)> AreaComTypes;
+        protected readonly int Year;
+        protected readonly AppDbContext Context;
+        protected readonly Dictionary<string, string> Attributes;
+        protected readonly Dictionary<string, (decimal?, decimal?)> Modifiers;
+        protected 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}),
+                        bin_1_name = 'gebunden mit zwei Attributen',
+                        bin_2_name = 'gebunden mit (erstem) Attribut',
+                        bin_3_name = 'gebunden mit zweitem Attribut',
+                        bin_4_name = 'gebunden ohne Attribut',
+                        bin_5_name = 'ungebunden',
+                        bin_6_name = NULL,
+                        bin_7_name = NULL,
+                        bin_8_name = NULL,
+                        bin_9_name = NULL
+                    WHERE year = {Year}
+                    """;
                 await cmd.ExecuteNonQueryAsync();
             }
+        }
+
+        public async Task CalculateBins(bool allowAttrsIntoLowerBins, bool avoidUnderDeliveries, bool honorGebunden) {
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.FillLowerBins);
+            var attrForced = attrVals.Where(a => a.Value == 0).Select(a => a.Key).ToArray();
+            using var cnx = await AppDbContext.ConnectAsync();
+            var memberOblRig = await GetMemberRightsObligations(cnx, Year);
+            var inserts = new List<(int, int, int, int, int, int, int)>();
+
+            var deliveries = new List<(int, int, int, string, int, double, string, string[], string[], bool?)>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM payment_member WHERE (year, avnr) = ({Year}, {AvNr})";
+                cmd.CommandText = $"""
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden
+                    FROM v_delivery
+                    WHERE year = {Year}
+                    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();
+                while (await reader.ReadAsync()) {
+                    deliveries.Add((
+                        reader.GetInt32(0), reader.GetInt32(1), reader.GetInt32(2), reader.GetString(3), reader.GetInt32(4),
+                        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)
+                    ));
+                }
+            }
+
+            int lastMgNr = 0;
+            Dictionary<string, int>? rights = null;
+            Dictionary<string, int>? obligations = null;
+            Dictionary<string, int> used = new();
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden) in deliveries) {
+                if (lastMgNr != mgnr) {
+                    var or = memberOblRig.GetValueOrDefault(mgnr, (new(), new()));
+                    rights = or.Item2;
+                    obligations = or.Item1;
+                    used = new();
+                }
+                if ((honorGebunden && gebunden == false) ||
+                    obligations == null || rights == null ||
+                    obligations.Count == 0 || rights.Count == 0 ||
+                    qualid == "WEI" || qualid == "RSW" || qualid == "LDW")
+                {
+                    // Explizit als ungebunden markiert,
+                    // Mitglied hat keine Flächenbindungen, oder
+                    // Nicht mindestens Qualitätswein (QUW)
+                    // -> ungebunden
+                    inserts.Add((did, dpnr, 0, 0, 0, 0, weight));
+                    continue;
+                }
+
+                if (attributes.Length > 2)
+                    throw new NotSupportedException();
+
+                int w = weight;
+                int[] b = new int[4];
+                foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
+                    var c = p.Count();
+                    var key = sortid + string.Join("", p);
+                    if (rights.ContainsKey(key) && obligations.ContainsKey(key)) {
+                        int i = 0;
+                        if (c == 1) {
+                            i = (p.ElementAt(0) == attributes[0]) ? 1 : 2;
+                        } else if (c == 0) {
+                            i = b.Length - 1;
+                        }
+                        var vr = Math.Max(0, Math.Min(rights[key] - used.GetValueOrDefault(key, 0), w));
+                        var vo = Math.Max(0, Math.Min(obligations[key] - used.GetValueOrDefault(key, 0), w));
+                        var v = (c == 0 || p.Select(a => attrVals[a]).Min() == 2) ? vr : vo;
+                        b[i] += v;
+                        used[key] = used.GetValueOrDefault(key, 0) + v;
+                        w -= v;
+                    }
+                    if (w == 0 || !allowAttrsIntoLowerBins) break;
+                }
+                inserts.Add((did, dpnr, b[0], b[1], b[2], b[3], weight - b[0] - b[1] - b[2] - b[3]));
+                lastMgNr = mgnr;
+            }
+
+            using (var cmd = cnx.CreateCommand()) {
+                cmd.CommandText = $"""
+                    INSERT INTO delivery_part_bin (year, did, dpnr, bin_1, bin_2, bin_3, bin_4, bin_5)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, {i.Item4}, {i.Item5}, {i.Item6}, {i.Item7})"))}
+                    ON CONFLICT DO UPDATE
+                    SET bin_1 = excluded.bin_1,
+                        bin_2 = excluded.bin_2,
+                        bin_3 = excluded.bin_3,
+                        bin_4 = excluded.bin_4,
+                        bin_5 = excluded.bin_5,
+                        bin_6 = NULL,
+                        bin_7 = NULL,
+                        bin_8 = NULL,
+                        bin_9 = NULL;
+                    """;
                 await cmd.ExecuteNonQueryAsync();
             }
+
+            // TODO add second round to avoid under deliveries
         }
 
-        public async Task Calculate() {
-            await DeleteInDb();
-            var tasks = new List<Task>();
-            foreach (var mgnr in Context.Members.Select(m => m.MgNr)) {
-                tasks.Add(Task.Run(() => CalculateMember(mgnr)));
-            }
-            await Task.WhenAll(tasks);
-        }
-
-        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(int mgnr, int year, SqliteConnection cnx) {
-            var rights = new Dictionary<string, int>();
-            var obligations = new Dictionary<string, int>();
+        public static async Task<Dictionary<int, (Dictionary<string, int>, Dictionary<string, int>)>> GetMemberRightsObligations(SqliteConnection cnx, int year, int? mgnr = null) {
+            var members = new Dictionary<int, (Dictionary<string, int>, Dictionary<string, int>)>();
 
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT t.vtrgid,
+                SELECT mgnr, 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
+                WHERE ({(mgnr == null ? "NULL" : mgnr)} IS NULL OR mgnr = {(mgnr == null ? "NULL" : mgnr)}) AND
+                      (year_from IS NULL OR year_from <= {year}) AND
+                      (year_to IS NULL OR year_to >= {year})
+                GROUP BY mgnr, 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);
+                var m = reader.GetInt32(0);
+                var vtrgid = reader.GetString(1);
+                if (!members.ContainsKey(m)) members[m] = (new(), new());
+                members[m].Item1[vtrgid] = reader.GetInt32(2);
+                members[m].Item2[vtrgid] = reader.GetInt32(3);
             }
 
-            return (rights, obligations);
+            return members;
         }
 
-        public static async Task<Dictionary<string, int>> GetMemberBucketWeights(int mgnr, int year, SqliteConnection cnx) {
-            var buckets = new Dictionary<string, int>();
+        public static async Task<(Dictionary<string, int>, Dictionary<string, int>)> GetMemberRightsObligations(SqliteConnection cnx, int year, int mgnr) {
+            var members = await GetMemberRightsObligations(cnx, year, (int?)mgnr);
+            return members.GetValueOrDefault(mgnr, (new(), new()));
+        }
+
+        public static async Task<Dictionary<string, int>> GetMemberBinWeights(int mgnr, int year, SqliteConnection cnx) {
+            var bins = new Dictionary<string, int>();
 
             using var cmd = cnx.CreateCommand();
             cmd.CommandText = $"""
-                SELECT bucket, weight
-                FROM v_bucket
+                SELECT bin, weight
+                FROM v_delivery_bin
                 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);
-
-            var deliveries = new List<(int, int, string, int, double, string, string[], string[])>();
-            using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"""
-                    SELECT did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers
-                    FROM v_delivery
-                    WHERE (year, mgnr) = ({Year}, {mgnr})
-                    ORDER BY kmw DESC, weight DESC, did, dpnr
-                    """;
-                var reader = await cmd.ExecuteReaderAsync();
-                while (await reader.ReadAsync()) {
-                    deliveries.Add((
-                        reader.GetInt32(0), reader.GetInt32(1), reader.GetString(2), reader.GetInt32(3),
-                        reader.GetDouble(4), reader.GetString(5), reader.GetString(6).Split(","), reader.GetString(7).Split(",")
-                    ));
-                }
-            }
-
-            foreach (var (did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers) in deliveries) {
-                if (qualid == "WEI" || qualid == "RSW" || qualid == "LDW") {
-                    // Nicht mindestens Qualitätswein (QUW)
-                    using var cmd = cnx.CreateCommand();
-                    // TODO
-                    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
+                var bin = reader.GetString(0);
+                bins[bin] = reader.GetInt32(1);
             }
 
+            return bins;
         }
     }
 }

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,6 +55,8 @@ namespace Elwig.Helpers {
         public decimal VatReduced;
         public decimal VatFlatRate;
 
+        public int ModeDeliveryNoteStats;
+
         public string? TextDeliveryNote;
 
         public ClientParameters(AppDbContext ctx) : this(ctx.ClientParameters.ToDictionary(e => e.Param, e => e.Value)) { }
@@ -85,6 +91,13 @@ 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");
             } catch {
@@ -93,6 +106,13 @@ namespace Elwig.Helpers {
         }
 
         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,6 +135,7 @@ 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),
             };

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; }
 
@@ -100,7 +103,7 @@ namespace Elwig.Models {
         public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
 
         [NotMapped]
-        public string AttributesString => string.Join("/", Attributes);
+        public string AttributesString => string.Join(" / ", Attributes);
 
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
@@ -113,5 +116,12 @@ 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 DeliveryPartBin? Bin { get; private set; }
+
+        [NotMapped]
+        public int[] Bins => (new int?[] { Bin?.Bin1, Bin?.Bin2, Bin?.Bin3, Bin?.Bin4, Bin?.Bin5, Bin?.Bin6, Bin?.Bin7, Bin?.Bin8, Bin?.Bin9 })
+            .Where(b => b != null).Select(b => b.Value).ToArray();
     }
 }

Elwig/Models/DeliveryPartBin.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr")]
+    public class DeliveryPartBin {
+        [Column("year")]
+        public int Year { get; set; }
+
+        [Column("did")]
+        public int DId { get; set; }
+
+        [Column("dpnr")]
+        public int DPNr { get; set; }
+
+        [ForeignKey("Year, DId, DPNr")]
+        public virtual DeliveryPart Part { get; private set; }
+
+        [Column("bin_1")]
+        public int? Bin1 { get; set; }
+
+        [Column("bin_2")]
+        public int? Bin2 { get; set; }
+
+        [Column("bin_3")]
+        public int? Bin3 { get; set; }
+
+        [Column("bin_4")]
+        public int? Bin4 { get; set; }
+
+        [Column("bin_5")]
+        public int? Bin5 { get; set; }
+
+        [Column("bin_6")]
+        public int? Bin6 { get; set; }
+
+        [Column("bin_7")]
+        public int? Bin7 { get; set; }
+
+        [Column("bin_8")]
+        public int? Bin8 { get; set; }
+
+        [Column("bin_9")]
+        public int? Bin9 { get; set; }
+    }
+}

Elwig/Models/PaymentDeliveryPart.cs

@@ -34,37 +34,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]

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

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
 
 namespace Elwig.Models {
     [Table("season"), PrimaryKey("Year")]
@@ -42,6 +43,37 @@ namespace Elwig.Models {
             }
         }
 
+        [Column("bin_1_name")]
+        public string? Bin1Name { get; set; }
+
+        [Column("bin_2_name")]
+        public string? Bin2Name { get; set; }
+
+        [Column("bin_3_name")]
+        public string? Bin3Name { get; set; }
+
+        [Column("bin_4_name")]
+        public string? Bin4Name { get; set; }
+
+        [Column("bin_5_name")]
+        public string? Bin5Name { get; set; }
+
+        [Column("bin_6_name")]
+        public string? Bin6Name { get; set; }
+
+        [Column("bin_7_name")]
+        public string? Bin7Name { get; set; }
+
+        [Column("bin_8_name")]
+        public string? Bin8Name { get; set; }
+
+        [Column("bin_9_name")]
+        public string? Bin9Name { get; set; }
+
+        [NotMapped]
+        public string[] BinNames => (new string?[] { Bin1Name, Bin2Name, Bin3Name, Bin4Name, Bin5Name, Bin6Name, Bin7Name, Bin8Name, Bin9Name })
+            .Where(n => n != null).Select(n => n ?? "").ToArray();
+
         [ForeignKey("CurrencyCode")]
         public virtual Currency Currency { get; private 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/BaseDataWindow.xaml

@@ -215,7 +215,34 @@
 
             </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>
+                    </StackPanel>
+                </ScrollViewer>
             </TabItem>
         </TabControl>
 

Elwig/Windows/BaseDataWindow.xaml.cs

@@ -201,6 +201,14 @@ 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;
+            }
+
             FinishInputFilling();
         }
 
@@ -222,6 +230,9 @@ 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;
+
             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;
 
@@ -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"/>
@@ -39,19 +41,19 @@
         </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"/>
-        <Button x:Name="PaymentWindowButton" Content="Auszahlung" Click="PaymentWindowButton_Click"
-                Margin="50,280,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                Margin="50,240,0,0"/>
+        <Button x:Name="SeasonFinishButton" Content="Leseabschluss" Click="SeasonFinishButton_Click"
+                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

@@ -52,8 +52,8 @@ namespace Elwig.Windows {
             w.Show();
         }
 
-        private void PaymentWindowButton_Click(object sender, RoutedEventArgs e) {
-            var w = new ChartWindow();
+        private void SeasonFinishButton_Click(object sender, RoutedEventArgs e) {
+            var w = new SeasonFinishWindow();
             w.Show();
         }
     }

Elwig/Windows/MemberAdminWindow.xaml

@@ -51,6 +51,8 @@
                           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"

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,7 +272,23 @@ 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 void Menu_Print_Letterheads_MgNr_Click(object sender, RoutedEventArgs evt) {
@@ -601,12 +617,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,45 @@
+<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"
+                Click="CalculateBinsButton_Click"
+                Margin="50,80,0,0" FontSize="12" Height="40">
+            <TextBlock TextAlignment="Center">Lieferungen auf Flächen-<LineBreak/>bindungen aufteilen</TextBlock>
+        </Button>
+
+        <Button x:Name="DeliveryConfirmationButton" Content="Anlieferungsbestätigungen"
+                Click="DeliveryConfirmationButton_Click"
+                Margin="50,130,0,0"/>
+
+        <Button x:Name="OverUnderDeliveryButton" Content="Über-/Unterlieferungen"
+                Click="OverUnderDeliveryButton_Click"
+                Margin="50,172,0,0"/>
+
+        <Button x:Name="PaymentButton" Content="Auszahlung"
+                Click="PaymentButton_Click"
+                Margin="50,214,0,0"/>
+    </Grid>
+</local:ContextWindow>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -0,0 +1,78 @@
+using Elwig.Documents;
+using Elwig.Helpers;
+using Elwig.Helpers.Billing;
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+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() {
+
+        }
+
+        private async void SeasonInput_ValueChanged(object sender, RoutedEventArgs evt) {
+            var s = await Context.Seasons.FindAsync(SeasonInput.Value);
+            var valid = (s != null);
+            CalculateBinsButton.IsEnabled = valid;
+            DeliveryConfirmationButton.IsEnabled = valid;
+            OverUnderDeliveryButton.IsEnabled = valid;
+        }
+
+        private async void CalculateBinsButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            Mouse.OverrideCursor = Cursors.AppStarting;
+            var b = new Billing(year);
+            await b.FinishSeason();
+            await b.CalculateBins(true, false, false);
+            Mouse.OverrideCursor = null;
+        }
+
+        private async void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
+            if (SeasonInput.Value is not int year)
+                return;
+            var res = MessageBox.Show(
+                $"Sollen wirklich alle Bestätigungen 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.FromSqlRaw($"""
+                SELECT m.*
+                FROM member m
+                    JOIN delivery d ON d.mgnr = m.mgnr
+                WHERE m.active AND d.year = {year}
+                GROUP BY m.mgnr
+                ORDER BY m.mgnr
+                """)
+                .ToList()
+                .Select(m => new DeliveryConfirmation(Context, year, m)));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            if (App.Config.Debug) {
+                doc.Show();
+            } else {
+                await doc.Print();
+            }
+        }
+
+        private void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+        }
+
+        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;