Billing: fix small bugs

Elwig/App.xaml.cs

@@ -12,6 +12,7 @@ using System.Globalization;
 using System.Threading;
 using System.Windows.Markup;
 using System.Reflection;
+using Elwig.Helpers.Printing;
 
 namespace Elwig {
     public partial class App : Application {
@@ -45,7 +46,7 @@ namespace Elwig {
         public static IList<IScale> Scales { get; private set; }
         public static ClientParameters Client { get; private set; }
 
-        public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
+        public static bool IsPrintingReady => Html.IsReady && Pdf.IsReady;
         public static Dispatcher MainDispatcher { get; private set; }
 
         public App() : base() {
@@ -92,8 +93,8 @@ namespace Elwig {
                 }
             }
 
-            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
-            Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));
+            Utils.RunBackground("HTML Initialization", () => Html.Init(PrintingReadyChanged));
+            Utils.RunBackground("PDF Initialization", () => Pdf.Init(PrintingReadyChanged));
 
             var list = new List<IScale>();
             foreach (var s in Config.Scales) {
@@ -127,7 +128,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 +139,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/Documents/BusinessDocument.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.BusinessDocument>
 @model Elwig.Documents.BusinessDocument
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-businessdocument.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\BusinessDocument.css"/>
 <div class="info-wrapper">
     <div class="address-wrapper">
         <div class="sender">

Elwig/Documents/CreditNote.cs

@@ -10,7 +10,7 @@ namespace Elwig.Documents {
         public Credit Credit;
         public string? Text;
         public string CurrencySymbol;
-        public string[] BinNames;
+        public string[] BucketNames;
         public int Precision;
         public IEnumerable<DeliveryPart> Parts;
 
@@ -27,14 +27,14 @@ 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;
-            BinNames = new string[0]; // FIXME
+            BucketNames = new string[0]; // FIXME
             Precision = c.Payment.Variant.Season.Precision;
             Parts = ctx.DeliveryParts.FromSql($"""
                 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) = ({c.Year}, {c.Member.MgNr})
-                ORDER BY sortid, LENGTH(attributes) DESC, attributes, kmw DESC, date, time, dpnr
+                ORDER BY sortid, attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, date, time, dpnr
                 """).ToList();
         }
     }}

Elwig/Documents/CreditNote.cshtml

@@ -2,9 +2,9 @@
 @inherits TemplatePage<Elwig.Documents.CreditNote>
 @model Elwig.Documents.CreditNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-creditnote.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\CreditNote.css"/>
 @{
-    var binNum = Model.BinNames.Length;
+    var bucketNum = Model.BucketNames.Length;
 }
 <main>
     <h1>@Model.Title</h1>
@@ -27,10 +27,10 @@
                 <th rowspan="3" style="text-align: left;">Lieferschein-Nr.</th>
                 <th rowspan="3">Pos.</th>
                 <th rowspan="3" style="text-align: left;">Sorte</th>
-                <th rowspan="3" style="text-align: left;">Attribut(e)</th>
+                <th rowspan="3" style="text-align: left;">Attribut</th>
                 <th rowspan="2" colspan="2">Gradation</th>
                 <th colspan="2">Zu-/Abschläge</th>
-                <th colspan="2">@Raw(string.Join("<br/>", Model.BinNames))</th>
+                <th colspan="2">@Raw(string.Join("<br/>", Model.BucketNames))</th>
                 <th rowspan="2">Betrag</th>
             </tr>
             <tr>
@@ -61,23 +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 @(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>
+                <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">@part.Attribute?.Name</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>
                     <!--FIXME price-->
-                    @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(0)?.Value, 0))
-                    <td rowspan="@binNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
+                    @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(0)?.Value, 0))
+                    <td rowspan="@bucketNum" class="amount sum">@($"{pmt?.Amount:N2}")</td>
                 </tr>
-                @for (int i = 1; i < binNum; i++) {
-                    <tr class="@(i == binNum - 1 ? "last" : "")">
+                @for (int i = 1; i < bucketNum; i++) {
+                    <tr class="@(i == bucketNum - 1 ? "last" : "")">
                         <!--FIXME price-->
-                        @Raw(FormatRow(pmt?.DeliveryPart.Bins?.ElementAtOrDefault(i)?.Value, 0))
+                        @Raw(FormatRow(pmt?.DeliveryPart.Buckets?.ElementAtOrDefault(i)?.Value, 0))
                     </tr>
                 }
                 last = part.SortId;

Elwig/Documents/DeliveryConfirmation.cs

@@ -1,36 +1,34 @@
 using Elwig.Helpers;
 using Elwig.Models;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
 
-        public int Year;
+        public Season Season;
         public IEnumerable<DeliveryPart> Deliveries;
         public string? Text = App.Client.TextDeliveryConfirmation;
-        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
 
-        public DeliveryConfirmation(AppDbContext ctx, int year, Member m) :
+        public DeliveryConfirmation(AppDbContext ctx, int year, Member m, IEnumerable<DeliveryPart>? deliveries = null) :
             base($"Anlieferungsbestätigung {year}", m) {
-            Year = year;
+            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("invalid season");
             ShowDateAndLocation = true;
             UseBillingAddress = true;
             IncludeSender = true;
-            // FIXME footer in merged documents
-            //DocumentId = $"Anl.-Best. {Year}/{m.MgNr}";
-            Deliveries = ctx.DeliveryParts.FromSqlRaw($"""
+            DocumentId = $"Anl.-Best. {Season.Year}/{m.MgNr}";
+            Deliveries = 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
+                WHERE (v.year, v.mgnr) = ({Season.Year}, {m.MgNr})
+                ORDER BY v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
                 """)
                 .ToList();
-            MemberBins = ctx.GetMemberBins(Year, m.MgNr).GetAwaiter().GetResult();
+            MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
 @model Elwig.Documents.DeliveryConfirmation
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliveryconfirmation.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryConfirmation.css"/>
 <main>
     <h1>@Model.Title</h1>
     <table class="delivery-confirmation">
@@ -24,7 +24,7 @@
                 <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;">Attribut</th>
                 <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
                 <th colspan="2">Gradation</th>
                 <th colspan="2">Flächenbindung</th>
@@ -44,11 +44,11 @@
                 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 buckets = p.Buckets.Where(b => b.Value > 0).OrderByDescending(b => b.BktNr).ToArray();
+                var rowsBuckets = buckets.Length;
                 var mods = p.Modifiers.Select(m => m.Name).ToArray();
                 var rowsMod = mods.Length + 1;
-                var rows = Math.Max(rowsBins, rowsMod);
+                var rows = Math.Max(rowsBuckets, rowsMod);
                 var first = true;
                 @for (int i = 0; i < rows; i++) {
                     <tr class="@(first ? "first" : "") @(p.SortId != lastSortId && lastSortId != "" ? "new": "") @(rows > i + 1 ? "trailing" : "")">
@@ -56,7 +56,7 @@
                             <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.Attribute?.Name</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>
@@ -66,14 +66,14 @@
                         } 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>
+                        @if (i < buckets.Length) {
+                            var bucket = buckets[i];
+                            <td class="geb">@(bucket.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{bucket.Discr}"):</td>
+                            <td class="weight">@($"{bucket.Value:N0}")</td>
                         } else {
                             <td colspan="2"></td>
                         }
-                        @if (i == bins.Length - 1) {
+                        @if (i == buckets.Length - 1) {
                             <td class="weight">@($"{p.Weight:N0}")</td>
                         } else {
                             <td></td>
@@ -106,12 +106,12 @@
         </colgroup>
         <thead>
             <tr>
-                <th><b>Lese @Model.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
+                <th><b>Lese @Model.Season.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
                 <th>Lieferpflicht</th>
                 <th>Lieferrecht</th>
-                <th>Unterliefert<br/>(bzgl. Zuget.)</th>
-                <th>Noch zu liefern<br/>(bzgl. Gelft.)</th>
-                <th>Überliefert<br/>(bzgl. Gelft.)</th>
+                <th>Unterliefert</th>
+                <th>Noch lieferbar</th>
+                <th>Überliefert</th>
                 <th>Zugeteilt</th>
                 <th>Geliefert</th>
             </tr>
@@ -129,14 +129,20 @@
                         $"<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);
+                var mBuckets = Model.MemberBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0 || b.Value.Item4 > 0).ToList();
+                var fbVars = mBuckets.Where(b => b.Value.Item2 > 0 || b.Value.Item3 > 0).Select(b => b.Key.Replace("_", "")).Order().ToArray();
+                var fbs = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length == 2).OrderBy(b => b.Value.Item1);
+                var vtr = mBuckets.Where(b => fbVars.Contains(b.Key) && b.Key.Length > 2).OrderBy(b => b.Value.Item1);
+                var rem = mBuckets.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)))
+                @Raw(FormatRow(
+                    0,
+                    Model.Member.BusinessShares * Model.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Season.Year).Sum(d => d.Weight)
+                ))
             </tr>
             @if (rem.Any()) {
                 <tr class="subheading"><th colspan="8">Sortenaufteilung:</th></tr>
@@ -156,6 +162,15 @@
                     @Raw(FormatRow(2, obligation, right, sum, payment))
                 </tr>
             }
+            @if (vtr.Any()) {
+                <tr class="subheading"><th colspan="8">Verträge:</th></tr>
+            }
+            @foreach (var (id, (name, right, obligation, sum, payment)) in vtr) {
+                <tr>
+                    <th>@name</th>
+                    @Raw(FormatRow(2, obligation, right, sum, payment))
+                </tr>
+            }
         </tbody>
     </table>
     <div class="text" style="margin-top: 2em;">

Elwig/Documents/DeliveryJournal.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryJournal>
 @model Elwig.Documents.DeliveryJournal
 @{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliveryjournal.css"/>
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryJournal.css"/>
 <main>
     <h1>Lieferjournal</h1>
     <h2>@Model.Filter</h2>

Elwig/Documents/DeliveryNote.cs

@@ -7,7 +7,7 @@ namespace Elwig.Documents {
 
         public Delivery Delivery;
         public string? Text;
-        public Dictionary<string, (string, int, int, int, int)> MemberBins;
+        public Dictionary<string, (string, int, int, int, int)> MemberBuckets;
 
         // 0 - none
         // 1 - GA only
@@ -27,7 +27,7 @@ namespace Elwig.Documents {
                 $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
-            MemberBins = ctx.GetMemberBins(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
+            MemberBuckets = ctx.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult();
         }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -2,7 +2,7 @@
 @inherits TemplatePage<Elwig.Documents.DeliveryNote>
 @model Elwig.Documents.DeliveryNote
 @{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\DeliveryNote.css" />
 <main>
 <h1>@Model.Title</h1>
 <table class="delivery">
@@ -21,7 +21,7 @@
         <tr>
             <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
             <th class="main" rowspan="2" colspan="2">Sorte</th>
-            <th class="main" rowspan="2" colspan="2">Attribut(e)</th>
+            <th class="main" rowspan="2" colspan="2">Attribut</th>
             <th class="main" rowspan="2">Qualitätsstufe</th>
             <th colspan="2">Gradation</th>
             <th>Gewicht</th>
@@ -37,7 +37,7 @@
             <tr class="main">
                 <td style="text-align: center;">@part.DPNr</td>
                 <td colspan="2">@part.Variant.Name</td>
-                <td colspan="2">@string.Join(" / ", part.Attributes)</td>
+                <td colspan="2">@part.Attribute?.Name</td>
                 <td>@part.Quality.Name</td>
                 <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
                 <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
@@ -92,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>
@@ -108,18 +108,22 @@
                         $"<td>{sum:N0}</td>";
                 }
                 var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
-                var bins = Model.MemberBins.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
+                var buckets = Model.MemberBuckets.GroupBy(b => b.Key[..2]).ToDictionary(g => g.Key, g => g.Count());
             }
             <tr>
                 <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)))
+                @Raw(FormatRow(
+                    Model.Member.BusinessShares * Model.Delivery.Season.MinKgPerBusinessShare,
+                    Model.Member.BusinessShares * Model.Delivery.Season.MaxKgPerBusinessShare,
+                    Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)
+                ))
             </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.Key)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && bins[id[..2]] > 1 && !id.EndsWith('_'))) {
+                    @foreach (var (id, (name, right, obligation, sum, _)) in Model.MemberBuckets.OrderBy(b => b.Key)) {
+                    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))

Elwig/Documents/Document.Page.css

@@ -20,9 +20,6 @@
 hr.page-break {
     display: none;
 }
-.document-break {
-    break-before: page;
-}
 
 @page {
     size: A4;

Elwig/Documents/Document.cs

@@ -3,16 +3,16 @@ using System.Threading.Tasks;
 using System.IO;
 using Elwig.Helpers;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Linq;
+using Elwig.Helpers.Printing;
 
 namespace Elwig.Documents {
     public abstract partial class Document : IDisposable {
 
         private TempFile? _pdfFile = null;
-        private string? _renderedHtml = null;
 
         public bool ShowFoldMarks = App.Config.Debug;
+        public bool DoubleSided = false;
 
         public string DataPath;
         public int CurrentNextSeason;
@@ -39,18 +39,6 @@ namespace Elwig.Documents {
             Date = DateTime.Today;
         }
 
-        [GeneratedRegex(@"</body>.*?</footer>\s*</div>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedDocumentHeaderRegex();
-        private static readonly Regex DocumentHeaderRegex = GeneratedDocumentHeaderRegex();
-
-        [GeneratedRegex(@"<style>.*?/style>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedHtmlStyleRegex();
-        private static readonly Regex HtmlStyleRegex = GeneratedHtmlStyleRegex();
-
-        [GeneratedRegex(@"<link[^>]*>", RegexOptions.IgnoreCase | RegexOptions.Singleline | RegexOptions.Compiled)]
-        private static partial Regex GeneratedHtmlLinkRegex();
-        private static readonly Regex HtmlLinkRegex = GeneratedHtmlLinkRegex();
-
         ~Document() {
             Dispose();
         }
@@ -61,34 +49,11 @@ namespace Elwig.Documents {
             GC.SuppressFinalize(this);
         }
 
-        public static async Task<Document> Merge(IEnumerable<Document> docs) {
-            string html = "";
-            var styles = new List<string>();
-            foreach (var d in docs) {
-                var h = await d.Render();
-                var s = HtmlStyleRegex.Matches(h).Select(m => m.Value).ToList();
-                var l = HtmlLinkRegex.Matches(h).Select(m => m.Value).ToList();
-                if (s.All(styles.Contains)) {
-                    h = HtmlStyleRegex.Replace(h, "");
-                } else {
-                    styles.AddRange(s);
-                }
-                if (l.All(styles.Contains)) {
-                    h = HtmlLinkRegex.Replace(h, "");
-                } else {
-                    styles.AddRange(l);
-                }
-                html += h;
-            }
-            html = DocumentHeaderRegex.Replace(html, "<div class='document-break'/>");
-            return new InternalDocument("Mehrere Dokumente") {
-                _renderedHtml = html,
-            };
+        public static Document Merge(IEnumerable<Document> docs) {
+            return new MergedDocument(docs);
         }
 
         private async Task<string> Render() {
-            if (_renderedHtml != null)
-                return _renderedHtml;
             string name;
             if (this is BusinessLetter) {
                 name = "BusinessLetter";
@@ -109,18 +74,40 @@ namespace Elwig.Documents {
         }
 
         private async Task<string> Render(string name) {
-            _renderedHtml = await Html.CompileRenderAsync(name, this);
-            return _renderedHtml;
+            return await Html.CompileRenderAsync(name, this); ;
         }
 
-        public async Task Generate() {
+        public async Task Generate(IProgress<double>? progress = null) {
+            progress?.Report(0.0);
+            if (this is MergedDocument m) {
+                var pdf = new TempFile("pdf");
+                var tmpHtmls = new List<TempFile>();
+                var n = m.Documents.Count();
+                int i = 0;
+                foreach (var doc in m.Documents) {
+                    var tmpHtml = new TempFile("html");
+                    await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
+                    tmpHtmls.Add(tmpHtml);
+                    i++;
+                    progress?.Report(25.0 * i / n);
+                }
+                progress?.Report(25.0);
+                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(25.0 + v * 0.75)));
+                foreach (var tmp in tmpHtmls) {
+                    tmp.Dispose();
+                }
+                _pdfFile = pdf;
+            } else {
                 var pdf = new TempFile("pdf");
                 using (var tmpHtml = new TempFile("html")) {
                     await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
-                await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath);
+                    progress?.Report(50.0);
+                    await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, DoubleSided);
                 }
                 _pdfFile = pdf;
             }
+            progress?.Report(100.0);
+        }
 
         public void SaveTo(string pdfPath) {
             if (_pdfFile == null) throw new InvalidOperationException("Pdf file has not been generated yet");
@@ -137,8 +124,11 @@ namespace Elwig.Documents {
             Pdf.Show(_pdfFile.NewReference(), Title + (this is BusinessDocument b ? $" - {b.Member.Name}" : ""));
         }
 
-        private class InternalDocument : Document {
-            public InternalDocument(string title) : base(title) { }
+        private class MergedDocument : Document {
+            public IEnumerable<Document> Documents;
+            public MergedDocument(IEnumerable<Document> docs) : base("Mehrere Dokumente") {
+                Documents = docs;
+            }
         }
     }
 }

Elwig/Documents/Document.cshtml

@@ -7,8 +7,18 @@
     <title>@Model.Title</title>
     <meta name="author" value="@Model.Author"/>
     <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style.css"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.css"/>
+    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\Document.Page.css"/>
+    @if (Model.DoubleSided) {
+        <style>
+            @@page :left {
+                margin: 25mm 25mm 35mm 20mm;
+                @@bottom-center {
+                    content: element(page-footer-left);
+                }
+            }
+        </style>
+    }
 </head>
 <body>
     @if (Model.ShowFoldMarks) {
@@ -27,6 +37,16 @@
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
+    @if (Model.DoubleSided) {
+        <div class="footer-wrapper left">
+            <div class="pre-footer">
+                <span class="page"></span>
+                <span class="doc-id">@Model.DocumentId</span>
+                <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
+            </div>
+            <footer>@Raw(Model.Footer)</footer>
+        </div>
+    }
     <header>@Raw(Model.Header)</header>
     <div class="spacing"></div>
     <div class="main-wrapper">

Elwig/Documents/Document.css

@@ -57,6 +57,12 @@ header .type {
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;
+    /* for some reason the position without the following statement changes on the second page */
+    border: 0.5pt solid #00000000;
+}
+
+.footer-wrapper.left {
+    position: running(page-footer-left);
 }
 
 .pre-footer {
@@ -69,16 +75,16 @@ header .type {
     width: 33%;
 }
 
-.pre-footer .date {
+.pre-footer > *:first-child {
     text-align: left;
 }
 
-.pre-footer .doc-id {
+.pre-footer > *:nth-child(2) {
     text-align: center;
     font-style: italic;
 }
 
-.pre-footer .page {
+.pre-footer > *:last-child {
     text-align: right;
     float: right;
 }

Elwig/Documents/Pdf.cs

@@ -1,68 +0,0 @@
-using System.Threading.Tasks;
-using Elwig.Helpers;
-using Elwig.Windows;
-using System.Diagnostics;
-using Balbarak.WeasyPrint;
-using System;
-using System.IO;
-
-namespace Elwig.Documents {
-    public static class Pdf {
-
-        private static readonly string PdfToPrinter = App.ExePath + "PDFtoPrinter.exe";
-        private static readonly FilesManager WeasyPrintManager = new();
-        private static string? WeasyPrintPython = null;
-        private static string? WeasyPrintDir => WeasyPrintManager.FolderPath;
-        public static bool IsReady => WeasyPrintPython != null && WeasyPrintDir != null;
-
-        public static async Task Init(Action evtHandler) {
-            if (!WeasyPrintManager.IsFilesExsited()) {
-                await WeasyPrintManager.InitFilesAsync();
-            }
-            WeasyPrintPython = Path.Combine(WeasyPrintManager.FolderPath, "python.exe");
-            evtHandler();
-        }
-
-        public static async Task Convert(string htmlPath, string pdfPath) {
-            var p = new Process() { StartInfo = new() {
-                FileName = WeasyPrintPython,
-                CreateNoWindow = true,
-                WorkingDirectory = WeasyPrintDir,
-                RedirectStandardError = true,
-            } };
-            p.StartInfo.EnvironmentVariables["PATH"] = "Scripts;gtk3;" + Environment.GetEnvironmentVariable("PATH");
-            p.StartInfo.ArgumentList.Add("scripts/weasyprint.exe");
-            p.StartInfo.ArgumentList.Add("-e");
-            p.StartInfo.ArgumentList.Add("utf8");
-            p.StartInfo.ArgumentList.Add(htmlPath);
-            p.StartInfo.ArgumentList.Add(pdfPath);
-            p.Start();
-            await p.WaitForExitAsync();
-            var stderr = await p.StandardError.ReadToEndAsync();
-            if (p.ExitCode != 0) throw new Exception(stderr);
-        }
-
-        public static void Show(TempFile file, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, file);
-                w.Show();
-            });
-        }
-
-        public static void Show(string path, string title) {
-            App.MainDispatcher.BeginInvoke(() => {
-                var w = new DocumentViewerWindow(title, path);
-                w.Show();
-            });
-        }
-
-        public static async Task Print(string path, int copies = 1) {
-            var p = new Process() { StartInfo = new() { FileName = PdfToPrinter } };
-            p.StartInfo.ArgumentList.Add(path);
-            p.StartInfo.ArgumentList.Add("/s");
-            p.StartInfo.ArgumentList.Add($"copies={copies}");
-            p.Start();
-            await p.WaitForExitAsync();
-        }
-    }
-}

Elwig/Elwig.csproj

@@ -6,36 +6,32 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.4.1</Version>
+    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
+    <Version>0.4.3</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="elwig.ico" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
-    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="LinqKit" Version="1.2.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.22" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.11" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="4.1.67" />
-    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="elwig.png" />
+    <Resource Include="Resources\Images\Elwig.png" />
+    <Content Include="Resources\Images\Elwig.ico" />
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
     <Exec Command="call fetch-resources.bat" />
   </Target>
 
+  <ItemGroup>
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
+    <PackageReference Include="ini-parser" Version="2.5.2" />
+    <PackageReference Include="LinqKit" Version="1.2.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.24" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.13" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2088.41" />
+    <PackageReference Include="RazorLight" Version="2.3.1" />
+    <PackageReference Include="ScottPlot.WPF" Version="4.1.68" />
+    <PackageReference Include="System.IO.Ports" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+  </ItemGroup>
+
 </Project>

Elwig/Helpers/AppDbContext.cs

@@ -40,7 +40,6 @@ namespace Elwig.Helpers {
         public DbSet<Modifier> Modifiers { get; private set; }
         public DbSet<Delivery> Deliveries { get; private set; }
         public DbSet<DeliveryPart> DeliveryParts { get; private set; }
-        public DbSet<DeliveryPartAttr> DeliveryPartAttributes { get; private set; }
         public DbSet<DeliveryPartModifier> DeliveryPartModifiers { get; private set; }
         public DbSet<PaymentVar> PaymentVariants { get; private set; }
         public DbSet<PaymentMember> MemberPayments { get; private set; }
@@ -54,8 +53,8 @@ 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();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberDeliveryBuckets = new();
+        private readonly Dictionary<int, Dictionary<int, Dictionary<string, int>>> _memberPaymentBuckets = new();
 
         public AppDbContext() {
             if (App.Config.DatabaseLog != null) {
@@ -166,28 +165,6 @@ namespace Elwig.Helpers {
                 .LastOrDefaultAsync();
         }
 
-        public async Task UpdateDeliveryPartAttributes(DeliveryPart part, IEnumerable<WineAttr> attributes) {
-            foreach (var a in WineAttributes) {
-                var attr = part.PartAttributes.Where(pa => pa.AttrId == a.AttrId).FirstOrDefault();
-                if (attributes.Contains(a)) {
-                    DeliveryPartAttr dpa = attr ?? this.CreateProxy<DeliveryPartAttr>();
-                    dpa.Year = part.Year;
-                    dpa.DId = part.DId;
-                    dpa.DPNr = part.DPNr;
-                    dpa.AttrId = a.AttrId;
-                    if (attr == null) {
-                        await AddAsync(dpa);
-                    } else {
-                        Update(dpa);
-                    }
-                } else {
-                    if (attr != null) {
-                        Remove(attr);
-                    }
-                }
-            }
-        }
-
         public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
@@ -213,55 +190,55 @@ namespace Elwig.Helpers {
         private async Task FetchMemberRightsAndObligations(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var bins = new Dictionary<int, Dictionary<string, (int, int)>>();
+            var buckets = 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}";
+                cmd.CommandText = $"SELECT mgnr, bucket, min_kg, max_kg FROM v_area_commitment_bucket 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 (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][vtrgid] = (reader.GetInt32(3), reader.GetInt32(2));
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberRightsAndObligations[year] = bins;
+            _memberRightsAndObligations[year] = buckets;
         }
 
-        private async Task FetchMemberDeliveryBins(int year, SqliteConnection? cnx = null) {
+        private async Task FetchMemberDeliveryBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var bins = new Dictionary<int, Dictionary<string, int>>();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_delivery_bin WHERE year = {year}";
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_delivery_bucket WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
-                    var bin = reader.GetString(1);
-                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
-                    bins[mgnr][bin] = reader.GetInt32(2);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberDeliveryBins[year] = bins;
+            _memberDeliveryBuckets[year] = buckets;
         }
 
-        private async Task FetchMemberPaymentBins(int year, SqliteConnection? cnx = null) {
+        private async Task FetchMemberPaymentBuckets(int year, SqliteConnection? cnx = null) {
             var ownCnx = cnx == null;
             cnx ??= await ConnectAsync();
-            var bins = new Dictionary<int, Dictionary<string, int>>();
+            var buckets = new Dictionary<int, Dictionary<string, int>>();
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"SELECT mgnr, bin, weight FROM v_payment_bin WHERE year = {year}";
+                cmd.CommandText = $"SELECT mgnr, bucket, weight FROM v_payment_bucket WHERE year = {year}";
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
                     var mgnr = reader.GetInt32(0);
-                    var bin = reader.GetString(1);
-                    if (!bins.ContainsKey(mgnr)) bins[mgnr] = new();
-                    bins[mgnr][bin] = reader.GetInt32(2);
+                    var bucket = reader.GetString(1);
+                    if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new();
+                    buckets[mgnr][bucket] = reader.GetInt32(2);
                 }
             }
             if (ownCnx) await cnx.DisposeAsync();
-            _memberPaymentBins[year] = bins;
+            _memberPaymentBuckets[year] = buckets;
         }
 
         public async Task<Dictionary<string, (int, int)>> GetMemberRightsAndObligations(int year, int mgnr, SqliteConnection? cnx = null) {
@@ -270,41 +247,41 @@ namespace Elwig.Helpers {
             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>> GetMemberDeliveryBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberDeliveryBuckets.ContainsKey(year))
+                await FetchMemberDeliveryBuckets(year, cnx);
+            return _memberDeliveryBuckets[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, int>> GetMemberPaymentBuckets(int year, int mgnr, SqliteConnection? cnx = null) {
+            if (!_memberPaymentBuckets.ContainsKey(year))
+                await FetchMemberPaymentBuckets(year, cnx);
+            return _memberPaymentBuckets[year].GetValueOrDefault(mgnr, new());
         }
 
-        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBins(int year, int mgnr, SqliteConnection? cnx = null) {
+        public async Task<Dictionary<string, (string, int, int, int, int)>> GetMemberBuckets(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);
+            var deliveryBuckets = await GetMemberDeliveryBuckets(year, mgnr, cnx);
+            var paymentBuckets = await GetMemberPaymentBuckets(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 buckets = new Dictionary<string, (string, int, int, int, int)>();
+            foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
                 var variety = await WineVarieties.FindAsync(id[..2]);
                 var attrIds = id[2..];
                 var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync();
                 var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
-                bins[id] = (
+                buckets[id] = (
                     name,
                     rightsAndObligations.GetValueOrDefault(id).Item1,
                     rightsAndObligations.GetValueOrDefault(id).Item2,
-                    deliveryBins.GetValueOrDefault(id),
-                    paymentBins.GetValueOrDefault(id)
+                    deliveryBuckets.GetValueOrDefault(id),
+                    paymentBuckets.GetValueOrDefault(id)
                 );
             }
-            return bins;
+            return buckets;
         }
     }
 }

Elwig/Helpers/AppDbUpdater.cs

@@ -4,11 +4,11 @@ using System;
 namespace Elwig.Helpers {
     public static class AppDbUpdater {
 
-        public static readonly int RequiredSchemaVersion = 4;
+        public static readonly int RequiredSchemaVersion = 6;
 
         private static int _versionOffset = 0;
         private static readonly Action<SqliteConnection>[] _updaters = new[] {
-            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3, UpdateDbSchema_3_To_4, UpdateDbSchema_4_To_5, UpdateDbSchema_5_To_6
         };
 
         private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
@@ -65,11 +65,14 @@ namespace Elwig.Helpers {
             }
 
             ExecuteNonQuery(cnx, "PRAGMA locking_mode = EXCLUSIVE");
+            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = OFF");
             ExecuteNonQuery(cnx, "BEGIN EXCLUSIVE");
             for (int i = fromVersion; i < toVersion; i++) {
                 _updaters[i - 1](cnx);
             }
+            ExecuteNonQuery(cnx, "PRAGMA foreign_key_check");
             ExecuteNonQuery(cnx, "COMMIT");
+            ExecuteNonQuery(cnx, "PRAGMA foreign_keys = ON");
             ExecuteNonQuery(cnx, "VACUUM");
             ExecuteNonQuery(cnx, $"PRAGMA schema_version = {toVersion * 100 + _versionOffset}");
         }
@@ -213,5 +216,281 @@ namespace Elwig.Helpers {
                 ORDER BY s.year, c.mgnr, LENGTH(c.vtrgid) DESC, c.vtrgid;
                 """);
         }
+
+        private static void UpdateDbSchema_4_To_5(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE _area_commitment_type (
+                    vtrgid         TEXT NOT NULL CHECK (vtrgid = sortid || COALESCE(attrid, '') || disc),
+                    sortid         TEXT NOT NULL,
+                    attrid         TEXT,
+                    disc           TEXT DEFAULT NULL CHECK (disc REGEXP '^[A-Z0-9]+$'),
+
+                    min_kg_per_ha  INTEGER,
+                    max_kg_per_ha  INTEGER,
+                    penalty_amount INTEGER,
+
+                    CONSTRAINT pk_area_commitment_type PRIMARY KEY (vtrgid),
+                    CONSTRAINT sk_area_commitment_type_sort_attr UNIQUE (sortid, attrid, disc),
+                    CONSTRAINT fk_area_commitment_type_wine_variety FOREIGN KEY (sortid) REFERENCES wine_variety (sortid)
+                        ON UPDATE CASCADE
+                        ON DELETE RESTRICT,
+                    CONSTRAINT fk_area_commitment_type_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
+                        ON UPDATE CASCADE
+                        ON DELETE RESTRICT
+                ) STRICT;
+                """);
+            ExecuteNonQuery(cnx, """
+                INSERT INTO _area_commitment_type (vtrgid, sortid, attrid, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount)
+                SELECT vtrgid, sortid, attrid_1, disc, min_kg_per_ha, max_kg_per_ha, penalty_amount FROM area_commitment_type
+                """);
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
+            ExecuteNonQuery(cnx, "DROP TABLE area_commitment_type");
+            ExecuteNonQuery(cnx, "ALTER TABLE _area_commitment_type RENAME TO area_commitment_type");
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
+
+            ExecuteNonQuery(cnx, """
+            ALTER TABLE delivery_part ADD COLUMN attrid TEXT DEFAULT NULL
+                REFERENCES wine_attribute (attrid)
+                    ON UPDATE CASCADE
+                    ON DELETE RESTRICT
+            """);
+            ExecuteNonQuery(cnx, """
+                UPDATE delivery_part
+                SET attrid = (SELECT attrid
+                              FROM delivery_part_attribute a
+                              WHERE (delivery_part.year, delivery_part.did, delivery_part.dpnr) = (a.year, a.did, a.dpnr)
+                              ORDER BY attrid DESC
+                              LIMIT 1)
+                """);
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_i_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_u_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TRIGGER t_delivery_part_attribute_d_mtime_delivery_part");
+            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_attribute");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT p.year, p.did, p.dpnr,
+                       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                       m.mgnr, m.family_name, m.given_name,
+                       p.sortid, a.attrid,
+                       p.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,
+                       COALESCE(a.fill_lower_bins, 0) AS attribute_prio,
+                       GROUP_CONCAT(o.modid) AS modifiers,
+                       d.comment, p.comment AS part_comment
+                FROM delivery_part p
+                    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                    JOIN member m ON m.mgnr = d.mgnr
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+                GROUP BY p.year, p.did, p.dpnr
+                ORDER BY p.year, p.did, p.dpnr, o.modid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bin AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bin,
+                       SUM(weight) AS weight
+                FROM v_delivery
+                GROUP BY year, mgnr, bin
+                ORDER BY year, mgnr, LENGTH(bin) DESC, bin;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_stat_attr");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_stat_attr AS
+                SELECT year, attrid,
+                       SUM(weight) as sum,
+                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+                       COUNT(DISTINCT did) AS lieferungen,
+                       COUNT(DISTINCT mgnr) AS mitglieder
+                FROM v_delivery
+                GROUP BY year, attrid
+                ORDER BY year, attrid;
+                """);
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_stat_sort_attr");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_stat_sort_attr AS
+                SELECT year, sortid, attrid,
+                       SUM(weight) as sum,
+                       ROUND(SUM(kmw * weight) / SUM(weight), 2) AS kmw,
+                       ROUND(SUM(oe * weight) / SUM(weight), 1) AS oe,
+                       COUNT(DISTINCT did) AS lieferungen,
+                       COUNT(DISTINCT mgnr) AS mitglieder
+                FROM v_delivery
+                GROUP BY year, sortid, attrid
+                ORDER BY year, sortid, attrid;
+                """);
+        }
+
+        private static void UpdateDbSchema_5_To_6(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW IF EXISTS v_area_commitment");
+
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = ON");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute DROP COLUMN fill_lower_bins");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN strict INTEGER NOT NULL CHECK (strict IN (TRUE, FALSE)) DEFAULT FALSE");
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_attribute ADD COLUMN fill_lower INTEGER NOT NULL CHECK (fill_lower IN (0, 1, 2)) DEFAULT 0");
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery");
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery AS
+                SELECT p.year, p.did, p.dpnr,
+                       d.date, d.time, d.zwstid, d.lnr, d.lsnr,
+                       m.mgnr, m.family_name, m.given_name,
+                       p.sortid, a.attrid,
+                       p.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,
+                       IIF(a.strict, COALESCE(a.fill_lower, 0), 0) AS attribute_prio,
+                       GROUP_CONCAT(o.modid) AS modifiers,
+                       d.comment, p.comment AS part_comment
+                FROM delivery_part p
+                    JOIN delivery d ON (d.year, d.did) = (p.year, p.did)
+                    JOIN member m ON m.mgnr = d.mgnr
+                    LEFT JOIN wine_attribute a ON a.attrid = p.attrid
+                    LEFT JOIN delivery_part_modifier o ON (o.year, o.did, o.dpnr) = (p.year, p.did, p.dpnr)
+                GROUP BY p.year, p.did, p.dpnr
+                ORDER BY p.year, p.did, p.dpnr, o.modid;
+                """);
+            ExecuteNonQuery(cnx, "PRAGMA writable_schema = OFF");
+
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment_bin");
+            ExecuteNonQuery(cnx, "DROP VIEW v_delivery_bin");
+            ExecuteNonQuery(cnx, "DROP VIEW v_payment_bin");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type DROP COLUMN max_kg_per_ha");
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE area_commitment_type ADD COLUMN penalty_none INTEGER DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE wine_cultivation ADD COLUMN description TEXT DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE member ADD COLUMN organic INTEGER NOT NULL CHECK (organic IN (TRUE, FALSE)) DEFAULT FALSE");
+
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_ha INTEGER NOT NULL DEFAULT 10000");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_normal REAL NOT NULL DEFAULT 0.10");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN vat_flatrate REAL NOT NULL DEFAULT 0.13");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN min_kg_per_bs INTEGER NOT NULL DEFAULT 750");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN max_kg_per_bs INTEGER NOT NULL DEFAULT 3000");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_per_kg INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_amount INTEGER DEFAULT NULL");
+            ExecuteNonQuery(cnx, "ALTER TABLE season ADD COLUMN penalty_none INTEGER DEFAULT NULL");
+
+            ExecuteNonQuery(cnx, "DELETE FROM client_parameter WHERE param IN ('DELIVERY_RIGHT', 'DELIVERY_OBLIGATION', 'VAT_NORMAL', 'VAT_REDUCED', 'VAT_FLATRATE')");
+
+            ExecuteNonQuery(cnx, """
+                CREATE TABLE delivery_part_bucket (
+                    year     INTEGER NOT NULL,
+                    did      INTEGER NOT NULL,
+                    dpnr     INTEGER NOT NULL,
+                    bktnr    INTEGER NOT NULL,
+
+                    discr    TEXT    NOT NULL,
+                    value    INTEGER NOT NULL,
+
+                    CONSTRAINT pk_delivery_part_bucket PRIMARY KEY (year, did, dpnr, bktnr),
+                    CONSTRAINT fk_delivery_part_bucket_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_bucket (year, did, dpnr, bktnr, discr, value)
+                SELECT year, did, dpnr, binnr, discr, value
+                FROM delivery_part_bin
+                """);
+            ExecuteNonQuery(cnx, "DROP TABLE delivery_part_bin");
+
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bucket_strict AS
+                SELECT s.year, c.mgnr,
+                       t.sortid || COALESCE(a.attrid, '') AS bucket,
+                       t.sortid, a.attrid,
+                       CAST(ROUND(SUM(area) * COALESCE(t.min_kg_per_ha, 0) / 10000.0, 0) AS INTEGER) AS min_kg,
+                       CAST(ROUND(SUM(area) * MIN(COALESCE(a.max_kg_per_ha, s.max_kg_per_ha), s.max_kg_per_ha) / 10000.0, 0) AS INTEGER) AS max_kg,
+                       CAST(ROUND(SUM(area) * s.max_kg_per_ha / 10000.0, 0) AS INTEGER) AS upper_max_kg
+                FROM season s, area_commitment c
+                    JOIN area_commitment_type t ON t.vtrgid = c.vtrgid
+                    LEFT JOIN wine_attribute a ON a.attrid = t.attrid
+                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, bucket
+                ORDER BY s.year, c.mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_area_commitment_bucket AS
+                SELECT year, mgnr, bucket, min_kg, max_kg
+                FROM v_area_commitment_bucket_strict
+                WHERE attrid IS NOT NULL
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.min_kg) AS min_kg,
+                       SUM(b.upper_max_kg) AS max_kg
+                FROM v_area_commitment_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE a.strict IS NULL OR a.strict = FALSE
+                GROUP BY b.year, b.mgnr, b.sortid
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bucket_strict AS
+                SELECT year, mgnr,
+                       sortid || IIF(min_quw, COALESCE(attrid, ''), '_') AS bucket,
+                       sortid, IIF(min_quw, attrid, NULL) AS attrid,
+                       SUM(weight) AS weight,
+                       min_quw
+                FROM v_delivery
+                GROUP BY year, mgnr, bucket
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_delivery_bucket AS
+                SELECT year, mgnr, bucket, weight
+                FROM v_delivery_bucket_strict
+                WHERE attrid IS NOT NULL OR NOT min_quw
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.weight) AS weight
+                FROM v_delivery_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE min_quw AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY b.year, b.mgnr, b.sortid
+                ORDER BY year, mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bucket_strict AS
+                SELECT d.year, d.mgnr,
+                       d.sortid || b.discr AS bucket,
+                       d.sortid, IIF(b.discr IN ('', '_'), NULL, b.discr) AS attrid,
+                       SUM(b.value) AS weight,
+                       b.discr != '_' AS gebunden
+                FROM v_delivery d
+                    LEFT JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr)
+                GROUP BY d.year, d.mgnr, bucket
+                HAVING SUM(b.value) > 0
+                ORDER BY d.year, d.mgnr, bucket;
+                """);
+            ExecuteNonQuery(cnx, """
+                CREATE VIEW v_payment_bucket AS
+                SELECT year, mgnr, bucket, weight
+                FROM v_payment_bucket_strict
+                WHERE attrid IS NOT NULL OR NOT gebunden
+                UNION ALL
+                SELECT b.year, b.mgnr, b.sortid,
+                       SUM(b.weight) AS weight
+                FROM v_payment_bucket_strict b
+                    LEFT JOIN wine_attribute a ON a.attrid = b.attrid
+                WHERE gebunden AND (a.strict IS NULL OR a.strict = FALSE)
+                GROUP BY b.year, b.mgnr, b.sortid
+                ORDER BY year, mgnr, bucket;
+                """);
+        }
     }
 }

Elwig/Helpers/Billing/Billing.cs

@@ -11,14 +11,14 @@ namespace Elwig.Helpers.Billing {
         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;
+        protected readonly Dictionary<string, (string, string?, string?, int?, decimal?)> AreaComTypes;
 
         public Billing(int year) {
             Year = year;
             Context = new AppDbContext();
             Attributes = Context.WineAttributes.ToDictionary(a => a.AttrId, a => a.Name);
             Modifiers = Context.Modifiers.Where(m => m.Year == Year).ToDictionary(m => m.ModId, m => (m.Abs, m.Rel));
-            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId1, v.AttrId2, v.Discriminator, v.MinKgPerHa, v.MaxKgPerHa, v.PenaltyAmount));
+            AreaComTypes = Context.AreaCommitmentTypes.ToDictionary(v => v.VtrgId, v => (v.SortId, v.AttrId, v.Discriminator, v.MinKgPerHa, v.PenaltyAmount));
         }
 
         public async Task FinishSeason() {
@@ -33,34 +33,33 @@ namespace Elwig.Helpers.Billing {
             }
 
             using (var cmd = cnx.CreateCommand()) {
-                cmd.CommandText = $"DELETE FROM delivery_part_bin WHERE year = {Year}";
+                cmd.CommandText = $"DELETE FROM delivery_part_bucket 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();
+        public async Task CalculateBuckets(bool allowAttrsIntoLower, bool avoidUnderDeliveries, bool honorGebunden) {
+            var attrVals = Context.WineAttributes.ToDictionary(a => a.AttrId, a => (a.IsStrict, a.FillLower));
+            var attrForced = attrVals.Where(a => a.Value.IsStrict && a.Value.FillLower == 0).Select(a => a.Key).ToArray();
             using var cnx = await AppDbContext.ConnectAsync();
             await Context.GetMemberRightsAndObligations(Year, 0, cnx);
             var inserts = new List<(int, int, int, string, int)>();
 
-            var deliveries = new List<(int, int, int, string, int, double, string, string[], string[], bool?)>();
+            var deliveries = new List<(int, int, int, string, int, double, string, string?, string[], bool?)>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attributes, modifiers, gebunden
+                    SELECT mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, 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
+                             attribute_prio DESC, COALESCE(attrid, '~'), kmw DESC, lsnr, dpnr
                     """;
                 using 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(7) ? null : reader.GetString(7),
                         reader.IsDBNull(8) ? Array.Empty<string>() : reader.GetString(8).Split(",").Order().ToArray(),
                         reader.IsDBNull(9) ? null : reader.GetBoolean(9)
                     ));
@@ -70,7 +69,7 @@ namespace Elwig.Helpers.Billing {
             int lastMgNr = 0;
             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) {
+            foreach (var (mgnr, did, dpnr, sortid, weight, kmw, qualid, attrid, modifiers, gebunden) in deliveries) {
                 if (lastMgNr != mgnr) {
                     rightsAndObligations = await Context.GetMemberRightsAndObligations(Year, mgnr);
                     used = new();
@@ -87,29 +86,24 @@ namespace Elwig.Helpers.Billing {
                     continue;
                 }
 
-                if (attributes.Length > 2)
-                    throw new NotSupportedException();
-
                 int w = weight;
+                var attributes = attrid == null ? Array.Empty<string>() : new string[] { attrid };
+                var isStrict = attrid != null && attrVals[attrid].IsStrict;
                 foreach (var p in Utils.Permutate(attributes, attributes.Intersect(attrForced))) {
                     var c = p.Count();
                     var key = sortid + string.Join("", p);
                     if (rightsAndObligations.ContainsKey(key)) {
-                        int i = 4;
-                        if (c == 1) {
-                            i = (p.ElementAt(0) == attributes[0]) ? 2 : 3;
-                        } else if (c == 0) {
-                            i = 1;
-                        }
+                        int i = (c == 0) ? 1 : 2;
                         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;
+                        var v = (attributes.Length == c || attributes.Select(a => !attrVals[a].IsStrict ? 2 : attrVals[a].FillLower).Min() == 2) ? vr : vo;
                         used[key] = u + v;
+                        if (key.Length > 2 && !isStrict) used[key[..2]] = used.GetValueOrDefault(key[..2], 0) + v;
                         inserts.Add((did, dpnr, i, key[2..], v));
                         w -= v;
                     }
-                    if (w == 0 || !allowAttrsIntoLowerBins) break;
+                    if (w == 0 || (!allowAttrsIntoLower && isStrict)) break;
                 }
                 inserts.Add((did, dpnr, 0, "_", w));
                 lastMgNr = mgnr;
@@ -117,7 +111,7 @@ namespace Elwig.Helpers.Billing {
 
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    INSERT INTO delivery_part_bin (year, did, dpnr, binnr, discr, value)
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
                     VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
                     ON CONFLICT DO UPDATE
                     SET discr = excluded.discr, value = value + excluded.value
@@ -128,13 +122,15 @@ namespace Elwig.Helpers.Billing {
             if (!avoidUnderDeliveries)
                 return;
 
+            // FIXME avoidUnderDelivery-calculations not always right!
+
             var underDeliveries = new Dictionary<(int, string), int>();
             using (var cmd = cnx.CreateCommand()) {
                 cmd.CommandText = $"""
-                    SELECT c.mgnr, c.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
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 2 AND diff < 0
                     """;
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
@@ -142,21 +138,21 @@ namespace Elwig.Helpers.Billing {
                 }
             }
 
-            var fittingBins = new Dictionary<(int, string), int>();
+            var fittingBuckets = 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
+                    SELECT c.mgnr, c.bucket, COALESCE(p.weight, 0) - c.min_kg AS diff
+                    FROM v_area_commitment_bucket c
+                        LEFT JOIN v_payment_bucket p ON (p.year, p.mgnr, p.bucket) = (c.year, c.mgnr, c.bucket)
+                    WHERE c.year = {Year} AND LENGTH(c.bucket) = 3 AND diff > 0
                     """;
                 using var reader = await cmd.ExecuteReaderAsync();
                 while (await reader.ReadAsync()) {
-                    fittingBins[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
+                    fittingBuckets[(reader.GetInt32(0), reader.GetString(1))] = reader.GetInt32(2);
                 }
             }
 
-            foreach (var item in fittingBins) {
+            foreach (var item in fittingBuckets) {
                 var mgnr = item.Key.Item1;
                 var id = item.Key.Item2[..2];
                 var attr = item.Key.Item2[2..];
@@ -169,8 +165,8 @@ namespace Elwig.Helpers.Billing {
                     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}'
+                            JOIN delivery_part_bucket b ON (b.year, b.did, b.dpnr) = (d.year, d.did, d.dpnr) AND b.discr = '{attr}'
+                        WHERE d.year = {Year} AND mgnr = {mgnr} AND sortid = '{id}' AND attrid = '{attr}'
                         ORDER BY kmw ASC, lsnr DESC, d.dpnr DESC
                         """;
                     using var reader = await cmd.ExecuteReaderAsync();
@@ -181,19 +177,30 @@ namespace Elwig.Helpers.Billing {
                     }
                 }
 
-                var changes = new List<(int, int, int, int)>();
+                var negChanges = new List<(int, int, int, int)>();
+                var posChanges = new List<(int, int, int, int)>();
                 foreach (var (did, dpnr, _, w) in fittingDeliveries) {
                     int v = Math.Min(needed, w);
                     needed -= v;
-                    changes.Add((did, dpnr, 1, v));
-                    changes.Add((did, dpnr, 2, w - v));
+                    posChanges.Add((did, dpnr, 1, v));
+                    negChanges.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})"))}
+                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                        VALUES {string.Join(",\n       ", posChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
+                        ON CONFLICT DO UPDATE
+                        SET value = value + excluded.value
+                        """;
+                    await cmd.ExecuteNonQueryAsync();
+                }
+
+                using (var cmd = cnx.CreateCommand()) {
+                    cmd.CommandText = $"""
+                        INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                        VALUES {string.Join(",\n       ", negChanges.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '', {i.Item4})"))}
                         ON CONFLICT DO UPDATE
                         SET value = excluded.value
                         """;

Elwig/Helpers/ClientParameters.cs

@@ -15,6 +15,13 @@ namespace Elwig.Helpers {
         public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H";
         public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S";
 
+        public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
+        public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId);
+        public bool HasRebler() => HasRebler(App.ZwstId);
+        public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
+        public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
+        public bool HasKisten() => HasKisten(App.ZwstId);
+
         public string NameToken;
         public string NameShort;
         public string Name;
@@ -49,12 +56,6 @@ namespace Elwig.Helpers {
         public string? EmailAddress;
         public string? Website;
 
-        public int DeliveryObligation;
-        public int DeliveryRight;
-        public decimal VatNormal;
-        public decimal VatReduced;
-        public decimal VatFlatRate;
-
         public int ModeDeliveryNoteStats;
 
         public string? TextDeliveryNote;
@@ -86,12 +87,6 @@ namespace Elwig.Helpers {
                 Bic = parameters.GetValueOrDefault("CLIENT_BIC");
                 Iban = parameters.GetValueOrDefault("CLIENT_IBAN");
 
-                DeliveryObligation = int.Parse(parameters["DELIVERY_OBLIGATION"] ?? "");
-                DeliveryRight = int.Parse(parameters["DELIVERY_RIGHT"] ?? "");
-                VatNormal = decimal.Parse((parameters["VAT_NORMAL"] ?? "").Replace(".", ","));
-                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;
@@ -134,11 +129,6 @@ namespace Elwig.Helpers {
                 ("CLIENT_USTIDNR", UstIdNr),
                 ("CLIENT_BIC", Bic),
                 ("CLIENT_IBAN", Iban),
-                ("DELIVERY_OBLIGATION", DeliveryObligation.ToString()),
-                ("DELIVERY_RIGHT", DeliveryRight.ToString()),
-                ("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/NullItem.cs

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

Elwig/Helpers/Printing/Html.cs

@@ -2,7 +2,7 @@ using RazorLight;
 using System;
 using System.Threading.Tasks;
 
-namespace Elwig.Documents {
+namespace Elwig.Helpers.Printing {
     public static class Html {
 
         private static RazorLightEngine? Engine = null;

Elwig/Helpers/Printing/Pdf.cs

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

Elwig/Helpers/TempFile.cs

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

Elwig/Models/AreaComType.cs

@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId1", "AttrId2", "Discriminator")]
+    [Table("area_commitment_type"), PrimaryKey("VtrgId"), Index("SortId", "AttrId", "Discriminator", IsUnique = true)]
     public class AreaComType {
         [Column("vtrgid")]
         public string VtrgId { get; set; }
@@ -12,11 +12,8 @@ namespace Elwig.Models {
         [Column("sortid")]
         public string SortId { get; set; }
 
-        [Column("attrid_1")]
-        public string? AttrId1 { get; set; }
-
-        [Column("attrid_2")]
-        public string? AttrId2 { get; set; }
+        [Column("attrid")]
+        public string? AttrId { get; set; }
 
         [Column("disc")]
         public string? Discriminator { get; set; }
@@ -24,29 +21,37 @@ namespace Elwig.Models {
         [Column("min_kg_per_ha")]
         public int? MinKgPerHa { get; set; }
 
-        [Column("max_kg_per_ha")]
-        public int? MaxKgPerHa { get; set; }
+        [Column("penalty_per_kg")]
+        public long? PenaltyPerKgValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerKg {
+            get => PenaltyPerKgValue != null ? Utils.DecFromDb(PenaltyPerKgValue.Value, 4) : null;
+            set => PenaltyPerKgValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
 
         [Column("penalty_amount")]
         public long? PenaltyAmoutValue { get; set; }
-
         [NotMapped]
         public decimal? PenaltyAmount {
             get => PenaltyAmoutValue != null ? Utils.DecFromDb(PenaltyAmoutValue.Value, 4) : null;
             set => PenaltyAmoutValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
         }
 
+        [Column("penalty_none")]
+        public long? PenaltyNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyNone {
+            get => PenaltyNoneValue != null ? Utils.DecFromDb(PenaltyNoneValue.Value, 4) : null;
+            set => PenaltyNoneValue = value != null ? Utils.DecToDb(value.Value, 4) : null;
+        }
+
         [ForeignKey("SortId")]
         public virtual WineVar WineVar { get; private set; }
 
-        [ForeignKey("AttrId1")]
-        public virtual WineAttr? WineAttr1 { get; private set; }
-
-        [ForeignKey("AttrId2")]
-        public virtual WineAttr? WineAttr2 { get; private set; }
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? WineAttr { get; private set; }
 
         [NotMapped]
-        public string DisplayName => WineVar.Name + (WineAttr1 != null ? $" {WineAttr1.Name}" : "") +
-            (WineAttr2 != null ? $" {WineAttr2.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
+        public string DisplayName => WineVar.Name + (WineAttr != null ? $" {WineAttr.Name}" : "") + (Discriminator != null ? $" ({Discriminator})" : "");
     }
 }

Elwig/Models/Branch.cs

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

Elwig/Models/DeliveryPart.cs

@@ -25,6 +25,12 @@ namespace Elwig.Models {
         [ForeignKey("SortId")]
         public virtual WineVar Variant { get; private set; }
 
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
         [Column("weight")]
         public int Weight { get; set; }
 
@@ -96,15 +102,6 @@ namespace Elwig.Models {
         [Column("comment")]
         public string? Comment { get; set; }
 
-        [InverseProperty("Part")]
-        public virtual ISet<DeliveryPartAttr> PartAttributes { get; private set; }
-
-        [NotMapped]
-        public IEnumerable<WineAttr> Attributes => PartAttributes.Select(a => a.Attr);
-
-        [NotMapped]
-        public string AttributesString => string.Join(" / ", Attributes);
-
         [InverseProperty("Part")]
         public virtual ISet<DeliveryPartModifier> PartModifiers { get; private set; }
 
@@ -118,6 +115,6 @@ namespace Elwig.Models {
         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; }
+        public virtual ISet<DeliveryPartBucket> Buckets { get; private set; }
     }
 }

Elwig/Models/DeliveryPartAttr.cs

@@ -1,25 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Elwig.Models {
-    [Table("delivery_part_attribute"), PrimaryKey("Year", "DId", "DPNr", "AttrId")]
-    public class DeliveryPartAttr {
-        [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("attrid")]
-        public string AttrId { get; set; }
-
-        [ForeignKey("AttrId")]
-        public virtual WineAttr Attr { get; private set; }
-    }
-}

Elwig/Models/DeliveryPartBucket.cs

@@ -2,8 +2,8 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models {
-    [Table("delivery_part_bin"), PrimaryKey("Year", "DId", "DPNr", "BinNr")]
-    public class DeliveryPartBin {
+    [Table("delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr")]
+    public class DeliveryPartBucket {
         [Column("year")]
         public int Year { get; set; }
 
@@ -13,8 +13,8 @@ namespace Elwig.Models {
         [Column("dpnr")]
         public int DPNr { get; set; }
 
-        [Column("binnr")]
-        public int BinNr { get; set; }
+        [Column("bktnr")]
+        public int BktNr { get; set; }
 
         [Column("discr")]
         public string Discr { get; set; }

Elwig/Models/Member.cs

@@ -104,6 +104,9 @@ namespace Elwig.Models {
         [Column("buchführend")]
         public bool IsBuchführend { get; set; }
 
+        [Column("organic")]
+        public bool IsOrganic { get; set; }
+
         [Column("funktionär")]
         public bool IsFunktionär { get; set; }
 
@@ -176,9 +179,6 @@ namespace Elwig.Models {
 
         public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";
 
-        public int DeliveryRight => BusinessShares * App.Client.DeliveryRight;
-        public int DeliveryObligation => BusinessShares * App.Client.DeliveryObligation;
-
         public int SearchScore(IEnumerable<string> keywords) {
             return Utils.GetSearchScore(new string?[] {
                 MgNr.ToString(),

Elwig/Models/PaymentDeliveryPartBucket.cs

@@ -2,8 +2,8 @@ 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 {
+    [Table("payment_delivery_part_bucket"), PrimaryKey("Year", "DId", "DPNr", "BktNr", "AvNr")]
+    public class PaymentDeliveryPartBucket {
         [Column("year")]
         public int Year { get; set; }
 
@@ -13,8 +13,8 @@ namespace Elwig.Models {
         [Column("dpnr")]
         public int DPNr { get; set; }
 
-        [Column("binnr")]
-        public int BinNr { get; set; }
+        [Column("bktnr")]
+        public int BktNr { get; set; }
 
         [Column("avnr")]
         public int AvNr { get; set; }

Elwig/Models/Season.cs

@@ -16,17 +16,52 @@ namespace Elwig.Models {
         [Column("precision")]
         public byte Precision { get; set; }
 
+        [Column("max_kg_per_ha")]
+        public int MaxKgPerHa { get; set; }
+
+        [Column("vat_normal")]
+        public double VatNormal { get; set; }
+
+        [Column("vat_flatrate")]
+        public double VatFlatrate { get; set; }
+
+        [Column("min_kg_per_bs")]
+        public int MinKgPerBusinessShare { get; set; }
+
+        [Column("max_kg_per_bs")]
+        public int MaxKgPerBusinessShare { get; set; }
+
+        [Column("penalty_per_kg")]
+        public long? PenaltyPerKgValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyPerKg {
+            get => PenaltyPerKgValue != null ? DecFromDb(PenaltyPerKgValue.Value) : null;
+            set => PenaltyPerKgValue = value != null ? DecToDb(value.Value) : null;
+        }
+
+        [Column("penalty_amount")]
+        public long? PenaltyAmoutValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyAmount {
+            get => PenaltyAmoutValue != null ? DecFromDb(PenaltyAmoutValue.Value) : null;
+            set => PenaltyAmoutValue = value != null ? DecToDb(value.Value) : null;
+        }
+
+        [Column("penalty_none")]
+        public long? PenaltyNoneValue { get; set; }
+        [NotMapped]
+        public decimal? PenaltyNone {
+            get => PenaltyNoneValue != null ? DecFromDb(PenaltyNoneValue.Value) : null;
+            set => PenaltyNoneValue = value != null ? DecToDb(value.Value) : null;
+        }
+
         [Column("start_date")]
         public string? StartDateString { get; set; }
 
         [NotMapped]
         public DateOnly? StartDate {
-            get {
-                return StartDateString != null ? DateOnly.ParseExact(StartDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                StartDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => StartDateString != null ? DateOnly.ParseExact(StartDateString, "yyyy-MM-dd") : null;
+            set => StartDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [Column("end_date")]
@@ -34,12 +69,8 @@ namespace Elwig.Models {
 
         [NotMapped]
         public DateOnly? EndDate {
-            get {
-                return EndDateString != null ? DateOnly.ParseExact(EndDateString, "yyyy-MM-dd") : null;
-            }
-            set {
-                EndDateString = value?.ToString("yyyy-MM-dd");
-            }
+            get => EndDateString != null ? DateOnly.ParseExact(EndDateString, "yyyy-MM-dd") : null;
+            set => EndDateString = value?.ToString("yyyy-MM-dd");
         }
 
         [ForeignKey("CurrencyCode")]

Elwig/Models/WineAttr.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("wine_attribute"), PrimaryKey("AttrId")]
+    [Table("wine_attribute"), PrimaryKey("AttrId"), Index("Name", IsUnique = true)]
     public class WineAttr {
         [Column("attrid")]
         public string AttrId { get; set; }
@@ -10,14 +11,18 @@ namespace Elwig.Models {
         [Column("name")]
         public string Name { get; set; }
 
+        [Column("active")]
+        public bool IsActive { get; set; }
+
         [Column("max_kg_per_ha")]
         public int? MaxKgPerHa { get; set; }
 
-        [Column("fill_lower_bins")]
-        public int FillLowerBins { get; set; }
+        [Column("strict")]
+        public bool IsStrict { get; set; }
+
+        [Column("fill_lower")]
+        public int FillLower { get; set; }
 
-        [Column("active")]
-        public bool IsActive { get; set; }
         public override string ToString() {
             return Name;
         }

Elwig/Models/WineCult.cs

@@ -1,13 +1,17 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
+using IndexAttribute = Microsoft.EntityFrameworkCore.IndexAttribute;
 
 namespace Elwig.Models {
-    [Table("wine_cultivation"), PrimaryKey("CultId")]
+    [Table("wine_cultivation"), PrimaryKey("CultId"), Index("Name", IsUnique = true)]
     public class WineCult {
         [Column("cultid")]
         public string CultId { get; set; }
 
         [Column("name")]
         public string Name { get; set; }
+
+        [Column("description")]
+        public string Description { get; set; }
     }
 }

Elwig/Windows/AdministrationWindow.cs

@@ -83,7 +83,7 @@ namespace Elwig.Windows {
 
         private void OnClosing(object? sender, CancelEventArgs evt) {
             if ((IsCreating || IsEditing) && HasChanged) {
-                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schlie<EFBFBD>en best<EFBFBD>tigen",
+                var r = System.Windows.MessageBox.Show("Soll das Fenster wirklich geschlossen werden?", "Schließen bestätigen",
                     MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
                 if (r != MessageBoxResult.Yes) {
                     evt.Cancel = true;
@@ -252,9 +252,9 @@ namespace Elwig.Windows {
             foreach (var ccb in CheckComboBoxInputs)
                 ccb.SelectedItems.Clear();
             foreach (var cb in CheckBoxInputs)
-                cb.IsChecked = false;
+                cb.IsChecked = cb.IsThreeState ? null : false;
             foreach (var rb in RadioButtonInputs)
-                rb.IsChecked = false;
+                rb.IsChecked = rb.IsThreeState ? null : false;
             if (validate) ValidateRequiredInputs();
         }
 

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/AreaComAdminWindow.xaml.cs

@@ -24,7 +24,7 @@ namespace Elwig.Windows {
                 AreaCommitmentResetButton, AreaCommitmentCancelButton
             };
             RequiredInputs = new Control[] {
-                FbNrInput, YearFromInput, KgInput,
+                FbNrInput, YearFromInput, KgInput, RdInput,
                 GstNrInput, AreaInput, AreaComTypeInput, WineCultivationInput
             };
         }
@@ -281,10 +281,10 @@ namespace Elwig.Windows {
             if (KgInput.SelectedItem is AT_Kg curr_kg) {
                 var rdList = await Context.WbRde.Where(r => r.KgNr == curr_kg.KgNr).OrderBy(r => r.Name).Cast<object>().ToListAsync();
                 rdList.Insert(0, new NullItem());
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr);
+                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
             } else {
                 var rdList = new object[] { new NullItem() };
-                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr);
+                ControlUtils.RenewItemsSource(RdInput, rdList, i => (i as WbRd)?.RdNr, null, ControlUtils.RenewSourceDefault.First);
             }
             ComboBox_SelectionChanged(sender, evt);
         }

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -271,10 +271,10 @@
                               ItemTemplate="{StaticResource WineVarietyTemplate}" TextSearch.TextPath="Name" 
                               SelectionChanged="WineVarietyInput_SelectionChanged" KeyUp="Input_KeyUp"/>
 
-                    <Label Content="Attribute:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <xctk:CheckComboBox x:Name="AttributesInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
-                                        DisplayMemberPath="Name" Delimiter=", " AllItemsSelectedContent="Alle"
-                                        ItemSelectionChanged="AttributesInput_SelectionChanged" KeyUp="Input_KeyUp"/>
+                    <Label Content="Attribut:" Margin="10,40,0,0" Grid.Column="0"/>
+                    <ComboBox x:Name="AttributeInput" Grid.Row="1" Grid.Column="1" Margin="0,40,10,10"
+                              DisplayMemberPath="Name"
+                              SelectionChanged="AttributeInput_SelectionChanged" KeyUp="Input_KeyUp"/>
                 </Grid>
             </GroupBox>
 
@@ -327,7 +327,7 @@
 
                     <CheckBox x:Name="GerebeltGewogenInput" Content="Gerebelt gewogen"
                               VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                              Checked="GerebeltGewogenInput_Changed" Unchecked="GerebeltGewogenInput_Changed"/>
 
                     <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
                             Click="WeighingButton_Click"
@@ -383,7 +383,7 @@
                               Checked="LesewagenInput_Changed" Unchecked="LesewagenInput_Changed"/>
                     <CheckBox x:Name="HandPickedInput" Content="Handlese" Margin="10,105,0,0" Grid.Column="2" IsThreeState="True"
                               VerticalAlignment="Top" HorizontalAlignment="Left"
-                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+                              Checked="HandPickedInput_Changed" Unchecked="HandPickedInput_Changed"/>
                 </Grid>
             </GroupBox>
 
@@ -403,7 +403,7 @@
                                     <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
                                     <TextBlock Text="{Binding QualId}" Width="30"/>
                                     <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding AttributesString}" Width="100"/>
+                                    <TextBlock Text="{Binding Attribute.Name}" Width="100"/>
                                 </StackPanel>
                             </DataTemplate>
                         </ListBox.ItemTemplate>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -208,6 +208,36 @@ namespace Elwig.Windows {
             }
         }
 
+        private void InitialDefaultInputs() {
+            if (App.Client.HasRebler(BranchInput.SelectedValue as Branch)) {
+                GerebeltGewogenInput.IsEnabled = false;
+                SetDefaultValue(GerebeltGewogenInput, true);
+            } else {
+                GerebeltGewogenInput.IsEnabled = true;
+                UnsetDefaultValue(GerebeltGewogenInput);
+            }
+
+            if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) {
+                LesewagenInput.IsEnabled = false;
+                SetDefaultValue(LesewagenInput, false);
+                HandPickedInput.IsThreeState = false;
+                UnsetDefaultValue(HandPickedInput);
+            } else {
+                LesewagenInput.IsEnabled = true;
+                UnsetDefaultValue(LesewagenInput);
+                HandPickedInput.IsThreeState = true;
+                SetDefaultValue(HandPickedInput, null);
+            }
+
+            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+                GebundenInput.IsEnabled = false;
+                SetDefaultValue(GebundenInput, null);
+            } else {
+                GebundenInput.IsEnabled = true;
+                UnsetDefaultValue(GebundenInput);
+            }
+        }
+
         private void InitialInputs() {
             LastScaleError = null;
             WeighingId = null;
@@ -217,29 +247,13 @@ namespace Elwig.Windows {
             ClearOriginalValues();
             ClearDefaultValues();
 
-            HandPickedInput.IsChecked = null;
-            if (App.Client.IsMatzen || App.Client.IsWolkersdorf) {
-                GerebeltGewogenInput.IsChecked = true;
-                GerebeltGewogenInput.IsEnabled = false;
-                SetDefaultValue(GerebeltGewogenInput);
-            } else {
-                GerebeltGewogenInput.IsChecked = false;
-                GerebeltGewogenInput.IsEnabled = true;
-                UnsetDefaultValue(GerebeltGewogenInput);
-            }
-            if (App.Client.IsMatzen || App.Client.IsWinzerkeller) {
+            GerebeltGewogenInput.IsChecked = App.Client.HasRebler(BranchInput.SelectedValue as Branch);
+            LesewagenInput.IsChecked = false;
+            HandPickedInput.IsChecked = App.Client.HasKisten(BranchInput.SelectedValue as Branch) ? true : null;
             GebundenInput.IsChecked = null;
-                GebundenInput.IsEnabled = false;
-                SetDefaultValue(GebundenInput);
-            } else {
-                GebundenInput.IsChecked = null;
-                GebundenInput.IsEnabled = true;
-                UnsetDefaultValue(GebundenInput);
-            }
+            InitialDefaultInputs();
 
             WineQualityLevelInput.IsEnabled = false;
-
-            SetDefaultValue(HandPickedInput);
             ValidateRequiredInputs();
         }
 
@@ -266,7 +280,7 @@ namespace Elwig.Windows {
             if (ctrl == MgNrInput || ctrl == MemberInput) {
                 SortIdInput.Focus();
                 SortIdInput.SelectAll();
-            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributesInput) {
+            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributeInput) {
                 GradationOeInput.Focus();
                 GradationOeInput.SelectAll();
             } else if (ctrl == GradationKmwInput || ctrl == GradationOeInput || ctrl == WineQualityLevelInput) {
@@ -318,7 +332,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);
@@ -472,12 +486,8 @@ namespace Elwig.Windows {
                 if (filterNotVar.Count > 0) dpq = dpq.Where(p => !filterNotVar.Contains(p.SortId));
                 if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId));
                 if (filterZwst.Count > 0) dpq = dpq.Where(p => filterZwst.Contains(p.Delivery.ZwstId));
-                if (filterAttr.Count > 0)
-                    foreach (var a in filterAttr)
-                        dpq = dpq.Where(p => p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
-                if (filterNotAttr.Count > 0)
-                    foreach (var a in filterNotAttr)
-                        dpq = dpq.Where(p => !p.PartAttributes.Select(a => a.Attr.AttrId).Contains(a));
+                if (filterAttr.Count > 0) dpq = dpq.Where(p => p.AttrId != null && filterAttr.Contains(p.AttrId));
+                if (filterNotAttr.Count > 0) dpq = dpq.Where(p => p.AttrId == null || !filterAttr.Contains(p.AttrId));
                 if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt);
                 if (filterKmwLt > 0) dpq = dpq.Where(p => p.Kmw < filterKmwLt);
                 if (filterOeGt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
@@ -556,7 +566,7 @@ namespace Elwig.Windows {
                 if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
                     var parts = await deliveryParts.ToListAsync();
                     var groups = parts
-                        .GroupBy(p => string.Join("/", p.Attributes.Select(a => a.Name)))
+                        .GroupBy(p => p.Attribute?.Name)
                         .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
                         .OrderByDescending(g => g.Item2)
                         .ToList();
@@ -622,7 +632,9 @@ namespace Elwig.Windows {
             ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsCreating).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
             ControlUtils.RenewItemsSource(WineVarietyInput, await Context.WineVarieties.OrderBy(v => v.Name).ToListAsync(), i => (i as WineVar)?.SortId);
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => !IsCreating || a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            var attrList = await Context.WineAttributes.Where(a => !IsCreating || a.IsActive).OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem(""));
+            ControlUtils.RenewItemsSource(AttributeInput, attrList, i => (i as WineAttr)?.AttrId, null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(WineQualityLevelInput, await Context.WineQualityLevels.ToListAsync(), i => (i as WineQualLevel)?.QualId);
             ControlUtils.RenewItemsSource(ModifiersInput, await Context.Modifiers.Where(m => m.Year == y).OrderBy(m => m.Ordering).ToListAsync(), i => (i as Modifier)?.ModId);
             ControlUtils.RenewItemsSource(WineOriginInput, (await Context.WineOrigins.ToListAsync()).OrderByDescending(o => o.SortKey).ThenBy(o => o.HkId), i => (i as WineOrigin)?.HkId);
@@ -696,7 +708,7 @@ namespace Elwig.Windows {
             ClearDefaultValues();
 
             SortIdInput.Text = p?.SortId ?? "";
-            ControlUtils.SelectCheckComboBoxItems(AttributesInput, p?.Attributes, i => (i as WineAttr)?.AttrId);
+            ControlUtils.SelectComboBoxItem(AttributeInput, p?.Attribute, i => (i as WineAttr)?.AttrId);
             GradationKmwInput.Text = (p != null) ? $"{p.Kmw:N1}" : "";
             ControlUtils.SelectComboBoxItem(WineQualityLevelInput, q => (q as WineQualLevel)?.QualId, p?.QualId);
             ControlUtils.SelectComboBoxItem(WineKgInput, k => (k as AT_Kg)?.KgNr, p?.KgNr);
@@ -760,6 +772,7 @@ namespace Elwig.Windows {
             d.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
 
             p.SortId = (WineVarietyInput.SelectedItem as WineVar)?.SortId;
+            p.AttrId = (AttributeInput.SelectedItem as WineAttr)?.AttrId;
             p.Kmw = double.Parse(GradationKmwInput.Text);
             p.QualId = (WineQualityLevelInput.SelectedItem as WineQualLevel)?.QualId;
             p.HkId = (WineOriginInput.SelectedItem as WineOrigin)?.HkId;
@@ -791,7 +804,6 @@ namespace Elwig.Windows {
                     pEntry = partNew ? await Context.AddAsync(p) : Context.Update(p);
                 }
 
-                await Context.UpdateDeliveryPartAttributes(p, AttributesInput.SelectedItems.Cast<WineAttr>());
                 await Context.UpdateDeliveryPartModifiers(p, ModifiersInput.SelectedItems.Cast<Modifier>());
 
                 if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
@@ -999,7 +1011,9 @@ namespace Elwig.Windows {
                 if (r != MessageBoxResult.Yes) return;
             }
 
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            var attrList = await Context.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem(""));
+            ControlUtils.RenewItemsSource(AttributeInput, attrList, i => (i as WineAttr)?.AttrId, null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             if (DeliveryList.SelectedItem is not Delivery d) {
                 // switch away from creating mode
@@ -1025,7 +1039,9 @@ namespace Elwig.Windows {
         private async void NewDeliveryButton_Click(object? sender, RoutedEventArgs? evt) {
             TodayOnlyInput.IsChecked = true;
             SearchInput.Text = "";
-            ControlUtils.RenewItemsSource(AttributesInput, await Context.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).ToListAsync(), i => (i as WineAttr)?.AttrId);
+            var attrList = await Context.WineAttributes.Where(a => a.IsActive).OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem(""));
+            ControlUtils.RenewItemsSource(AttributeInput, attrList, i => (i as WineAttr)?.AttrId, null, ControlUtils.RenewSourceDefault.First);
             ControlUtils.RenewItemsSource(MemberInput, await Context.Members.Where(m => m.IsActive || !IsReceipt).OrderBy(m => m.FamilyName).ThenBy(m => m.GivenName).ToListAsync(), i => (i as Member)?.MgNr);
             IsCreating = true;
             DeliveryList.IsEnabled = false;
@@ -1070,7 +1086,6 @@ namespace Elwig.Windows {
                     p2.HkId = "OEST";
                     entry2 = await Context.AddAsync(p2);
 
-                    await Context.UpdateDeliveryPartAttributes(p2, p.Attributes);
                     await Context.UpdateDeliveryPartModifiers(p2, p.Modifiers);
                 }
                 await Context.SaveChangesAsync();
@@ -1393,14 +1408,17 @@ namespace Elwig.Windows {
             }
         }
 
-        private void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+        private async void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
             base.DateInput_TextChanged(sender, evt);
-            if (IsEditing ||  IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+            if (IsEditing || IsCreating) await UpdateLsNr();
         }
 
-        private void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
+        private async void BranchInput_SelectionChanged(object sender, RoutedEventArgs evt) {
             base.ComboBox_SelectionChanged(sender, evt);
-            if (IsEditing || IsCreating) UpdateLsNr().GetAwaiter().GetResult();
+            if (IsEditing || IsCreating) {
+                await UpdateLsNr();
+                InitialDefaultInputs();
+            }
         }
 
         private void UpdateWineVariety(bool valid) {
@@ -1408,13 +1426,12 @@ namespace Elwig.Windows {
                 var text = SortIdInput.Text;
                 WineVarietyInput.SelectedItem = Context.WineVarieties.Find(text[0..2]);
                 if (text.Length >= 3) {
-                    AttributesInput.UnSelectAll();
-                    AttributesInput.SelectedItems.Add(Context.WineAttributes.Find(text[2..]));
+                    ControlUtils.SelectComboBoxItem(AttributeInput, Context.WineAttributes.Find(text[2..]), a => (a as WineAttr)?.AttrId);
                     SortIdInput.Text = text[0..2];
                 }
             } else {
                 WineVarietyInput.SelectedItem = null;
-                AttributesInput.UnSelectAll();
+                AttributeInput.SelectedIndex = 0;
             }
         }
 
@@ -1491,7 +1508,7 @@ namespace Elwig.Windows {
                 GradationKmwInput.Text += ",0";
         }
 
-        private void AttributesInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) {
+        private void AttributeInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
 
         }
 
@@ -1587,5 +1604,19 @@ namespace Elwig.Windows {
             }
             InputLostFocus(tb, Validator.CheckDecimal(tb, false, 2, 1));
         }
+
+        private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
+            if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) {
+                HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
+            }
+            CheckBox_Changed(sender, evt);
+        }
+
+        private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
+            if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) {
+                GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
+            }
+            CheckBox_Changed(sender, evt);
+        }
     }
 }

Elwig/Windows/DeliveryConfirmationsWindow.xaml

@@ -1,13 +1,12 @@
-<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsDialog"
+<local:ContextWindow x:Class="Elwig.Dialogs.DeliveryConfirmationsWindow"
                      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">
+                     Title="Anlieferungsbestätingungen - Elwig" Height="500" Width="800" MinHeight="400" MinWidth="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">
@@ -24,6 +23,8 @@
         <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
                  HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
 
+        <ProgressBar x:Name="ProgressBar" Margin="10,10,10,106" Height="27" Width="180"
+                     VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
         <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"/>

Elwig/Windows/DeliveryConfirmationsWindow.xaml.cs

@@ -10,17 +10,19 @@ using System.Windows;
 using System.Windows.Input;
 
 namespace Elwig.Dialogs {
-    public partial class DeliveryConfirmationsDialog : ContextWindow {
+    public partial class DeliveryConfirmationsWindow : ContextWindow {
 
         public readonly int Year;
 
-        public DeliveryConfirmationsDialog(int year) {
+        public DeliveryConfirmationsWindow(int year) {
             InitializeComponent();
             Year = year;
             Title = $"Anlieferungsbestätigungen - Lese {Year} - Elwig";
             TextElement.Text = App.Client.TextDeliveryConfirmation;
             if (!App.Config.Debug) {
                 TestButton.Visibility = Visibility.Hidden;
+                var m = ProgressBar.Margin;
+                ProgressBar.Margin = new(m.Left, m.Top, m.Right, m.Bottom - 32);
             }
         }
 
@@ -82,8 +84,24 @@ namespace Elwig.Dialogs {
                 list = list.Where((_, n) => n % 10 == r);
             }
 
-            using var doc = await Document.Merge(list.Select(m => new DeliveryConfirmation(Context, Year, m))); ;
-            await doc.Generate();
+            var deliveries = await Context.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 = {Year}
+                ORDER BY v.sortid, v.abgewertet ASC, v.attribute_prio DESC, COALESCE(v.attrid, '~'), v.kmw DESC, v.lsnr, v.dpnr
+                """)
+                .ToListAsync();
+
+            using var doc = Document.Merge(list.Select(m =>
+                new DeliveryConfirmation(Context, Year, m, deliveries.Where(d => d.Delivery.MgNr == m.MgNr).ToList()) {
+                    //DoubleSided = true
+                }
+            ));
+            //doc.DoubleSided = true;
+            await doc.Generate(new Progress<double>(v => {
+                ProgressBar.Value = v;
+            }));
             Mouse.OverrideCursor = null;
 
             if (mode < 2) {

Elwig/Windows/MainWindow.xaml

@@ -30,7 +30,7 @@
                 <ColumnDefinition Width="100"/>
                 <ColumnDefinition Width="*"/>
             </Grid.ColumnDefinitions>
-            <Image Source="/elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
+            <Image Source="\Resources\Images\Elwig.png" RenderOptions.BitmapScalingMode="HighQuality" Grid.Column="0"
                    HorizontalAlignment="Left" Margin="5,5,5,5" VerticalAlignment="Top"/>
             <TextBlock Grid.Column="1" FontSize="32" HorizontalAlignment="Left" Margin="0,5,0,0" VerticalAlignment="Top">
                 Elwig

Elwig/Windows/MainWindow.xaml.cs

@@ -7,7 +7,7 @@ namespace Elwig.Windows {
         public MainWindow() {
             InitializeComponent();
             var v = Assembly.GetExecutingAssembly().GetName().Version;
-            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}");
+            VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}";
             if (!App.Config.Debug) {
                 TestWindowButton.Visibility = Visibility.Hidden;
                 //QueryWindowButton.Visibility = Visibility.Hidden;

Elwig/Windows/MemberAdminWindow.xaml.cs

@@ -317,7 +317,7 @@ namespace Elwig.Windows {
                         .ThenBy(m => m.MgNr);
                     break;
             }
-            using var doc = await Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
+            using var doc = Document.Merge((await members.ToListAsync()).Select(m => new Letterhead(m)));
             await doc.Generate();
             Mouse.OverrideCursor = null;
             if (App.Config.Debug) {

Elwig/Windows/QueryWindow.xaml.cs

@@ -44,7 +44,7 @@ namespace Elwig.Windows {
             for (int i = 0; i < header.Count; i++) {
                 var h = header[i];
                 DataList.Columns.Add(new DataGridTextColumn {
-                    Header = h.ColumnName,
+                    Header = h.ColumnName.Replace("_", "__"),
                     Binding = new Binding($"[{i}]"),
                     CellStyle = (h.DataTypeName == "INTEGER" || h.DataTypeName == "REAL") ? styleRight : null,
                 });

Elwig/Windows/SeasonFinishWindow.xaml

@@ -24,12 +24,12 @@
                             Margin="110,40,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
                             ValueChanged="SeasonInput_ValueChanged"/>
 
-        <Button x:Name="CalculateBinsButton" Content="Aufteilung Berechnen"
-                Click="CalculateBinsButton_Click"
+        <Button x:Name="CalculateBucketsButton" Content="Aufteilung Berechnen"
+                Click="CalculateBucketsButton_Click"
                 Margin="50,80,0,0"/>
-        <CheckBox x:Name="AllowAttrIntoLowerBinsInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen" IsChecked="True"
+        <CheckBox x:Name="AllowAttrIntoLowerInput" Content="Erlauben Lieferungen auch auf (konfigurierte) &quot;schlechtere&quot; Flächenbindungen aufzuteilen"
                   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"
+        <CheckBox x:Name="AvoidUnderDeliveriesInput" Content="Unterlieferungen durch Abzug bei &quot;besseren&quot; Flächenbindungen vermeiden"
                   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>

Elwig/Windows/SeasonFinishWindow.xaml.cs

@@ -1,6 +1,10 @@
 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;
@@ -24,34 +28,123 @@ namespace Elwig.Windows {
             var s1 = await Context.Seasons.FindAsync(SeasonInput.Value + 1);
             var valid = (s0 != null);
             var last = (s1 == null);
-            CalculateBinsButton.IsEnabled = valid && last;
+            CalculateBucketsButton.IsEnabled = valid && last;
             DeliveryConfirmationButton.IsEnabled = valid;
             OverUnderDeliveryButton.IsEnabled = valid;
         }
 
-        private async void CalculateBinsButton_Click(object sender, RoutedEventArgs evt) {
+        private async void CalculateBucketsButton_Click(object sender, RoutedEventArgs evt) {
             if (SeasonInput.Value is not int year)
                 return;
-            CalculateBinsButton.IsEnabled = false;
+            CalculateBucketsButton.IsEnabled = false;
             Mouse.OverrideCursor = Cursors.AppStarting;
             var b = new Billing(year);
             await b.FinishSeason();
-            await b.CalculateBins(
-                AllowAttrIntoLowerBinsInput.IsChecked ?? false,
+            await b.CalculateBuckets(
+                AllowAttrIntoLowerInput.IsChecked ?? false,
                 AvoidUnderDeliveriesInput.IsChecked ?? false,
                 HonorGebundenInput.IsChecked ?? false);
             Mouse.OverrideCursor = null;
-            CalculateBinsButton.IsEnabled = true;
+            CalculateBucketsButton.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();
+            var w = new DeliveryConfirmationsWindow(year);
+            w.Show();
         }
 
-        private void OverUnderDeliveryButton_Click(object sender, RoutedEventArgs evt) {
+        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.bucket, 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_bucket c ON c.mgnr = m.mgnr AND c.year = {year}
+                        LEFT JOIN v_payment_bucket b ON (b.mgnr, b.bucket) = (m.mgnr, c.bucket) AND b.year = {year}
+                    WHERE m.active = 1 AND b.weight < c.min_kg
+                    ORDER BY m.mgnr, c.bucket
+                    """;
+                    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) {

Elwig/fetch-resources.bat

@@ -3,3 +3,4 @@
 mkdir "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.css "C:\ProgramData\Elwig\resources"
 copy /b /y Documents\*.cshtml "C:\ProgramData\Elwig\resources"
+::copy /b /y ..\Installer\Files\*.exe "C:\Program Files\Elwig\"

Installer/MainComponents.wxs

@@ -7,6 +7,9 @@
       <Component Directory="ConfigFolder" Permanent="true" NeverOverwrite="true">
         <File Source="$(ProjectDir)\Files\config.ini" Id="config.ini"/>
       </Component>
+      <Component Directory="InstallFolder">
+        <File Source="$(ProjectDir)\Files\WinziPrint.exe" Id="WinziPrint.exe"/>
+      </Component>
       <Component Directory="InstallFolder">
         <File Source="$(TargetDir)\PDFtoPrinter.exe" Id="PDFtoPrinter.exe"/>
       </Component>

Installer/Package.wxs

@@ -3,7 +3,7 @@
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" AllowSameVersionUpgrades="no" />
 	<MediaTemplate EmbedCab="true" MaximumUncompressedMediaSize="10"/>
 
-	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\elwig.ico"/>
+	<Icon Id="icon.ico" SourceFile="$(var.ElwigProjectDir)\Resourcs\Images\Elwig.ico"/>
 	<Property Id="ARPPRODUCTICON" Value="icon.ico"/>
 
 	<Feature Id="Main">

Setup/Bundle.wxs

@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
-  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\elwig.ico" >
+  <Bundle Name="Elwig" Manufacturer="Elwig" Version="!(bind.packageVersion.ElwigMsi)" UpgradeCode="f3c8fcab-c37c-43aa-9ab8-e42f4bb518b7" IconSourceFile="$(var.ElwigProjectDir)\Resources\Images\Elwig.ico" >
 	<BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" LogoFile="$(var.ElwigProjectDir)\elwig.png" SuppressOptionsUI="yes" ShowVersion="yes" />   
 	</BootstrapperApplication>