Bump version to 1.0.4.0

CHANGELOG.md

@@ -2,6 +2,94 @@
 Changelog
 =========
 
+[v1.0.4.0][v1.0.4.0] (2026-03-16) {#v1.0.4.0}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.4.0-features}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) gibt es nun über die Menü-Leiste die Möglichkeit _Massenaktionen_ für mehrere Lieferungen durchzuführen (z.B. Attribut oder Zu-/Abschlag setzen). ([#78][i78])
+
+### Behobene Fehler {#v1.0.4.0-bugfixes}
+
+* Waagen mit Netzwerkschnittstelle versuchen die Verbindung nun wieder neu aufzubauen, sollte diese unterbrochen werden. ([#74][i74])
+
+### Sonstiges {#v1.0.4.0-misc}
+
+* Die bisher verwendeten Programm-Bibliotheken zum Erstellen von PDF-Dokumente wurden vollständig durch [iText](https://itextpdf.com/) ersetzt.
+  Das ermöglicht ein schnelleres, effizienteres, und stabileres Erstellen der PDF-Dokumente.
+  Außerdem konnte so die Größe der Installations-Datei von ~138 MB auf ~98 MB um ca. 30 % reduziert werden. (d8c967b2f2, 8054a024f4)
+* Abhängigkeiten aktualisiert. (af73226c90, f4fddd111f)
+
+[v1.0.4.0]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.4.0
+[i74]: https://git.necronda.net/winzer/elwig/issues/74
+[i78]: https://git.necronda.net/winzer/elwig/issues/78
+
+
+
+
+[v1.0.3.4][v1.0.3.4] (2026-02-19) {#v1.0.3.4}
+---------------------------------------------
+
+### Neue Funktionen {#v1.0.3.4-features}
+
+* Bei Anlieferungsbestätigungen (`DeliveryConfirmation`) wird nun auch die Summe aller abgewerteten Lieferungen angeführt. (9e5f709d42)
+* Bei der Auszahlung werden Traubengutschriften (`CreditNote`) nur noch für Mitglieder erstellt, die einen positiven Betrag ausgezahlt bekommen. (432c511b85)
+
+### Behobene Fehler {#v1.0.3.4-bugfixes}
+
+* Im Haupt-Fenster (`MainWindow`) wurde der Tooltip für den Knopf _Sorten-/Qual.aufschlüssel_ korrigiert. (2c0b000073)
+* Falsch gesetzte `xtime` und `mtime` bei Lieferungen korrigiert. (23db4de1ee)
+* Beim Import von Lieferungen ohne `kgnr` tritt nun kein Fehler auf. (6818491ae3)
+* Beim Abfragen von neuen Daten zum Synchronisieren werden alle Fehler abgefangen. (a47904cf0b)
+
+### Sonstiges {#v1.0.3.4-misc}
+
+* Pdfium wird nun direkt importiert (anstatt über PdfiumViewer). (4cd7ef85a1)
+* Auszahlungsvarianten von vergangenen Saisons sind nun nicht mehr für eine Bearbeitung gesperrt. (7e22759c33)
+* Im Rundschreiben-Fenster (`MailWindow`) ist es nun möglich Dokumente durch Doppelklick an-/abzuwählen. (6f081811c4)
+* Abhängigkeiten aktualisiert. (19c3322ef2, 0e2b004b0d)
+
+[v1.0.3.4]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.4
+
+
+
+
+[v1.0.3.3][v1.0.3.3] (2026-02-05) {#v1.0.3.3}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.3.3-bugfixes}
+
+* Hotfix: Probleme beim Drucken seit der Installation von [v1.0.3.0](#v1.0.3.0). (c8911c0acb, 8f423e3e92)
+
+[v1.0.3.3]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.3
+
+
+
+
+[v1.0.3.2][v1.0.3.2] (2026-02-04) {#v1.0.3.2}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.3.2-bugfixes}
+
+* Hotfix: Probleme bei der Installation von [v1.0.3.0](#v1.0.3.0). (7adc9f89e4)
+
+[v1.0.3.2]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.2
+
+
+
+
+[v1.0.3.1][v1.0.3.1] (2026-01-19) {#v1.0.3.1}
+---------------------------------------------
+
+### Behobene Fehler {#v1.0.3.1-bugfixes}
+
+* Hotfix: Probleme bei der Installation von [v1.0.3.0](#v1.0.3.0). (e63de0d867)
+
+[v1.0.3.1]: https://git.necronda.net/winzer/elwig/releases/tag/v1.0.3.1
+
+
+
+
 [v1.0.3.0][v1.0.3.0] (2026-01-16) {#v1.0.3.0}
 ---------------------------------------------
 
@@ -267,7 +355,7 @@ Changelog
 * Bei Traubengutschriften (`CreditNote`) wurde der Rebelzuschlag immer angeführt, auch wenn dieser in der zugrundeliegenden Berechnung nicht berücksichtigt wurde. (336aef5c70)
 * In den Variantendaten einer Auszahlungsvariante (`PaymentVariantSummary`) wurde neben den Spalten _gebunden_ und _ungebunden_ noch _attributlos gebunden_ hinzugefügt. Ohne diese neue Spalte wären die Werte der anderen beiden falsch. ([#58][i58])
 * Das erste Laden des Ausgangs-Protokoll-Fensters (`MailLogWindow`) hat nicht funktioniert. ([#65][i65])
-* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tool-Tip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) und im Mitglieder-Fenster (`MemberAdminWindow`) wird der Tooltip für Gewicht/Gradation mit korrektem Layout angezeigt. (e9f389b885)
 * Bei Traubengutschriften (`CreditNote`) werden längere Freitexte vollständig angezeigt statt abgeschnitten. ([#62][i62])
 
 ### Sonstiges {#v1.0.0.0-misc}

Elwig/App.xaml.cs

@@ -32,9 +32,6 @@ namespace Elwig {
         public static readonly string MailsPath = Path.Combine(DataPath, "mails");
         public static readonly string ConfigPath = Path.Combine(DataPath, "config.ini");
         public static readonly string InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Elwig");
-        public static readonly string DocumentsPath = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
-            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Elwig/Documents") :
-            Path.Combine(InstallPath, "resources/Documents");
         public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
 
         public static Config Config { get; private set; } = new(ConfigPath);
@@ -123,7 +120,6 @@ namespace Elwig {
                 return Task.CompletedTask;
             });
 
-            Utils.RunBackground("HTML Initialization", () => Html.Init());
             Utils.RunBackground("PDF Initialization", () => Pdf.Init());
             Utils.RunBackground("JSON Schema Initialization", BillingData.Init);
 

Elwig/Documents/BusinessDocument.cs

@@ -1,42 +1,27 @@
 using Elwig.Helpers;
 using Elwig.Models;
 using Elwig.Models.Entities;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Action;
+using iText.Kernel.Pdf.Canvas;
+using iText.Layout;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 
 namespace Elwig.Documents {
-    public abstract class BusinessDocument : Document {
+    public class BusinessDocument : Document {
 
         public Member Member;
         public string? Location;
         public bool IncludeSender = false;
         public bool UseBillingAddress = false;
         public bool ShowDateAndLocation = false;
-        public string Aside;
-
-        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
-            Member = m;
-            Location = App.BranchLocation;
-            IncludeSender = includeSender;
-            var c = App.Client;
-            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
-            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
-                .Item(c.NameFull).NextLine()
-                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
-                .Item(c.EmailAddress != null ? $"<a href=\"mailto:{c.Name} {c.NameSuffix} <{c.EmailAddress}>\">{c.EmailAddress}</a>" : null)
-                    .Item(c.Website != null ? $"<a href=\"http://{c.Website}/\">{c.Website}</a>" : null)
-                    .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
-                .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
-                .ToString();
-            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
-            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
-                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
-                $"</tbody></table>";
-        }
+        protected Table? Aside;
 
         public string Address {
             get {
@@ -46,11 +31,115 @@ namespace Elwig.Documents {
             }
         }
 
-        private static string GetColGroup(IEnumerable<double> cols) {
-            return "<colgroup>\n" + string.Join("\n", cols.Select(g => $"<col style=\"width: {g.ToString(CultureInfo.InvariantCulture)}mm;\"/>")) + "\n</colgroup>\n";
+        protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false) {
+            var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, 0.5f, 0.25f, isName ? 1 : 0);
+            if (colspan > 1) {
+                cell.SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                    .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0))
+                    .SetBorderTop(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
+                    .SetPaddingsMM(0.5f, 1, 0.5f, 1);
+            }
+            return cell;
         }
 
-        public static string PrintSortenaufteilung(List<MemberStat> stats) {
+        protected Cell NewAsideCell(string text, int colspan = 1, bool isName = false) {
+            return NewAsideCell(new KernedParagraph(text, 10), colspan, isName);
+        }
+
+        public BusinessDocument(string title, Member m, bool includeSender = false) :
+            base(title) {
+            Member = m;
+            Location = App.BranchLocation;
+            IncludeSender = includeSender;
+        }
+
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderHeader(doc, pdf);
+
+            var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10);
+            if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)"));
+            Aside = new Table(ColsMM(22.5, 42.5))
+                .SetFont(NF).SetFontSize(10)
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness))
+                .AddCell(NewAsideCell("Mitglied", 2))
+                .AddCell(NewAsideCell("Mitglieds-Nr.:", isName: true)).AddCell(NewAsideCell($"{Member.MgNr}"))
+                .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? ""))
+                .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid));
+        }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+
+            var page = pdf.AddNewPage();
+            var pageSize = page.GetPageSize();
+            var pdfCanvas = new PdfCanvas(page.NewContentStreamBefore(), page.GetResources(), pdf);
+            using (var canvas = new Canvas(pdfCanvas, pageSize)) {
+                // header
+                var header = new Div()
+                    .SetFixedPositionMM(25, 10, pageSize.GetWidth() / PtInMM - 45, 45, pageSize)
+                    .SetTextAlignment(TextAlignment.CENTER);
+                header.Add(new KernedParagraph(App.Client.Name, 18).SetFont(BF).SetMarginsMM(8, 0, 0, 0));
+                if (App.Client.NameSuffix != null) header.Add(new KernedParagraph(App.Client.NameSuffix, 14).SetFont(BF).SetMargin(0));
+                header.Add(new KernedParagraph(App.Client.NameTypeFull, 12).SetFont(NF).SetMargin(0));
+                canvas.Add(header);
+                // address
+                canvas.Add(new Div()
+                    .SetFixedPositionMM(25, 50, 80, 45, pageSize)
+                    .SetFont(NF)
+                    .Add(new KernedParagraph(IncludeSender ? $"{App.Client.Sender1}\n{App.Client.Sender2}" : "", 8).SetMargin(0).SetHeight(16).SetPaddings(8, 0, 8, 0))
+                    .Add(new KernedParagraph(Address, 12).SetMargin(0).SetHeight(12 * 5)));
+                // aside
+                if (Aside != null) {
+                    canvas.Add(new Div()
+                        .SetFixedPositionMM(125, 50, 65, 50, pageSize)
+                        .Add(Aside));
+                }
+            }
+
+            doc.Add(new KernedParagraph(ShowDateAndLocation ? $"{Location}, am {Date:dd.MM.yyyy}" : "", 12).SetTextAlignment(TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE).SetHeight(24).SetMargin(0));
+            doc.Add(new KernedParagraph(Title, 12).SetFont(BF).SetMargins(0, 0, 12, 0));
+        }
+
+        protected override Paragraph GetFooter() {
+            var c = App.Client;
+            var link1 = new Link(c.EmailAddress ?? "", PdfAction.CreateURI($"mailto:{Uri.EscapeDataString(c.Name)}%20<{c.EmailAddress}>"));
+            var link2 = new Link(c.Website ?? "", PdfAction.CreateURI($"http://{c.Website}/"));
+            link1.GetLinkAnnotation().SetBorder(new PdfAnnotationBorder(0, 0, 0));
+            link2.GetLinkAnnotation().SetBorder(new PdfAnnotationBorder(0, 0, 0));
+            return new KernedParagraph(10)
+                .AddAll(Utils.GenerateFooter("\n", " \u00b7 ")
+                    .Item(c.NameFull).NextLine()
+                    .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
+                    .Item(c.EmailAddress != null ? link1 : null)
+                        .Item(c.Website != null ? link2 : null)
+                        .Item("Betriebs-Nr.", c.LfbisNr).Item("Bio-KSt.", c.OrganicAuthority).NextLine()
+                    .Item("UID", c.UstIdNr).Item("BIC", c.Bic).Item("IBAN", c.Iban)
+                    .ToLeafElements());
+        }
+
+        protected Cell NewWeightsHdr(Paragraph p) {
+            return NewCell(p)
+                .SetPaddingsMM(0.125f, 0, 0.125f, 0);
+        }
+
+        protected Cell NewWeightsHdr(string text) {
+            return NewCell(new KernedParagraph(text, 8).SetFont(IF).SetTextAlignment(TextAlignment.RIGHT))
+                .SetPaddingsMM(0.125f, 0, 0.125f, 0);
+        }
+
+        protected Cell NewWeightsTh(string name) {
+            return NewCell(new KernedParagraph(name, 10).SetFont(IF))
+                .SetPaddingsMM(0.125f, 0, 0.125f, 0);
+        }
+
+        protected Cell NewWeightsTd(string text, bool sum = false) {
+            return NewCell(new KernedParagraph(text, 10).SetFont(sum ? BF : NF).SetTextAlignment(TextAlignment.RIGHT))
+                .SetPaddingsMM(sum ? 0.25f : 0.125f, 0, sum ? 0.25f : 0.125f, 0)
+                .SetBorderTop(sum ? new SolidBorder(BorderThickness) : Border.NO_BORDER);
+        }
+
+        protected Table NewWeightsTable(List<MemberStat> stats) {
             List<string> discrs = [""];
             List<string> names = ["ohne Attr./Bewirt."];
             List<string> bucketAttrs = [
@@ -66,82 +155,136 @@ namespace Elwig.Documents {
 
             List<double> cols = [40];
             cols.AddRange(names.Select(_ => 125.0 / names.Count));
-            string tbl = GetColGroup(cols);
-            tbl += "<thead><tr>" +
-                $"<th><b>Sortenaufteilung</b> [kg]</th>" +
-                string.Join("", names.Select(c => $"<th>{c}</th>")) +
-                "</tr></thead>";
+            var tbl = new Table(ColsMM([.. cols]))
+                .AddHeaderCell(NewWeightsHdr(new KernedParagraph(8).Add(BoldItalic("Sortenaufteilung ")).Add(Italic("[kg]"))));
+            foreach (var name in names)
+                tbl.AddHeaderCell(NewWeightsHdr(name));
 
-            tbl += string.Join("\n", stats
-                .GroupBy(b => b.Variety)
-                .OrderBy(b => b.Key)
-                .Select(g => {
+            foreach (var g in stats.GroupBy(b => b.Variety).OrderBy(b => b.Key)) {
                 var dict = g.ToDictionary(a => a.Discr, a => a.Weight);
                 var vals = discrs.Select(a => dict.GetValueOrDefault(a, 0)).ToList();
-                    return $"<tr><th>{g.Key}</th>" + string.Join("", vals.Select(v => "<td class=\"number\">" + (v == 0 ? "-" : $"{v:N0}") + "</td>")) +
-                        $"<td class=\"number\">{dict.Values.Sum():N0}</td></tr>";
-                })
-            );
-            var totalDict = stats.GroupBy(s => s.Discr).ToDictionary(g => g.Key, g => g.Sum(a => a.Weight));
-            var totals = discrs.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
-            tbl += "<tr class=\"sum bold\"><td></td>" + string.Join("", totals.Select(v => $"<td class=\"number\">{v:N0}</td>")) +
-                $"<td class=\"number\">{totalDict.Values.Sum():N0}</td></tr>";
-
-            return "<table class=\"sortenaufteilung small number cohere\">" + tbl + "</table>";
+                tbl.AddCell(NewWeightsTh(g.Key));
+                foreach (var v in vals)
+                    tbl.AddCell(NewWeightsTd(v == 0 ? "-" : $"{v:N0}"));
+                tbl.AddCell(NewWeightsTd($"{dict.Values.Sum():N0}"));
             }
 
-        private static string FormatRow(
+            var totalDict = stats.GroupBy(s => s.Discr).ToDictionary(g => g.Key, g => g.Sum(a => a.Weight));
+            var totals = discrs.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0);
+            tbl.AddCell(NewWeightsTd("", true));
+            foreach (var v in totals)
+                tbl.AddCell(NewWeightsTd($"{v:N0}", true));
+            tbl.AddCell(NewWeightsTd($"{totalDict.Values.Sum():N0}", true));
+
+            return tbl;
+        }
+
+        protected Cell NewBucketHdr(Paragraph p, int rowspan = 1, bool left = false, bool unit = false) {
+            p.SetProperty(Property.NO_SOFT_WRAP_INLINE, true);
+            p.SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.HIDDEN);
+            return NewCell(p, rowspan: rowspan)
+                .SetPaddingsMM(0.125f, unit ? 2 : 0, 0.125f, 0)
+                .SetTextAlignment(left ? TextAlignment.LEFT : TextAlignment.RIGHT).SetVerticalAlignment(VerticalAlignment.MIDDLE)
+                .SetFont(IF);
+        }
+
+        protected Cell NewBucketHdr(string text, int rowspan = 1, bool left = false, bool unit = false) {
+            return NewBucketHdr(new KernedParagraph(text, 8), rowspan, left, unit);
+        }
+
+        protected Cell NewBucketSubHdr(string text, int colspan, bool isTiny = false) {
+            var p = new KernedParagraph(text, 8);
+            p.SetProperty(Property.NO_SOFT_WRAP_INLINE, true);
+            p.SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.HIDDEN);
+            return NewCell(p, colspan: colspan)
+                .SetBorderTop(!isTiny ? new SolidBorder(BorderThickness) : Border.NO_BORDER)
+                .SetPaddingsMM(isTiny ? 0 : 0.125f, 0, isTiny ? 0 : 0.125f, 0).SetVerticalAlignment(VerticalAlignment.MIDDLE)
+                .SetTextAlignment(TextAlignment.LEFT).SetFont(BI);
+        }
+
+        protected Cell NewBucketTh(string text, bool isTiny = false) {
+            var p = new KernedParagraph(text, isTiny ? 8 : 10);
+            p.SetProperty(Property.NO_SOFT_WRAP_INLINE, true);
+            p.SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.HIDDEN);
+            return NewCell(p)
+                .SetPaddingsMM(isTiny ? 0 : 0.125f, 0, isTiny ? 0 : 0.125f, 0)
+                .SetTextAlignment(TextAlignment.LEFT).SetFont(IF);
+        }
+
+        protected Cell NewBucketTd(string text, bool bold = false, bool isTiny = false) {
+            var p = new KernedParagraph(text, isTiny ? 8 : 10);
+            p.SetProperty(Property.NO_SOFT_WRAP_INLINE, true);
+            p.SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.HIDDEN);
+            return NewCell(p)
+                .SetPaddingsMM(isTiny ? 0 : 0.125f, 0, isTiny ? 0 : 0.125f, 0)
+                .SetTextAlignment(TextAlignment.RIGHT).SetFont(bold ? BF : NF);
+        }
+
+        protected Cell[] FormatRow(
              int obligation, int right, int delivery, int? totalDelivery = null, int? payment = null, int? area = null,
-            bool isGa = false, bool showPayment = false, bool showArea = false
+             bool isGa = false, bool showPayment = false, bool showArea = false, bool isTiny = false
         ) {
             totalDelivery ??= delivery;
             payment ??= delivery;
 
             if (showArea) {
-                return $"<td>{(area == null ? "" : $"{area:N0}")}</td>" +
-                    $"<td>{obligation:N0}</td>" +
-                    $"<td>{right:N0}</td>";
+                return [
+                    NewBucketTd(area == null ? "" : $"{area:N0}", isTiny: isTiny),
+                    NewBucketTd($"{obligation:N0}", isTiny: isTiny),
+                    NewBucketTd($"{right:N0}", isTiny: isTiny),
+                ];
             }
 
-            return $"<td>{(obligation == 0 ? "-" : $"{obligation:N0}")}</td>" +
-                $"<td>{(right == 0 ? "-" : $"{right:N0}")}</td>" +
-                $"<td>{(totalDelivery < obligation ? $"<b>{obligation - totalDelivery:N0}</b>" : "-")}</td>" +
-                $"<td>{(delivery <= right ? $"{right - delivery:N0}" : "-")}</td>" +
-                $"<td>{(obligation == 0 && right == 0 ? "-" : (delivery > right ? ((isGa ? "<b>" : "") + $"{delivery - right:N0}" + (isGa ? "</b>" : "")) : "-"))}</td>" +
-                (showPayment ? $"<td>{(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}")}</td>" : "") +
-                $"<td>{totalDelivery:N0}</td>";
+            return [
+                NewBucketTd(obligation == 0 ? "-" : $"{obligation:N0}", isTiny: isTiny),
+                NewBucketTd(right == 0 ? "-" : $"{right:N0}", isTiny: isTiny),
+                NewBucketTd(totalDelivery < obligation ? $"{obligation - totalDelivery:N0}" : "-", totalDelivery < obligation, isTiny: isTiny),
+                NewBucketTd(delivery <= right ? $"{right - delivery:N0}" : "-", isTiny: isTiny),
+                NewBucketTd(obligation == 0 && right == 0 ? "-" : (delivery > right ? $"{delivery - right:N0}" : "-"), delivery > right && isGa, isTiny: isTiny),
+                ..(showPayment ? new List<Cell>() {
+                    NewBucketTd(isGa ? "" : obligation == 0 && right == 0 ? "-" : $"{payment:N0}", isTiny: isTiny)
+                } : []),
+                NewBucketTd($"{totalDelivery:N0}", isTiny: isTiny),
+            ];
         }
 
-        private static string FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false) {
-            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea);
+        protected Cell[] FormatRow(MemberBucket bucket, bool isGa = false, bool showPayment = false, bool showArea = false, bool isTiny = false) {
+            return FormatRow(bucket.Obligation, bucket.Right, bucket.Delivery, bucket.DeliveryTotal, bucket.Payment, bucket.Area, isGa, showPayment, showArea, isTiny);
         }
 
-        public string PrintBucketTable(
+        protected Table NewBucketTable(
             Season season, Dictionary<string, MemberBucket> buckets,
             bool includeDelivery = true, bool includePayment = false,
             bool isTiny = false, IEnumerable<string>? filter = null
         ) {
             includePayment = includePayment && includeDelivery;
-            string tbl = GetColGroup(!includeDelivery ? [105, 20, 20, 20] : includePayment ? [45, 17, 17, 17, 19, 16, 17, 17] : [45, 20, 20, 20, 20, 20, 20]);
-            tbl += $"""
-                <thead>
-                    <tr>
-                        <th{(!includeDelivery ? " rowspan=\"2\"" : "")}>
-                            <b>{(includeDelivery ? "Lese " + season.Year : "Zusammengefasste Flächenbindungen")}</b>
-                            per {Date:dd.MM.yyyy} {(includeDelivery ? "[kg]" : "")}
-                        </th>
-                        {(!includeDelivery ? "<th>Fläche</th>" : "")}
-                        <th>Lieferpflicht</th>
-                        <th>Lieferrecht</th>
-                        {(includeDelivery ? "<th>Unterliefert</th>" : "")}
-                        {(includeDelivery ? "<th>Noch lieferbar</th>" : "")}
-                        {(includeDelivery ? "<th>Überliefert</th>" : "")}
-                        {(includePayment ? "<th>Zugeteilt</th>" : "")}
-                        {(includeDelivery ? "<th>Geliefert</th>" : "")}
-                    </tr>
-                    {(!includeDelivery ? "<tr><th class=\"unit\">[m²]</th><th class=\"unit\">[kg]</th><th class=\"unit\">[kg]</th></tr>" : "")}
-                </thead>
-                """;
+
+            var tbl = new Table(ColsMM(!includeDelivery ? [105, 20, 20, 20] : includePayment ? [45, 17, 17, 17, 19, 16, 17, 17] : [45, 20, 20, 20, 20, 20, 20]))
+                .SetBorder(Border.NO_BORDER).SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetFont(NF).SetFontSize(isTiny ? 8 : 10);
+
+            if (includeDelivery) {
+                tbl.AddHeaderCell(NewBucketHdr(new KernedParagraph(8)
+                        .Add(BoldItalic($"Lese {season.Year}"))
+                        .Add(Italic($" per {Date:dd.MM.yyyy} [kg]")), left: true))
+                    .AddHeaderCell(NewBucketHdr("Lieferpflicht"))
+                    .AddHeaderCell(NewBucketHdr("Lieferrecht"))
+                    .AddHeaderCell(NewBucketHdr("Unterliefert"))
+                    .AddHeaderCell(NewBucketHdr("Noch lieferbar"))
+                    .AddHeaderCell(NewBucketHdr("Überliefert"));
+                if (includePayment) tbl.AddHeaderCell(NewBucketHdr("Zugeteilt"));
+                tbl.AddHeaderCell(NewBucketHdr("Geliefert"));
+            } else {
+                tbl.AddHeaderCell(NewBucketHdr(new KernedParagraph(8)
+                        .Add(BoldItalic("Zusammengefasste Flächenbindungen"))
+                        .Add(Italic($" per {Date:dd.MM.yyyy}")), 2, left: true))
+                    .AddHeaderCell(NewBucketHdr("Fläche"))
+                    .AddHeaderCell(NewBucketHdr("Lieferpflicht"))
+                    .AddHeaderCell(NewBucketHdr("Lieferrecht"))
+                    .AddHeaderCell(NewBucketHdr("[m²]", unit: true))
+                    .AddHeaderCell(NewBucketHdr("[kg]", unit: true))
+                    .AddHeaderCell(NewBucketHdr("[kg]", unit: true));
+            }
 
             var mBuckets = buckets
                 .Where(b => ((!includeDelivery && b.Value.Area > 0) ||
@@ -163,30 +306,26 @@ namespace Elwig.Documents {
                 .Where(b => !fbVars.Contains(b.Key))
                 .OrderBy(b => b.Value.Name);
 
-            tbl += "\n<tbody>\n";
-            tbl += $"<tr><th>Gesamtlieferung lt. gez. GA</th>{FormatRow(
-                    Member.BusinessShares * season.MinKgPerBusinessShare,
+            tbl.AddCell(NewBucketTh("Gesamtlieferung lt. gez. GA", isTiny: isTiny));
+            tbl.AddCells(FormatRow(Member.BusinessShares * season.MinKgPerBusinessShare,
                     Member.BusinessShares * season.MaxKgPerBusinessShare,
                     season.Deliveries.Where(d => d.MgNr == Member.MgNr).Sum(d => d.Weight),
-                    isGa: true, showPayment: includePayment, showArea: !includeDelivery
-                )}</tr>";
+                    isGa: true, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
+
             if (fbs.Any()) {
-                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
-                    $"Flächenbindungen{(vtr.Any() ? " (inkl. Verträge)" : "")}:</th></tr>";
+                tbl.AddCell(NewBucketSubHdr("Flächenbindungen" + (vtr.Any() ? " (inkl. Verträge)" : "") + ":", includePayment ? 8 : 7, isTiny: isTiny));
                 foreach (var (id, b) in fbs) {
-                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                    tbl.AddCell(NewBucketTh(b.Name, isTiny: isTiny)).AddCells(FormatRow(b, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
                 }
             }
             if (vtr.Any()) {
-                tbl += $"<tr class=\"subheading{(filter == null ? " border" : "")}\"><th colspan=\"{(includePayment ? 8 : 7)}\">" +
-                    "Verträge:</th></tr>";
+                tbl.AddCell(NewBucketSubHdr("Verträge:", includePayment ? 8 : 7, isTiny: isTiny));
                 foreach (var (id, b) in vtr) {
-                    tbl += $"<tr><th>{b.Name}</th>{FormatRow(b, showPayment: includePayment, showArea: !includeDelivery)}</tr>";
+                    tbl.AddCell(NewBucketTh(b.Name, isTiny: isTiny)).AddCells(FormatRow(b, showPayment: includePayment, showArea: !includeDelivery, isTiny: isTiny));
                 }
             }
-            tbl += "\n</tbody>\n";
 
-            return $"<table class=\"buckets {(isTiny ? "tiny" : "small")} number cohere\">\n" + tbl + "\n</table>";
+            return tbl;
         }
     }
 }

Elwig/Documents/BusinessDocument.cshtml

@@ -1,21 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.BusinessDocument>
-@model Elwig.Documents.BusinessDocument
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\BusinessDocument.css"/>
-<div class="info-wrapper">
-    <div class="address-wrapper">
-        <div class="sender">
-            @if (Model.IncludeSender) {
-                <div>@Elwig.App.Client.Sender1</div>
-                <div>@Elwig.App.Client.Sender2</div>
-            }
-        </div>
-        <address>@Model.Address</address>
-    </div>
-    <aside>@Raw(Model.Aside)</aside>
-    @if (Model.ShowDateAndLocation) {
-        <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
-    }
-</div>
-@RenderBody()

Elwig/Documents/BusinessDocument.css

@@ -1,150 +0,0 @@
-
-.address-wrapper, aside {
-    overflow: hidden;
-}
-
-.spacing {
-    height: 20mm;
-}
-
-.info-wrapper {
-    width: 100%;
-    height: 45mm;
-    margin: 0 0 2mm 0;
-    position: relative;
-}
-
-.info-wrapper .date {
-    text-align: right;
-    position: absolute;
-    right: 0;
-    bottom: -1.5em;
-}
-
-.address-wrapper {
-    height: 45mm;
-    width: 85mm;
-    margin: 0;
-    padding: 5mm;
-    position: absolute;
-    left: -5mm;
-    top: 0;
-}
-
-.address-wrapper .sender {
-    height: 4em;
-    font-size: 8pt;
-    padding: 1em 0;
-}
-
-address {
-    height: 5em;
-    white-space: pre-line;
-    font-size: 12pt;
-    font-style: normal;
-}
-
-aside {
-    height: 40mm;
-    width: 75mm;
-    margin: 0;
-    position: absolute;
-    left: 100mm;
-    top: 5mm;
-}
-
-aside table {
-    border-collapse: collapse;
-    border: var(--border-thickness) solid #808080;
-    width: 65mm;
-    margin-right: 10mm;
-}
-
-aside table thead:not(:first-child) tr {
-    border-top: var(--border-thickness) solid #808080;
-}
-
-aside table thead tr {
-    background-color: #E0E0E0;
-    font-size: 10pt;
-}
-
-aside table tbody th,
-aside table tbody td {
-    text-align: left;
-    font-size: 10pt;
-}
-
-aside table tbody th {
-    padding: 0.25mm 0.5mm 0.25mm 1mm;
-}
-
-aside table tbody td {
-    padding: 0.25mm 0;
-}
-
-aside table tbody th {
-    font-weight: normal;
-}
-
-main {
-    margin: 2em 0 1em 0;
-}
-
-main > *:first-child {
-    margin-top: 0;
-}
-
-main h1,
-main h2,
-main h3,
-.main-wrapper p {
-    font-size: 12pt;
-    margin: 1em 0;
-    text-align: justify;
-}
-
-.main-wrapper p {
-    widows: 3;
-    orphans: 3;
-    hyphens: manual;
-}
-
-main h1 {
-    margin-top: 0;
-    margin-bottom: 2em;
-}
-
-.main-wrapper p.comment {
-    font-size: 10pt;
-}
-
-.main-wrapper p.custom {
-    white-space: pre-wrap;
-    break-inside: avoid;
-}
-
-.main-wrapper .hidden {
-    break-before: avoid;
-}
-
-.main-wrapper .bottom {
-    bottom: 0;
-    position: absolute;
-    width: 165mm;
-}
-
-.main-wrapper .signatures {
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
-    margin: 20mm 0 2mm 0;
-}
-
-.main-wrapper .signatures > * {
-    width: 50mm;
-    border-top: var(--border-thickness) solid black;
-    padding-top: 1mm;
-    text-align: center;
-    font-size: 10pt;
-}

Elwig/Documents/BusinessLetter.cs

@@ -1,7 +0,0 @@
-using Elwig.Models.Entities;
-
-namespace Elwig.Documents {
-    public class BusinessLetter : BusinessDocument {
-        public BusinessLetter(string title, Member m) : base(title, m) { }
-    }
-}

Elwig/Documents/BusinessLetter.cshtml

@@ -1,9 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.BusinessLetter>
-@model Elwig.Documents.BusinessLetter
-@{ Layout = "BusinessDocument"; }
-<main>
-<p>Sehr geehrtes Mitglied,</p>
-<p>nein.</p>
-<p>Mit freundlichen Grüßen<br/>Ihre Winzergenossenschaft</p>
-</main>

Elwig/Documents/CreditNote.cs

@@ -1,6 +1,10 @@
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +21,7 @@ namespace Elwig.Documents {
         public string CurrencySymbol;
         public int Precision;
         public string MemberModifier;
-        public IEnumerable<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
+        public List<(string Name, int Kg, decimal Amount)>? MemberUnderDeliveries;
         public decimal MemberTotalUnderDelivery;
         public int MemberAutoBusinessShares;
         public decimal MemberAutoBusinessSharesAmount;
@@ -53,12 +57,6 @@ namespace Elwig.Documents {
             } else {
                 MemberModifier = "Sonstige Zu-/Abschläge";
             }
-            Aside = Aside.Replace("</table>", "") +
-                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
-                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
-                $"</tbody></table>";
             Text = App.Client.TextCreditNote;
             DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
             CurrencySymbol = season.Currency.Symbol ?? season.Currency.Code;
@@ -96,4 +94,222 @@ namespace Elwig.Documents {
                     .ToList();
             }
         }
-    }}
+
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderHeader(doc, pdf);
+            Aside?.AddCell(NewAsideCell("Gutschrift", 2))
+                .AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-"))
+                .AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}"))
+                .AddCell(NewAsideCell("Überw. am:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.TransferDate:dd.MM.yyyy}"));
+        }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(NewCreditTable(Data));
+
+            var div = new Table(ColsMM(60, 105))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+            var hint = new KernedParagraph(8)
+                .Add(Italic("Hinweis:\n" +
+                    $"Die Summe der Lieferungen und die Summe der anfal\u00adlenden Pönalen werden mit " +
+                    $"{Payment?.Variant.Season.Precision} Nach\u00adkomma-stellen berechnent, " +
+                    $"erst das Ergebnis wird kauf-männisch auf 2 Nach\u00adkomma\u00adstellen gerundet."))
+                .SetWidth(56 * PtInMM).SetMarginsMM(4, 2, 4, 2);
+            div.AddCell(new Cell(1, 2).SetPadding(0).SetBorder(Border.NO_BORDER).SetBorderTop(new SolidBorder(BorderThickness)));
+            div.AddCell(new Cell(3, 1).SetPadding(0).SetBorder(Border.NO_BORDER).Add(hint).SetKeepTogether(true));
+            var tbl1 = new Table(ColsMM(70, 5, 5, 25))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetKeepTogether(true);
+            var tbl2 = new Table(ColsMM(70, 5, 5, 25))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetKeepTogether(true);
+            var tbl3 = new Table(ColsMM(70, 5, 5, 25))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetKeepTogether(true);
+
+            var sum = Data.Rows.Sum(p => p.Amount);
+            if (Payment == null) {
+                tbl1.AddCells(FormatRow("Gesamt", sum, bold: true, noTopBorder: true));
+            } else {
+                var noBorder = true;
+                if (Payment.NetAmount != Payment.Amount) {
+                    tbl1.AddCells(FormatRow("Zwischensumme", Payment.NetAmount, noTopBorder: noBorder));
+                    noBorder = false;
+                    tbl1.AddCells(FormatRow(MemberModifier, Payment.Amount - Payment.NetAmount, add: true));
+                }
+                if (Credit == null) {
+                    tbl1.AddCells(FormatRow("Gesamtbetrag", Payment.Amount, bold: true, noTopBorder: noBorder));
+                    // TODO Mock VAT
+                } else {
+                    var hasPrev = Credit.PrevNetAmount != null;
+                    tbl1.AddCells(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Credit.NetAmount, bold: true, noTopBorder: noBorder));
+                    if (hasPrev) {
+                        tbl1.AddCells(FormatRow("Bisher berücksichtigt", -Credit.PrevNetAmount, add: true));
+                        tbl1.AddCells(FormatRow("Nettobetrag", Credit.NetAmount - (Credit.PrevNetAmount ?? 0)));
+                    }
+                    tbl1.AddCells(FormatRow($"Mehrwertsteuer ({Credit.Vat * 100} %)", Credit.VatAmount, add: true));
+                    tbl1.AddCells(FormatRow("Bruttobetrag", Credit.GrossAmount, bold: true));
+                }
+            }
+
+            decimal penalty = 0;
+            string? comment = null;
+
+            if (MemberUnderDeliveries != null && MemberUnderDeliveries.Count > 0) {
+                tbl2.AddCell(NewTd("Anfallende Pönalen durch Unterlieferungen:", colspan: 2).SetPaddingTopMM(5))
+                    .AddCell(NewCell(colspan: 2));
+                foreach (var u in MemberUnderDeliveries) {
+                    tbl2.AddCells(FormatRow($"{u.Name} ({u.Kg:N0} kg)", u.Amount, add: true, subCat: true));
+                    penalty += u.Amount;
+                }
+                penalty = Math.Round(penalty, 2, MidpointRounding.AwayFromZero);
+            }
+            if (MemberTotalUnderDelivery != 0) {
+                tbl2.AddCells(FormatRow("Unterlieferung (GA)", MemberTotalUnderDelivery, add: true));
+                penalty += MemberTotalUnderDelivery;
+            }
+            if (MemberAutoBusinessSharesAmount != 0) {
+                tbl2.AddCells(FormatRow($"Autom. Nachz. von GA ({MemberAutoBusinessShares})", MemberAutoBusinessSharesAmount, add: true));
+                penalty += MemberAutoBusinessSharesAmount;
+            }
+            if (CustomPayment?.Amount != null) {
+                comment = CustomPayment.Comment;
+                string text = (CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
+                if (comment != null && comment!.Length <= 30) {
+                    text = comment;
+                    comment = null;
+                }
+                tbl2.AddCells(FormatRow(text, CustomPayment.Amount.Value, add: true));
+                penalty += CustomPayment.Amount.Value;
+            }
+
+            if (Credit == null) {
+                tbl3.AddCells(FormatRow("Auszahlungsbetrag", (Payment?.Amount + penalty) ?? (sum + penalty), bold: true));
+            } else {
+                var diff = Credit.Modifiers - penalty;
+                if (diff != 0) {
+                    tbl3.AddCells(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true));
+                }
+                if (Credit.PrevModifiers != null && Credit.PrevModifiers != 0) {
+                    tbl3.AddCells(FormatRow("Bereits berücksichtigte Abzüge", -Credit.PrevModifiers, add: true));
+                }
+                tbl3.AddCells(FormatRow("Auszahlungsbetrag", Credit.Amount, bold: true));
+            }
+
+            div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl1));
+            div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl2));
+            div.AddCell(new Cell().SetPadding(0).SetBorder(Border.NO_BORDER).Add(tbl3));
+            doc.Add(div);
+
+            if (comment != null) {
+                doc.Add(new KernedParagraph($"*{comment}", 12).SetMarginTopMM(10));
+            }
+            doc.Add(new KernedParagraph($"Überweisung erfolgt auf Konto {Utils.FormatIban(Member.Iban ?? "-")}.", 12).SetPaddingTopMM(10));
+            if (Text != null) {
+                doc.Add(new KernedParagraph(Text, 12).SetMarginTop(12).SetKeepTogether(true));
+            }
+        }
+
+        protected Cell[] FormatRow(string name, decimal? value, bool add = false, bool bold = false, bool subCat = false, bool noTopBorder = false) {
+            float textSize = subCat ? 8 : !add ? 12 : 10;
+            float numSize = subCat ? 8 : 12;
+            var border = !add && !noTopBorder;
+            var pad = !add && !noTopBorder ? 1 : 0.5f;
+            return [
+                NewTd($"{name}:", textSize, bold: bold, borderTop: border).SetPaddingTopMM(pad),
+                NewTd(value < 0 ? "–" : (add ? "+" : ""), numSize, right: true, bold: bold, borderTop: border).SetPaddingTopMM(pad),
+                NewTd(CurrencySymbol, numSize, bold: bold, borderTop: border).SetPaddingTopMM(pad),
+                NewTd($"{Math.Abs(value ?? 0):N2}", numSize, right: true, bold: bold, borderTop: border).SetPaddingTopMM(pad),
+            ];
+        }
+
+        protected Table NewCreditTable(CreditNoteDeliveryData data) {
+            var tbl = new Table(ColsMM(25, 6, 36, 10, 10, 15, 12, 13, 5, 17, 16), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Lieferschein-Nr.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Pos.", rowspan: 2).SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Sorte/Attribut/Bewirtschaftg.\nZu-/Abschlag", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Gradation", colspan: 2))
+                .AddHeaderCell(NewTh("Flächenbindung", colspan: 2))
+                .AddHeaderCell(NewTh("Preis"))
+                .AddHeaderCell(NewTh("Rbl.").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Zu-/Abschläge").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Betrag"))
+                .AddHeaderCell(NewTh("[°Oe]"))
+                .AddHeaderCell(NewTh("[°KMW]").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("[kg]", colspan: 2))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}/kg]"))
+                .AddHeaderCell(NewTh("[%]").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}]"))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}]"));
+
+            foreach (var p in data.Rows) {
+                var sub = new Table(ColsMM(25, 6, 36, 10, 10, 15, 12, 13, 5, 17, 16))
+                      .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                      .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                      .SetKeepTogether(true);
+                var attr = p.Attribute != null || p.Cultivation != null || p.QualId == "WEI";
+                var rows = Math.Max(p.Buckets.Length, 1 + (attr ? 1 : 0) + p.Modifiers.Length);
+                for (int i = 0; i < rows; i++) {
+                    if (i == 0) {
+                        sub.AddCell(NewTd(p.LsNr))
+                            .AddCell(NewTd($"{p.DPNr:N0}", center: true).SetPaddingLeft(0).SetPaddingRight(0))
+                            .AddCell(NewTd(p.Variety))
+                            .AddCell(NewTd($"{p.Gradation.Oe:N0}", center: true))
+                            .AddCell(NewTd($"{p.Gradation.Kmw:N1}", center: true));
+                    } else if (i == 1 && attr) {
+                        var varibute = new KernedParagraph(8);
+                        if (p.Attribute != null) varibute.Add(Normal(p.Attribute));
+                        if (p.Attribute != null && p.Cultivation != null) varibute.Add(Normal(" / "));
+                        if (p.Cultivation != null) varibute.Add(Normal(p.Cultivation));
+                        if ((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI") varibute.Add(Normal(" / "));
+                        if (p.QualId == "WEI") varibute.Add(Italic("abgew."));
+                        sub.AddCell(NewCell(colspan: 2))
+                            .AddCell(NewTd(varibute, colspan: 3).SetPaddingTop(0));
+                    } else if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
+                        sub.AddCell(NewCell(colspan: 2))
+                            .AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 3).SetPaddingTop(0).SetPaddingLeftMM(5));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 5));
+                    }
+
+                    if (i < p.Buckets.Length) {
+                        var bucket = p.Buckets[i];
+                        var pad = i == 0 ? 0.5f : 0;
+                        sub.AddCell(NewTd($"{bucket.Name}:", 8)
+                                .SetPaddingTopMM(pad))
+                            .AddCell(NewTd($"{bucket.Value:N0}", right: true)
+                                .SetPaddingTopMM(pad))
+                            .AddCell(NewTd($"{bucket.Price:N4}", right: true)
+                                .SetPaddingTopMM(pad));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 3));
+                    }
+
+                    if (i == p.Buckets.Length - 1) {
+                        var rebelMod = p.WeighingModifier * 100;
+                        var totalMod = p.TotalModifiers ?? 0;
+                        var pad = i == 0 ? 0.5f : 0;
+                        sub.AddCell(NewTd(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"), 6, center: true)
+                                .SetPaddingTopMM(pad))
+                            .AddCell(NewTd(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}", center: totalMod == 0, right: true)
+                                .SetPaddingTopMM(pad))
+                            .AddCell(NewTd($"{p.Amount:N2}", right: true)
+                                .SetPaddingTopMM(pad));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 3));
+                    }
+                }
+                tbl.AddCell(new Cell(1, 12).SetPadding(0).SetBorder(Border.NO_BORDER).Add(sub));
+            }
+
+            return tbl;
+        }
+    }
+}

Elwig/Documents/CreditNote.cshtml

@@ -1,197 +0,0 @@
-@using Elwig.Helpers
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.CreditNote>
-@model Elwig.Documents.CreditNote
-@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\CreditNote.css" />
-<main>
-    <h1>@Model.Title</h1>
-    <table class="credit">
-        <colgroup>
-            <col style="width: 25mm;"/>
-            <col style="width:  6mm;"/>
-            <col style="width: 21mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 12mm;"/>
-            <col style="width: 13mm;"/>
-            <col style="width:  5mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 16mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2" class="narrow">Pos.</th>
-                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
-                <th colspan="2">Gradation</th>
-                <th colspan="2">Flächenbindung</th>
-                <th>Preis</th>
-                <th class="narrow">Rbl.</th>
-                <th class="narrow">Zu-/Abschläge</th>
-                <th>Betrag</th>
-            </tr>
-            <tr>
-                <th class="unit">[°Oe]</th>
-                <th class="unit narrow">[°KMW]</th>
-                <th class="unit" colspan="2">[kg]</th>
-                <th class="unit">[@Model.CurrencySymbol/kg]</th>
-                <th class="narrow unit">[%]</th>
-                <th class="unit">[@Model.CurrencySymbol]</th>
-                <th class="unit">[@Model.CurrencySymbol]</th>
-            </tr>
-        </thead>
-        <tbody class="sum">
-            @foreach (var p in Model.Data.Rows) {
-                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
-                @for (int i = 0; i < rows; i++) {
-                    <tr class="@(i == 0 ? "first" : "") @(rows == i + 1 ? "last" : "")">
-                        @if (i == 0) {
-                            <td rowspan="@rows">@p.LsNr</td>
-                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
-                            <td class="small">@p.Variety</td>
-                            <td class="small">
-                                @p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation
-                                @((p.Attribute != null || p.Cultivation != null) && p.QualId == "WEI" ? " / " : "")@Raw(p.QualId == "WEI" ? "<i>abgew.</i>" : "")
-                            </td>
-                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
-                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
-                        }
-                        @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="4" class="small mod">@p.Modifiers[i - 1]</td>
-                        } else if (i > 0) {
-                            <td colspan="4"></td>
-                        }
-                        @if (i < p.Buckets.Length) {
-                            var bucket = p.Buckets[i];
-                            <td class="small">@bucket.Name:</td>
-                            <td class="number">@($"{bucket.Value:N0}")</td>
-                            <td class="number">@($"{bucket.Price:N4}")</td>
-                        } else {
-                            <td></td>
-                        }
-                        @if (i == p.Buckets.Length - 1) {
-                            var rebelMod = p.WeighingModifier * 100;
-                            var totalMod = p.TotalModifiers ?? 0;
-                            <td class="tiny center">@(rebelMod == 0 ? "-" : (Utils.GetSign(rebelMod) + $"{Math.Abs(rebelMod):0.0##}"))</td>
-                            <td class="number@(totalMod == 0 ? " center" : "")">@(totalMod == 0 ? "-" : Utils.GetSign(totalMod) + $"{Math.Abs(totalMod):N2}")</td>
-                            <td class="number">@($"{p.Amount:N2}")</td>
-                        } else {
-                            <td colspan="2"></td>
-                        }
-                    </tr>
-                }
-            }
-        </tbody>
-    </table>
-    <div class="hint">
-        Hinweis:<br/>
-        Die Summe der Lieferungen und die Summe der anfal&shy;lenden Pönalen werden mit
-        @Model.Payment?.Variant.Season.Precision Nach&shy;komma&shy;stellen berechnent,
-        erst das Ergebnis wird kauf&shy;männisch auf 2 Nach&shy;komma&shy;stellen gerundet.
-    </div>
-    <table class="credit-sum">
-        <colgroup>
-            <col style="width: auto;"/>
-            <col style="width:  5mm;"/>
-            <col style="width: 30mm;"/>
-        </colgroup>
-        @{
-            string FormatRow(string name, decimal? value, bool add = false, bool bold = false, bool subCat = false, bool noTopBorder = false) {
-                return $"<tr class=\"{(!add && !noTopBorder ? "sum" : !add ? "large" : "")} {(bold ? "large bold" : "")}\">"
-                     + $"<td class=\"{(subCat ? "small" : "")}\">{name}:</td>"
-                     + $"<td class=\"number {(subCat ? "small" : "large")}\">{(value < 0 ? "–" : (add ? "+" : ""))}</td>"
-                     + $"<td class=\"number {(subCat ? "small" : "large")}\">"
-                     +   $"<span class=\"fleft\">{Model.CurrencySymbol}</span>{Math.Abs(value ?? 0):N2}</td>"
-                     + $"</tr>\n";
-            }
-        }
-        <tbody style="break-inside: avoid;">
-            @{ var sum = Model.Data.Rows.Sum(p => p.Amount); }
-            @if (Model.Payment == null) {
-                @Raw(FormatRow("Gesamt", sum, bold: true, noTopBorder: true))
-            } else {
-                var noBorder = true;
-                if (Model.Payment.NetAmount != Model.Payment.Amount) {
-                    @Raw(FormatRow("Zwischensumme", Model.Payment.NetAmount, noTopBorder: noBorder))
-                    noBorder = false;
-                    @Raw(FormatRow(Model.MemberModifier, Model.Payment.Amount - Model.Payment.NetAmount, add: true))
-                }
-                if (Model.Credit == null) {
-                    @Raw(FormatRow("Gesamtbetrag", Model.Payment.Amount, bold: true, noTopBorder: noBorder))
-                    // TODO Mock VAT
-                } else {
-                    var hasPrev = Model.Credit.PrevNetAmount != null;
-                    @Raw(FormatRow(hasPrev ? "Gesamtbetrag" : "Nettobetrag", Model.Credit.NetAmount, bold: true, noTopBorder: noBorder))
-                    if (hasPrev) {
-                        @Raw(FormatRow("Bisher berücksichtigt", -Model.Credit.PrevNetAmount, add: true))
-                        @Raw(FormatRow("Nettobetrag", Model.Credit.NetAmount - (Model.Credit.PrevNetAmount ?? 0)))
-                    }
-                    @Raw(FormatRow($"Mehrwertsteuer ({Model.Credit.Vat * 100} %)", Model.Credit.VatAmount, add: true))
-                    @Raw(FormatRow("Bruttobetrag", Model.Credit.GrossAmount, bold: true))
-                }
-            }
-        </tbody>
-        <tbody style="break-inside: avoid;">
-            @{
-                decimal penalty = 0;
-                string? comment = null;
-            }
-
-            @if (Model.MemberUnderDeliveries != null && Model.MemberUnderDeliveries.Count() > 0) {
-                <tr class="small">
-                    <td colspan="2" style="padding-top: 5mm;">Anfallende Pönalen durch Unterlieferungen:</td>
-                    <td></td>
-                </tr>
-                foreach (var u in Model.MemberUnderDeliveries) {
-                    @Raw(FormatRow($"{u.Name} ({u.Kg:N0} kg)", u.Amount, add: true, subCat: true))
-                    penalty += u.Amount;
-                }
-                penalty = Math.Round(penalty, 2, MidpointRounding.AwayFromZero);
-            }
-            @if (Model.MemberTotalUnderDelivery != 0) {
-                @Raw(FormatRow("Unterlieferung (GA)", Model.MemberTotalUnderDelivery, add: true));
-                penalty += Model.MemberTotalUnderDelivery;
-            }
-            @if (Model.MemberAutoBusinessSharesAmount != 0) {
-                @Raw(FormatRow($"Autom. Nachz. von GA ({Model.MemberAutoBusinessShares})", Model.MemberAutoBusinessSharesAmount, add: true));
-                penalty += Model.MemberAutoBusinessSharesAmount;
-            }
-            @if (Model.CustomPayment?.Amount != null) {
-                comment = Model.CustomPayment.Comment;
-                string text = (Model.CustomPayment.Amount.Value < 0 ? "Weitere Abzüge" : "Weitere Zuschläge") + (comment != null ? "*" : "");
-                if (comment != null && comment!.Length <= 30) {
-                    text = comment;
-                    comment = null;
-                }
-                @Raw(FormatRow(text, Model.CustomPayment.Amount.Value, add: true));
-                penalty += Model.CustomPayment.Amount.Value;
-            }
-
-            @if (Model.Credit == null) {
-                @Raw(FormatRow("Auszahlungsbetrag", (Model.Payment?.Amount + penalty) ?? (sum + penalty), bold: true))
-            } else {
-                var diff = Model.Credit.Modifiers - penalty;
-                if (diff != 0) {
-                    @Raw(FormatRow(diff < 0 ? "Sonstige Abzüge" : "Sonstige Zuschläge", diff, add: true))
-                }
-                if (Model.Credit.PrevModifiers != null && Model.Credit.PrevModifiers != 0) {
-                    @Raw(FormatRow("Bereits berücksichtigte Abzüge", -Model.Credit.PrevModifiers, add: true))
-                }
-                @Raw(FormatRow("Auszahlungsbetrag", Model.Credit.Amount, bold: true))
-            }
-        </tbody>
-    </table>
-    @if (comment != null) {
-        <p>* @comment</p>
-    }
-    <p>Überweisung erfolgt auf Konto @(Elwig.Helpers.Utils.FormatIban(Model.Member.Iban ?? "-")).</p>
-    <div style="margin-top: 1em;">
-        @if (Model.Text != null) {
-            <p class="custom">@Model.Text</p>
-        }
-    </div>
-</main>

Elwig/Documents/CreditNote.css

@@ -1,48 +0,0 @@
-
-table.credit {
-    margin-bottom: 0;
-}
-
-table.credit .mod {
-    padding-left: 5mm;
-}
-
-table.credit tbody tr:not(.first) {
-    break-before: avoid;
-}
-
-table.credit tbody tr:not(.last) {
-    break-after: avoid;
-}
-
-table.credit tr:not(.first) td {
-    padding-top: 0;
-}
-
-table.credit tr.last td {
-    padding-bottom: 0;
-}
-
-table.credit-sum {
-    width: 60%;
-    margin-left: 40%;
-}
-
-table.credit-sum tr.sum,
-table.credit-sum tr .sum {
-    font-size: 12pt;
-}
-
-table.credit-sum tr.sum td,
-table.credit-sum td.sum {
-    padding-top: 1mm !important;
-}
-
-.hint {
-    font-style: italic;
-    font-size: 8pt;
-    width: 56mm;
-    position: absolute;
-    left: 0;
-    margin: 2mm 4mm;
-}

Elwig/Documents/DeliveryAncmtList.cs

@@ -1,5 +1,9 @@
 using Elwig.Models.Dtos;
+using iText.Kernel.Pdf;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryAncmtList : Document {
@@ -7,15 +11,58 @@ namespace Elwig.Documents {
         public new static string Name => "Anmeldeliste";
 
         public string Filter;
-        public IEnumerable<DeliveryAncmtListRow> Announcements;
+        public List<DeliveryAncmtListRow> Announcements;
 
-        public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) : base($"{Name} {filter}") {
+        public DeliveryAncmtList(string filter, IEnumerable<DeliveryAncmtListRow> announcements) :
+            base($"{Name} {filter}") {
             Filter = filter;
-            Announcements = announcements;
+            Announcements = [.. announcements];
         }
 
         public DeliveryAncmtList(string filter, DeliveryAncmtListData data) :
             this(filter, data.Rows) {
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph(Name, 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(new KernedParagraph(Filter, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(NewAncmtTable(Announcements));
+        }
+
+        protected Table NewAncmtTable(List<DeliveryAncmtListRow> ancmts) {
+            var tbl = new Table(ColsMM(15, 12, 50, 25, 38, 11, 14), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Datum", rowspan: 2))
+                .AddHeaderCell(NewTh("MgNr.", rowspan: 2))
+                .AddHeaderCell(NewTh("Mitglied", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Ort", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Sorte", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Anmldg.", rowspan: 2))
+                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("[kg]"));
+
+            foreach (var a in ancmts) {
+                tbl.AddCell(NewTd($"{a.Date:dd.MM.yyyy}", 8))
+                    .AddCell(NewTd($"{a.MgNr}", right: true))
+                    .AddCell(NewTd(a.AdministrativeName))
+                    .AddCell(NewTd(a.DefaultKg, 8))
+                    .AddCell(NewTd(a.Variety))
+                    .AddCell(NewTd(a.Status ?? "-", 8, center: true))
+                    .AddCell(NewTd($"{a.Weight:N0}", right: true));
+            }
+
+            tbl.AddCell(NewTd("Gesamt:", colspan: 2, bold: true, borderTop: true))
+                .AddCell(NewTd($"Anmeldungen: {ancmts.Count:N0}", colspan: 3, bold: true, borderTop: true))
+                .AddCell(NewTd($"{ancmts.Sum(a => a.Weight):N0}", colspan: 2, right: true, bold: true, borderTop: true));
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/DeliveryAncmtList.cshtml

@@ -1,52 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.DeliveryAncmtList>
-@model Elwig.Documents.DeliveryAncmtList
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryAncmtList.css" />
-<main>
-    <h1>Anmeldeliste</h1>
-    <h2>@Model.Filter</h2>
-    <table class="announcement-list">
-        <colgroup>
-            <col style="width: 15mm;"/>
-            <col style="width: 12mm;"/>
-            <col style="width: 50mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 38mm;"/>
-            <col style="width: 11mm;"/>
-            <col style="width: 14mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2">Datum</th>
-                <th rowspan="2">MgNr.</th>
-                <th rowspan="2" style="text-align: left;">Mitglied</th>
-                <th rowspan="2" style="text-align: left;">Ort</th>
-                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2">Anmldg.</th>
-                <th>Menge</th>
-            </tr>
-            <tr>
-                <th class="unit">[kg]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var a in Model.Announcements) {
-                <tr>
-                    <td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
-                    <td class="number">@a.MgNr</td>
-                    <td>@a.AdministrativeName</td>
-                    <td class="small">@a.DefaultKg</td>
-                    <td>@a.Variety</td>
-                    <td class="small center">@(a.Status ?? "-")</td>
-                    <td class="number">@($"{a.Weight:N0}")</td>
-                </tr>
-            }
-            <tr class="sum bold">
-                <td colspan="2">Gesamt:</td>
-                <td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
-                <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
-            </tr>
-        </tbody>
-    </table>
-</main>

Elwig/Documents/DeliveryAncmtList.css

@@ -1,13 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}

Elwig/Documents/DeliveryConfirmation.cs

@@ -1,8 +1,13 @@
 using Elwig.Helpers;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryConfirmation : BusinessDocument {
@@ -25,5 +30,124 @@ namespace Elwig.Documents {
             MemberBuckets = ctx.GetMemberBuckets(Season.Year, m.MgNr).GetAwaiter().GetResult();
             MemberStats = AppDbContext.GetMemberStats(Season.Year, m.MgNr).GetAwaiter().GetResult();
         }
+
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderHeader(doc, pdf);
+            var firstDay = Data.Rows.MinBy(r => r.Date)?.Date;
+            var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date;
+            Aside?.AddCell(NewAsideCell("Saison", 2))
+                .AddCell(NewAsideCell("Lieferungen:", isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})"))
+                .AddCell(NewAsideCell("Zeitraum:", isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)"))
+                .AddCell(NewAsideCell("Menge:", isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg"));
+        }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+
+            doc.Add(NewDeliveryListTable(Data));
+            doc.Add(NewWeightsTable(MemberStats)
+                .SetMarginTopMM(10).SetKeepTogether(true));
+            doc.Add(NewBucketTable(Season, MemberBuckets, includePayment: true)
+                .SetMarginTopMM(10).SetKeepTogether(true));
+
+            if (Text != null) {
+                doc.Add(new KernedParagraph(Text, 10)
+                    .SetMarginTop(20).SetKeepTogether(true));
+            }
+        }
+
+        protected Table NewDeliveryListTable(DeliveryConfirmationDeliveryData data) {
+            var tbl = new Table(ColsMM(25, 7, 39, 14, 11, 11, 15, 12, 14, 3, 14), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Lieferschein-Nr.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Pos.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Sorte/Attribut/Bewirtschaftung\nZu-/Abschlag", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Qual.", rowspan: 2))
+                .AddHeaderCell(NewTh("Gradation", colspan: 2))
+                .AddHeaderCell(NewTh("Flächenbindung", colspan: 2))
+                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("gerebelt", rowspan: 3, rotated: true))
+                .AddHeaderCell(NewTh("Davon\nabzuwerten"))
+                .AddHeaderCell(NewTh("[°Oe]"))
+                .AddHeaderCell(NewTh("[°KMW]"))
+                .AddHeaderCell(NewTh("[kg]", colspan: 2))
+                .AddHeaderCell(NewTh("[kg]"))
+                .AddHeaderCell(NewTh("[kg]"));
+
+            var lastVariety = "";
+            foreach (var p in data.Rows) {
+                var sub = new Table(ColsMM(25, 7, 39, 14, 11, 11, 15, 12, 14, 3, 14))
+                    .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                    .SetKeepTogether(true);
+                if (lastVariety != "" && lastVariety != p.Variety) {
+                    sub.SetBorderTop(new SolidBorder(BorderThickness));
+                }
+                var attr = p.Attribute != null || p.Cultivation != null;
+                var rows = Math.Max(p.Buckets.Length, 1 + (attr ? 1 : 0) + p.Modifiers.Length);
+                for (int i = 0; i < rows; i++) {
+                    if (i == 0) {
+                        sub.AddCell(NewTd(p.LsNr))
+                            .AddCell(NewTd($"{p.DPNr:N0}", center: true))
+                            .AddCell(NewTd(p.Variety))
+                            .AddCell(NewTd(p.QualId, center: true))
+                            .AddCell(NewTd($"{p.Gradation.Oe:N0}", center: true))
+                            .AddCell(NewTd($"{p.Gradation.Kmw:N1}", center: true));
+                    } else if (i == 1 && attr) {
+                        sub.AddCell(NewCell(colspan: 2))
+                            .AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", 8, colspan: 2)
+                                .SetPaddingsMM(0.125f, 1, 0.125f, 1))
+                            .AddCell(NewCell(colspan: 2));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 2));
+                        if (i - (rows - p.Modifiers.Length) < p.Modifiers.Length) {
+                            sub.AddCell(NewTd(p.Modifiers[i - (rows - p.Modifiers.Length)], 8, colspan: 2)
+                                .SetPaddingsMM(0.125f, 0, 0.125f, 5));
+                        } else {
+                            sub.AddCell(NewCell(colspan: 2));
+                        }
+                        sub.AddCell(NewCell(colspan: 2));
+                    }
+
+                    if (i < p.Buckets.Length) {
+                        var bucket = p.Buckets[i];
+                        sub.AddCell(NewTd($"{bucket.Name}:", 8).SetHeight(10).SetPaddingsMM(0.125f, 0, 0.125f, 0));
+                        sub.AddCell(NewTd($"{bucket.Value:N0}", right: true));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 2));
+                    }
+
+                    if (i == p.Buckets.Length - 1) {
+                        sub.AddCell(NewTd($"{p.Weight:N0}"));
+                        sub.AddCell(NewTd(p.IsNetWeight ? "\u2611" : "\u2610", 7, center: true).SetFont(SF).SetPadding(0));
+                    } else {
+                        sub.AddCell(NewCell(colspan: 2));
+                    }
+
+                    if (i == 0) {
+                        sub.AddCell(NewCell(rowspan: rows));
+                    }
+                    lastVariety = p.Variety;
+                }
+                tbl.AddCell(new Cell(1, 11).SetPadding(0).SetBorder(Border.NO_BORDER).Add(sub));
+            }
+
+            tbl.AddCell(NewTd("Gesamt:", 12, colspan: 7, bold: true, borderTop: true)
+                    .SetPaddingsMM(1, 1, 0, 1))
+                .AddCell(NewTd($"{data.Rows.Sum(p => p.Weight):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true)
+                    .SetPaddingsMM(1, 1, 0, 1))
+                .AddCell(NewTd(colspan: 2, borderTop: true)
+                    .SetPaddingsMM(1, 1, 0, 1))
+                .AddCell(NewTd("Davon abgewertet:", 10, colspan: 7)
+                    .SetPaddingsMM(0, 1, 0.5f, 1))
+                .AddCell(NewTd($"{data.Rows.Where(p => p.IsDepreciated).Sum(p => p.Weight):N0}", 10, colspan: 2, right: true)
+                    .SetPaddingsMM(0, 1, 0.5f, 1))
+                .AddCell(NewCell(colspan: 2)
+                    .SetPaddingsMM(0, 1, 0.5f, 1));
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/DeliveryConfirmation.cshtml

@@ -1,112 +0,0 @@
-@using Elwig.Documents
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.DeliveryConfirmation>
-@model Elwig.Documents.DeliveryConfirmation
-@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryConfirmation.css" />
-<main>
-    <h1>@Model.Title</h1>
-    <table class="delivery-confirmation">
-        <colgroup>
-            <col style="width: 25mm;"/>
-            <col style="width:  6mm;"/>
-            <col style="width: 23mm;"/>
-            <col style="width: 16mm;"/>
-            <col style="width: 17mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 12mm;"/>
-            <col style="width: 14mm;"/>
-            <col style="width:  3mm;"/>
-            <col style="width: 14mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2" class="narrow">Pos.</th>
-                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
-                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
-                <th colspan="2">Gradation</th>
-                <th colspan="2">Flächenbindung</th>
-                <th>Menge</th>
-                <th rowspan="3" style="padding: 0;">
-                    <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg">
-                        <text x="-40" y="4" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman"
-                              style="text-anchor: start; alignment-baseline: middle;">
-                            gerebelt
-                        </text>
-                    </svg>
-                </th>
-                <th>Davon<br/>abzuwerten</th>
-            </tr>
-            <tr>
-                <th class="unit">[°Oe]</th>
-                <th class="unit narrow">[°KMW]</th>
-                <th class="unit" colspan="2">[kg]</th>
-                <th class="unit">[kg]</th>
-                <th class="unit">[kg]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                var lastVariety = "";
-            }
-            @foreach (var p in Model.Data.Rows) {
-                var rows = Math.Max(p.Buckets.Length, p.Modifiers.Length + 1);
-                var first = true;
-                @for (int i = 0; i < rows; i++) {
-                    <tr class="@(first ? "first" : "") @(p.Variety != lastVariety && lastVariety != "" ? "new": "") @(rows > i + 1 ? "last" : "")">
-                        @if (first) {
-                            <td rowspan="@rows">@p.LsNr</td>
-                            <td rowspan="@rows" class="center narrow">@p.DPNr</td>
-                            <td class="small">@p.Variety</td>
-                            <td class="small">@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
-                            <td class="small">@p.QualityLevel</td>
-                            <td rowspan="@rows" class="center">@($"{p.Gradation.Oe:N0}")</td>
-                            <td rowspan="@rows" class="center">@($"{p.Gradation.Kmw:N1}")</td>
-                        }
-                        @if (i > 0 && i <= p.Modifiers.Length) {
-                            <td colspan="3" class="small mod">@(p.Modifiers[i - 1])</td>
-                        } else if (i > 0) {
-                            <td colspan="3"></td>
-                        }
-                        @if (i < p.Buckets.Length) {
-                            var bucket = p.Buckets[i];
-                            <td class="small">@bucket.Name:</td>
-                            <td class="number">@($"{bucket.Value:N0}")</td>
-                        } else {
-                            <td colspan="2"></td>
-                        }
-                        @if (i == p.Buckets.Length - 1) {
-                            <td class="number">@($"{p.Weight:N0}")</td>
-                            <td style="font-size: 7pt;">@(p.IsNetWeight ? "\u2611" : "\u2610")</td>
-                        } else {
-                            <td></td>
-                            <td></td>
-                        }
-                        @if (first) {
-                            <td rowspan="@rows" class="number"></td>
-                            first = false;
-                        }
-                    </tr>
-                    lastVariety = p.Variety;
-                }
-            }
-            <tr class="sum bold">
-                <td colspan="8">Gesamt:</td>
-                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(p => p.Weight):N0}")</td>
-                <td></td>
-                <td></td>
-            </tr>
-        </tbody>
-    </table>
-    @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats))
-    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includePayment: true))
-    <div style="margin-top: 2em;">
-        @if (Model.Text != null) {
-            <p class="custom comment">@Model.Text</p>
-        }
-    </div>
-</main>

Elwig/Documents/DeliveryConfirmation.css

@@ -1,32 +0,0 @@
-
-table.delivery-confirmation .mod {
-    padding-left: 5mm;
-}
-
-table.delivery-confirmation tr:not(.first) {
-    break-before: avoid;
-}
-
-table.delivery-confirmation tr:not(.first) td {
-    padding-top: 0;
-}
-
-table.delivery-confirmation tr.last td {
-    padding-bottom: 0;
-}
-
-table.delivery-confirmation tr.sum {
-    font-size: 12pt;
-}
-
-table.delivery-confirmation tr.sum td {
-    padding-top: 1mm;
-}
-
-table.sortenaufteilung {
-    break-after: avoid;
-}
-
-table.buckets {
-    break-before: avoid;
-}

Elwig/Documents/DeliveryDepreciationList.cs

@@ -1,5 +1,9 @@
 using Elwig.Models.Dtos;
+using iText.Kernel.Pdf;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryDepreciationList : Document {
@@ -7,16 +11,98 @@ namespace Elwig.Documents {
         public new static string Name => "Abwertungsliste";
 
         public string Filter;
-        public IEnumerable<DeliveryJournalRow> Deliveries;
+        public List<DeliveryJournalRow> Deliveries;
 
         public DeliveryDepreciationList(string filter, IEnumerable<DeliveryJournalRow> deliveries) :
             base($"{Name} {filter}") {
             Filter = filter;
-            Deliveries = deliveries;
+            Deliveries = [.. deliveries];
         }
 
         public DeliveryDepreciationList(string filter, DeliveryJournalData data) :
             this(filter, data.Rows) {
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph(Name, 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(new KernedParagraph(Filter, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 5, 0));
+            doc.Add(NewJournalTable(Deliveries));
+        }
+
+        protected Table NewJournalTable(List<DeliveryJournalRow> deliveries) {
+            var tbl = new Table(ColsMM(25, 6, 20, 12, 38, 18, 12, 10, 10, 14), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Lieferschein-Nr.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Pos.", rowspan: 2).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Datum", rowspan: 2))
+                .AddHeaderCell(NewTh("Zeit", rowspan: 2))
+                .AddHeaderCell(NewTh("Sorte", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Attr./Bewirt.", rowspan: 2, colspan: 2, left: true))
+                .AddHeaderCell(NewTh("Gradation", colspan: 2))
+                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("[°Oe]"))
+                .AddHeaderCell(NewTh("[°KMW]").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("[kg]"));
+
+            int? lastMember = null;
+            foreach (var p in deliveries) {
+                if (lastMember != p.MgNr) {
+                    var border = lastMember != null;
+                    var memberDeliveries = deliveries.Where(d => d.MgNr == p.MgNr).ToList();
+                    var memberKmw = Helpers.Utils.AggregateDeliveryPartsKmw(memberDeliveries);
+                    var memberOe = Helpers.Utils.KmwToOe(memberKmw);
+                    tbl.AddCell(NewTd($"{p.MgNr}, {p.AdministrativeName}", colspan: 5, borderTop: border)
+                            .SetFont(BI))
+                        .AddCell(NewTd("Teil-Lfrg.:", borderTop: border, bold: true))
+                        .AddCell(NewTd($"{memberDeliveries.Count:N0}", right: true, borderTop: border, bold: true))
+                        .AddCell(NewTd($"{memberOe:N0}", center: true, borderTop: border, bold: true))
+                        .AddCell(NewTd($"{memberKmw:N1}", center: true, borderTop: border, bold: true))
+                        .AddCell(NewTd($"{memberDeliveries.Sum(p => p.Weight):N0}", right: true, borderTop: border, bold: true));
+                }
+
+                tbl.AddCell(NewTd(p.LsNr))
+                    .AddCell(NewTd($"{p.Pos:N0}", center: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd($"{p.Date:dd.MM.yyyy}", center: true))
+                    .AddCell(NewTd($"{p.Time:HH:mm}", center: true).SetPadding(0))
+                    .AddCell(NewTd(p.Variety))
+                    .AddCell(NewTd($"{p.Attribute}{(p.Attribute != null && p.Cultivation != null ? " / " : "")}{p.Cultivation}", colspan: 2))
+                    .AddCell(NewTd($"{p.Oe:N0}", center: true))
+                    .AddCell(NewTd($"{p.Kmw:N1}", center: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd($"{p.Weight:N0}", right: true));
+                lastMember = p.MgNr;
+            }
+
+            var branches = deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+            if (branches.Length > 1) {
+                foreach (var b in branches) {
+                    var border = branches[0] == b;
+                    var branchDeliveries = deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                    var branchKmw = Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                    var branchOe = Helpers.Utils.KmwToOe(branchKmw);
+                    tbl.AddCell(NewTd($"{b}:", colspan: 2, bold: true, borderTop: border))
+                    .AddCell(NewTd($"(Teil-)Lieferungen: {branchDeliveries.DistinctBy(p => p.LsNr).Count():N0} ({branchDeliveries.Count:N0})", colspan: 5, bold: true, borderTop: border))
+                    .AddCell(NewTd($"{branchOe:N0}", center: true, bold: true, borderTop: border))
+                    .AddCell(NewTd($"{branchOe:N1}", center: true, bold: true, borderTop: border))
+                    .AddCell(NewTd($"{branchDeliveries.Sum(p => p.Weight):N0}", right: true, bold: true, borderTop: border));
+                }
+            }
+
+            var kmw = Helpers.Utils.AggregateDeliveryPartsKmw(deliveries);
+            var oe = Helpers.Utils.KmwToOe(kmw);
+            tbl.AddCell(NewTd("Gesamt:", colspan: 2, bold: true, borderTop: true))
+                .AddCell(NewTd($"(Teil-)Lieferungen: {deliveries.DistinctBy(p => p.LsNr).Count():N0} ({deliveries.Count:N0})", colspan: 5, bold: true, borderTop: true))
+                .AddCell(NewTd($"{oe:N0}", center: true, bold: true, borderTop: true))
+                .AddCell(NewTd($"{kmw:N1}", center: true, bold: true, borderTop: true))
+                .AddCell(NewTd($"{deliveries.Sum(p => p.Weight):N0}", right: true, bold: true, borderTop: true));
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/DeliveryDepreciationList.cshtml

@@ -1,104 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.DeliveryDepreciationList>
-@model Elwig.Documents.DeliveryDepreciationList
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryDepreciationList.css" />
-<main>
-    <h1>Abwertungsliste</h1>
-    <h2>@Model.Filter</h2>
-    <table class="journal">
-        <colgroup>
-            <col style="width: 25mm;"/>
-            <col style="width:  6mm;"/>
-            <col style="width: 20mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 35mm;"/>
-            <col style="width: 30mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 14mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2" class="narrow">Pos.</th>
-                <th rowspan="2">Datum</th>
-                <th rowspan="2">Zeit</th>
-                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th rowspan="2" style="text-align: left;">Attr./Bewirt.</th>
-                <th colspan="2">Gradation</th>
-                <th>Menge</th>
-            </tr>
-            <tr>
-                <th class="unit">[°Oe]</th>
-                <th class="unit narrow">[°KMW]</th>
-                <th class="unit">[kg]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                int? lastMember = null;
-            }
-            @foreach (var p in Model.Deliveries) {
-                if (lastMember != p.MgNr) {
-                    <tr class="subheading @(lastMember != null ? "new" : "")">
-                        @{
-                            var memberDeliveries = Model.Deliveries.Where(d => d.MgNr == p.MgNr).ToList();
-                            var memberKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(memberDeliveries);
-                            var memberOe = Elwig.Helpers.Utils.KmwToOe(memberKmw);
-                        }
-                        <th colspan="5">
-                            @($"{p.MgNr}, {p.AdministrativeName}")
-                        </th>
-                        <td>Teil-Lfrg.: <span style="float: right;">@($"{memberDeliveries.Count():N0}")</span></td>
-                        <td class="center">@($"{memberOe:N0}")</td>
-                        <td class="center">@($"{memberKmw:N1}")</td>
-                        <td class="number">@($"{memberDeliveries.Sum(p => p.Weight):N0}")</td>
-                    </tr>
-                }
-                <tr>
-                    <td>@p.LsNr</td>
-                    <td class="center narrow">@p.Pos</td>
-                    <td>@($"{p.Date:dd.MM.yyyy}")</td>
-                    <td>@($"{p.Time:HH:mm}")</td>
-                    <td>@p.Variety</td>
-                    <td>@p.Attribute@(p.Attribute != null && p.Cultivation != null ? " / " : "")@p.Cultivation</td>
-                    <td class="center">@($"{p.Oe:N0}")</td>
-                    <td class="center">@($"{p.Kmw:N1}")</td>
-                    <td class="number">@($"{p.Weight:N0}")</td>
-                </tr>
-                lastMember = p.MgNr;
-            }
-            @{
-                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
-                if (branches.Length > 1) {
-                    foreach (var b in branches) {
-                        <tr class="@(branches[0] == b ? "sum" : "") bold">
-                            @{
-                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
-                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
-                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
-                            }
-                            <td colspan="2">@b:</td>
-                            <td colspan="4">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
-                            <td class="center">@($"{branchOe:N0}")</td>
-                            <td class="center">@($"{branchKmw:N1}")</td>
-                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
-                        </tr>
-                    }
-                }
-            }
-            <tr class="sum bold">
-                @{
-                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
-                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
-                }
-                <td colspan="2">Gesamt:</td>
-                <td colspan="4">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
-                <td class="center">@($"{oe:N0}")</td>
-                <td class="center">@($"{kmw:N1}")</td>
-                <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
-            </tr>
-        </tbody>
-    </table>
-</main>

Elwig/Documents/DeliveryDepreciationList.css

@@ -1,13 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}

Elwig/Documents/DeliveryJournal.cs

@@ -1,5 +1,9 @@
 using Elwig.Models.Dtos;
+using iText.Kernel.Pdf;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class DeliveryJournal : Document {
@@ -7,16 +11,84 @@ namespace Elwig.Documents {
         public new static string Name => "Lieferjournal";
 
         public string Filter;
-        public IEnumerable<DeliveryJournalRow> Deliveries;
+        public List<DeliveryJournalRow> Deliveries;
 
         public DeliveryJournal(string filter, IEnumerable<DeliveryJournalRow> deliveries) :
             base($"{Name} {filter}") {
             Filter = filter;
-            Deliveries = deliveries;
+            Deliveries = [.. deliveries];
         }
 
         public DeliveryJournal(string filter, DeliveryJournalData data) :
             this(filter, data.Rows) {
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph(Name, 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(new KernedParagraph(Filter, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 5, 0));
+            doc.Add(NewJournalTable(Deliveries));
+        }
+
+        protected Table NewJournalTable(List<DeliveryJournalRow> deliveries) {
+            var tbl = new Table(ColsMM(25, 6, 15, 8, 11, 38, 28, 10, 10, 14), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Lieferschein-Nr.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Pos.", rowspan: 2).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Datum", rowspan: 2))
+                .AddHeaderCell(NewTh("Zeit", rowspan: 2))
+                .AddHeaderCell(NewTh("MgNr.", rowspan: 2))
+                .AddHeaderCell(NewTh("Mitglied", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Sorte", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Gradation", colspan: 2))
+                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("[°Oe]"))
+                .AddHeaderCell(NewTh("[°KMW]").SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("[kg]"));
+
+            foreach (var p in deliveries) {
+                tbl.AddCell(NewTd(p.LsNr))
+                    .AddCell(NewTd($"{p.Pos:N0}", center: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd($"{p.Date:dd.MM.yyyy}", 8, center: true))
+                    .AddCell(NewTd($"{p.Time:HH:mm}", 8, center: true).SetPadding(0))
+                    .AddCell(NewTd($"{p.MgNr}", right: true))
+                    .AddCell(NewTd(p.AdministrativeName, 8))
+                    .AddCell(NewTd(p.Variety, 8))
+                    .AddCell(NewTd($"{p.Oe:N0}", center: true))
+                    .AddCell(NewTd($"{p.Kmw:N1}", center: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd($"{p.Weight:N0}", right: true));
+            }
+
+            var branches = deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
+            if (branches.Length > 1) {
+                foreach (var b in branches) {
+                    var border = branches[0] == b;
+                    var branchDeliveries = deliveries.Where(d => d.DeliveryBranch == b).ToList();
+                    var branchKmw = Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
+                    var branchOe = Helpers.Utils.KmwToOe(branchKmw);
+                    tbl.AddCell(NewTd($"{b}:", colspan: 2, bold: true, borderTop: border))
+                        .AddCell(NewTd($"(Teil-)Lieferungen: {branchDeliveries.DistinctBy(p => p.LsNr).Count():N0} ({branchDeliveries.Count:N0})", colspan: 5, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{branchOe:N0}", center: true, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{branchOe:N1}", center: true, bold: true, borderTop: border))
+                        .AddCell(NewTd($"{branchDeliveries.Sum(p => p.Weight):N0}", right: true, bold: true, borderTop: border));
+                }
+            }
+
+            var kmw = Helpers.Utils.AggregateDeliveryPartsKmw(deliveries);
+            var oe = Helpers.Utils.KmwToOe(kmw);
+            tbl.AddCell(NewTd("Gesamt:", colspan: 2, bold: true, borderTop: true))
+                .AddCell(NewTd($"(Teil-)Lieferungen: {deliveries.DistinctBy(p => p.LsNr).Count():N0} ({deliveries.Count:N0})", colspan: 5, bold: true, borderTop: true))
+                .AddCell(NewTd($"{oe:N0}", center: true, bold: true, borderTop: true))
+                .AddCell(NewTd($"{kmw:N1}", center: true, bold: true, borderTop: true))
+                .AddCell(NewTd($"{deliveries.Sum(p => p.Weight):N0}", right: true, bold: true, borderTop: true));
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/DeliveryJournal.cshtml

@@ -1,87 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.DeliveryJournal>
-@model Elwig.Documents.DeliveryJournal
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryJournal.css"/>
-<main>
-    <h1>Lieferjournal</h1>
-    <h2>@Model.Filter</h2>
-    <table class="journal">
-        <colgroup>
-            <col style="width: 25mm;"/>
-            <col style="width:  6mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width:  8mm;"/>
-            <col style="width: 11mm;"/>
-            <col style="width: 38mm;"/>
-            <col style="width: 28mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 10mm;"/>
-            <col style="width: 14mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
-                <th rowspan="2" class="narrow">Pos.</th>
-                <th rowspan="2">Datum</th>
-                <th rowspan="2">Zeit</th>
-                <th rowspan="2">MgNr.</th>
-                <th rowspan="2" style="text-align: left;">Mitglied</th>
-                <th rowspan="2" style="text-align: left;">Sorte</th>
-                <th colspan="2">Gradation</th>
-                <th>Menge</th>
-            </tr>
-            <tr>
-                <th class="unit">[°Oe]</th>
-                <th class="unit narrow">[°KMW]</th>
-                <th class="unit">[kg]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var p in Model.Deliveries) {
-                <tr>
-                    <td>@p.LsNr</td>
-                    <td class="center narrow">@p.Pos</td>
-                    <td class="small">@($"{p.Date:dd.MM.yyyy}")</td>
-                    <td class="small">@($"{p.Time:HH:mm}")</td>
-                    <td class="number">@p.MgNr</td>
-                    <td class="small">@p.AdministrativeName</td>
-                    <td class="small">@p.Variety</td>
-                    <td class="center">@($"{p.Oe:N0}")</td>
-                    <td class="center">@($"{p.Kmw:N1}")</td>
-                    <td class="number">@($"{p.Weight:N0}")</td>
-                </tr>
-            }
-            @{
-                var branches = Model.Deliveries.Select(d => d.DeliveryBranch).Distinct().Order().ToArray();
-                if (branches.Length > 1) {
-                    foreach (var b in branches) {
-                        <tr class="@(branches[0] == b ? "sum" : "") bold">
-                            @{
-                                var branchDeliveries = Model.Deliveries.Where(d => d.DeliveryBranch == b).ToList();
-                                var branchKmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(branchDeliveries);
-                                var branchOe = Elwig.Helpers.Utils.KmwToOe(branchKmw);
-                            }
-                            <td colspan="2">@b:</td>
-                            <td colspan="5">(Teil-)Lieferungen: @($"{branchDeliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{branchDeliveries.Count():N0}"))</td>
-                            <td class="center">@($"{branchOe:N0}")</td>
-                            <td class="center">@($"{branchKmw:N1}")</td>
-                            <td class="number">@($"{branchDeliveries.Sum(p => p.Weight):N0}")</td>
-                        </tr>
-                    }
-                }
-            }
-            <tr class="sum bold">
-                @{
-                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
-                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
-                }
-                <td colspan="2">Gesamt:</td>
-                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.LsNr).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
-                <td class="center">@($"{oe:N0}")</td>
-                <td class="center">@($"{kmw:N1}")</td>
-                <td class="number">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
-            </tr>
-        </tbody>
-    </table>
-</main>

Elwig/Documents/DeliveryJournal.css

@@ -1,13 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}

Elwig/Documents/DeliveryNote.cs

@@ -1,6 +1,14 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Layout;
+using iText.Layout.Properties;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Elwig.Documents {
     public class DeliveryNote : BusinessDocument {
@@ -17,19 +25,183 @@ namespace Elwig.Documents {
         // 3 - full
         public int DisplayStats = App.Client.ModeDeliveryNoteStats;
 
-        public DeliveryNote(Delivery d, AppDbContext? ctx = null) : base($"{Name} Nr. {d.LsNr}", d.Member) {
+        public DeliveryNote(Delivery d, AppDbContext? ctx = null) :
+            base($"{Name} Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
             Delivery = d;
-            Aside = Aside.Replace("</table>", "") +
-                $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
-                $"</tbody></table>";
             Text = App.Client.TextDeliveryNote;
             DocumentId = d.LsNr;
+            IsDoublePaged = true;
             MemberBuckets = ctx?.GetMemberBuckets(d.Year, d.Member.MgNr).GetAwaiter().GetResult() ?? [];
         }
+
+        protected override void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderHeader(doc, pdf);
+            Aside?.AddCell(NewAsideCell("Lieferung", 2))
+                .AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr))
+                .AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}"))
+                .AddCell(NewAsideCell("Zweigstelle:", isName: true)).AddCell(NewAsideCell(Delivery.Branch.Name));
+        }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+
+            doc.Add(NewDeliveryTable());
+            if (Delivery.Comment != null) {
+                doc.Add(new KernedParagraph($"Anmerkung zur Lieferung: {Delivery.Comment}", 10).SetMarginsMM(5, 0, 0, 0));
+            }
+            if (DisplayStats > 0) {
+                doc.Add(NewBucketTable(Delivery.Season, MemberBuckets, isTiny: true,
+                        filter: DisplayStats > 2 ? null : DisplayStats == 1 ? [] : Delivery.Parts.Select(p => p.SortId).Distinct().ToList())
+                    .SetKeepTogether(true)
+                    .SetMarginsMM(5, 0, 0, 0));
+            }
+
+            var sig = new Div().SetWidth(165 * PtInMM);
+            if (Text != null)
+                sig.Add(new KernedParagraph(Regex.Replace(Text, @"\s+", " "), 10).SetTextAlignment(TextAlignment.JUSTIFIED).SetSpacingRatio(1));
+            sig.Add(new Table(ColsMM(15, 50, 35, 50, 15)).SetMarginsMM(18, 0, 2, 0)
+                .AddCell(NewTd())
+                .AddCell(NewTd("Genossenschaft", center: true, borderTop: true).SetPaddingTopMM(1))
+                .AddCell(NewTd())
+                .AddCell(NewTd("Mitglied", center: true, borderTop: true).SetPaddingTopMM(1))
+                .AddCell(NewTd()));
+
+            var renderer = sig.CreateRendererSubTree();
+            renderer.SetParent(doc.GetRenderer());
+            var layoutResult = renderer.Layout(new LayoutContext(new LayoutArea(1, pdf.GetDefaultPageSize())));
+            float sigHeight = layoutResult.GetOccupiedArea().GetBBox().GetHeight();
+            doc.Add(new Div().SetWidth(165 * PtInMM).SetHeight(sigHeight));
+
+            var size = pdf.GetDefaultPageSize();
+            doc.Add(sig.SetFixedPosition(
+                size.GetLeft() + doc.GetLeftMargin(),
+                size.GetBottom() + doc.GetBottomMargin(),
+                size.GetWidth() - doc.GetLeftMargin() - doc.GetRightMargin())); ;
+        }
+
+        protected Cell NewDeliveryMainTd(string? text, int rowspan = 1, int colspan = 1, bool center = false, bool right = false) {
+            return NewTd(text, 12, rowspan: rowspan, colspan: colspan, bold: true, center: center, right: right)
+                .SetPaddingTopMM(2);
+        }
+
+        protected Table NewDeliveryTable() {
+            var tbl = new Table(ColsMM(10, 21, 25, 19.5, 19.5, 30, 12.5, 12.5, 15), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorder(Border.NO_BORDER).SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Pos.", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Sorte", colspan: 2, rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Attribut", colspan: 2, rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Qualitätsstufe", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Gradation", colspan: 2))
+                .AddHeaderCell(NewTh("Menge"))
+                .AddHeaderCell(NewTh("[°Oe]", 8))
+                .AddHeaderCell(NewTh("[°KMW]", 8))
+                .AddHeaderCell(NewTh("[kg]", 8));
+
+            foreach (var part in Delivery.Parts.OrderBy(p => p.DPNr)) {
+                var sub = new Table(ColsMM(10, 21, 25, 19.5, 19.5, 30, 12.5, 12.5, 15), true)
+                    .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                    .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+                int rowspan = 1 + (part.Cultivation != null ? 1 : 0) + 1 + part.Modifiers.Count() + 1 + (part.Comment != null ? 1 : 0) + (part.Temperature != null || part.Acid != null ? 1 : 0);
+                sub.AddCell(NewDeliveryMainTd($"{part.DPNr:N0}", center: true))
+                    .AddCell(NewDeliveryMainTd(part.Variety.Name, colspan: 2))
+                    .AddCell(NewDeliveryMainTd(part.Attribute?.Name, colspan: 2))
+                    .AddCell(NewDeliveryMainTd(part.Quality.Name))
+                    .AddCell(NewDeliveryMainTd($"{part.Oe:N0}", center: true))
+                    .AddCell(NewDeliveryMainTd($"{part.Kmw:N1}", center: true))
+                    .AddCell(NewDeliveryMainTd($"{part.Weight:N0}", center: true));
+
+                if (part.Cultivation != null) {
+                    var cult = new KernedParagraph(8);
+                    cult.Add(Italic("Bewirtschaftung:")).Add(Normal(" " + part.Cultivation.Name + (part.Cultivation.Description != null ? $" ({part.Cultivation.Description})" : "")));
+                    sub.AddCell(NewTd())
+                        .AddCell(NewTd(cult, colspan: 5))
+                        .AddCell(NewTd(colspan: 3));
+                }
+                sub.AddCell(NewTd())
+                    .AddCell(NewTd(new KernedParagraph(8).Add(Italic("Herkunft:")).Add(Normal(" " + part.OriginString.Replace("\n ", "\n\u00a0"))), colspan: 5))
+                    .AddCell(NewTd(colspan: 3));
+                if (part.Modifiers.Any()) {
+                    sub.AddCell(NewTd())
+                        .AddCell(NewTd("Zu-/Abschläge:", 8, italic: true));
+                    int i = 0, last = part.Modifiers.Count() - 1;
+                    foreach (var mod in part.Modifiers) {
+                        if (i > 0) sub.AddCell(NewCell(colspan: 2));
+                        sub.AddCell(NewTd(mod.Name, 8, bold: true, colspan: 3).SetPaddingsMM(i == 0 ? 0.5f : 0, 1, i == last ? 0.5f : 0, 1))
+                            .AddCell(NewTd(mod.PublicValueStr, 8).SetPaddingsMM(i == 0 ? 0.5f : 0, 1, i == last ? 0.5f : 0, 1))
+                            .AddCell(NewTd(colspan: 3));
+                        i++;
+                    }
+                }
+                var weighing = new KernedParagraph(8);
+                if (part.IsManualWeighing) {
+                    weighing.Add(Italic("Handwiegung " + (part.IsNetWeight ? "(gerebelt gewogen)" : "(nicht gerebelt gewogen)")));
+                    if (part.WeighingReason != null) {
+                        weighing.Add(Normal(", "))
+                            .Add(Italic("Begründung:"))
+                            .Add(Normal(" " + part.WeighingReason));
+                    }
+                } else {
+                    var info = part.WeighingInfo;
+                    weighing.Add(Italic("Waage:"))
+                        .Add(Normal(" " + (part.ScaleId ?? "?") + ", "))
+                        .Add(Italic("ID:"))
+                        .Add(Normal(" " + (info.Id ?? "?")));
+                    if (info.Date != null || info.Time != null)
+                        weighing.Add(Normal(" \u2013 "));
+                    if (info.Time != null)
+                        weighing.Add(Normal($"{info.Time:HH:mm}"));
+                    if (info.Date != null)
+                        weighing.Add(Normal($", {info.Date:dd.MM.yyyy}"));
+                    if (info.Gross != null && info.Tare != null && info.Net != null) {
+                        weighing.Add("\n")
+                            .Add(Italic("Brutto:"))
+                            .Add(Normal($" {info.Gross:N0} kg \u2013 "))
+                            .Add(Italic("Tara:"))
+                            .Add(Normal($" {info.Tare:N0} kg \u2013 "))
+                            .Add(Italic("Netto:"))
+                            .Add(Normal($" {info.Net:N0} kg \u2013 "))
+                            .Add(Italic(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen"));
+                    } else {
+                        weighing.Add(" ")
+                            .Add(Italic(part.IsNetWeight ? "(gerebelt gewogen)" : "(nicht gerebelt gewogen)"));
+                    }
+                }
+                sub.AddCell(NewCell())
+                    .AddCell(NewCell(weighing, colspan: 5))
+                    .AddCell(NewCell(colspan: 3));
+                if (part.Comment != null) {
+                    sub.AddCell(NewCell())
+                        .AddCell(NewCell(new KernedParagraph(8).Add(Italic("Anmerkung")).Add(Normal(" " + part.Comment)), colspan: 5))
+                        .AddCell(NewCell(colspan: 3));
+                }
+                if (part.Temperature != null || part.Acid != null) {
+                    var p = new KernedParagraph(8);
+                    if (part.Temperature != null)
+                        p.Add(Italic("Temperatur:")).Add(Normal($" {part.Temperature:N1} °C"));
+                    if (part.Temperature != null && part.Acid != null)
+                        p.Add(Normal(", "));
+                    if (part.Acid != null)
+                        p.Add(Italic("Säure")).Add(Normal($" {part.Acid:N1} g/l"));
+                    sub.AddCell(NewCell())
+                        .AddCell(NewCell(p, colspan: 5))
+                        .AddCell(NewCell(colspan: 3));
+                }
+                tbl.AddCell(new Cell(1, 9).SetPadding(0).SetBorder(Border.NO_BORDER).Add(sub));
+            }
+
+            if (Delivery.Parts.Count > 1) {
+                tbl.AddCell(NewTd("Gesamt:", 12, bold: true, borderTop: true, colspan: 6).SetPaddingsMM(1, 1, 1, 1))
+                    .AddCell(NewTd($"{Delivery.Oe:N0}", 12, bold: true, center: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1))
+                    .AddCell(NewTd($"{Delivery.Kmw:N1}", 12, bold: true, center: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1))
+                    .AddCell(NewTd($"{Delivery.Weight:N0}", 12, bold: true, right: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            }
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/DeliveryNote.cshtml

@@ -1,115 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.DeliveryNote>
-@model Elwig.Documents.DeliveryNote
-@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\DeliveryNote.css" />
-<main>
-<h1>@Model.Title</h1>
-<table class="delivery large">
-    <colgroup>
-        <col style="width: 10.00mm;"/>
-        <col style="width: 21.00mm;"/>
-        <col style="width: 25.00mm;"/>
-        <col style="width: 19.50mm;"/>
-        <col style="width: 19.50mm;"/>
-        <col style="width: 30.00mm;"/>
-        <col style="width: 12.50mm;"/>
-        <col style="width: 12.50mm;"/>
-        <col style="width: 15.00mm;"/>
-    </colgroup>
-    <thead>
-        <tr>
-            <th class="main center narrow" rowspan="2">Pos.</th>
-            <th class="main" rowspan="2" colspan="2">Sorte</th>
-            <th class="main" rowspan="2" colspan="2">Attribut</th>
-            <th class="main" rowspan="2">Qualitätsstufe</th>
-            <th colspan="2">Gradation</th>
-            <th>Menge</th>
-        </tr>
-        <tr>
-            <th class="unit">[°Oe]</th>
-            <th class="unit narrow">[°KMW]</th>
-            <th class="unit">[kg]</th>
-        </tr>
-    </thead>
-    <tbody>
-        @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
-            <tr class="main">
-                <td class="center">@part.DPNr</td>
-                <td colspan="2">@part.Variety.Name</td>
-                <td colspan="2">@part.Attribute?.Name</td>
-                <td>@part.Quality.Name</td>
-                <td class="center">@($"{part.Oe:N0}")</td>
-                <td class="center">@($"{part.Kmw:N1}")</td>
-                <td class="number">@($"{part.Weight:N0}")</td>
-            </tr>
-            @if (part.Cultivation != null) {
-                <tr><td></td><td><i>Bewirtschaftung:</i></td><td colspan="4"><b>
-                    @part.Cultivation.Name
-                    @if(part.Cultivation.Description != null) {
-                        @("(")@part.Cultivation.Description@(")")
-                    }
-                    </b></td></tr>
-            }
-            <tr><td></td><td colspan="5" style="white-space: pre;"><i>Herkunft:</i> @part.OriginString</td></tr>
-            @if (part.Modifiers.Count() > 0) {
-                var first = true;
-                foreach (var mod in part.Modifiers) {
-                    <tr class="tight @(first ? "first" : "")"><td></td><td>@Raw(first ? "<i>Zu-/Abschläge:</i>" : "")</td><td colspan="3"><b>@mod.Name</b></td><td style="white-space: pre;">@mod.PublicValueStr</td></tr>
-                    first = false;
-                }
-            }
-            <tr><td></td><td colspan="5">
-                @if (part.IsManualWeighing) {
-                    <i>Handwiegung @(part.IsNetWeight ? " (gerebelt gewogen)" : " (nicht gerebelt gewogen)")</i>@Raw(part.WeighingReason != null ? ", <i>Begründung:</i> " : "") @part.WeighingReason
-                } else {
-                    var info = part.WeighingInfo;
-                    <i>Waage:</i> @(part.ScaleId ?? "?")@(", ") <i>ID:</i> @(info.Id ?? "?")
-                    @(info.Date != null || info.Time != null ? " – " : "")@(info.Time != null ? $"{info.Time:HH:mm}" : "")@(info.Date != null ? $", {info.Date:dd.MM.yyyy}" : "")
-                    @if (info.Gross != null && info.Tare != null && info.Net != null) {
-                        <br/><i>Brutto:</i> @($"{info.Gross:N0} kg")@(" – ") <i>Tara:</i> @($"{info.Tare:N0} kg")@(" – ") <i>Netto:</i> @($"{info.Net:N0} kg")@(" – ")@Raw(part.IsNetWeight ? "<i>gerebelt gewogen</i>" : "<i>nicht gerebelt gewogen</i>")
-                    } else {
-                        @Raw($" <i>({(part.IsNetWeight ? "gerebelt gewogen" : "nicht gerebelt gewogen")})</i>")
-                    }
-                }
-            </td></tr>
-            @if (part.Comment != null) {
-                <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
-            }
-            @if (part.Temperature != null || part.Acid != null) {
-                <tr><td></td><td colspan="5">@Raw(part.Temperature != null ? $"<i>Temperatur:</i> {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@Raw(part.Acid != null ? $"<i>Säure:</i> {part.Acid:N1} g/l" : "")</td></tr>
-            }
-        }
-        @if (Model.Delivery.Parts.Count() > 1) {
-            <tr class="main sum bold">
-                <td colspan="6">Gesamt:</td>
-                <td class="center">@($"{Model.Delivery.Oe:N0}")</td>
-                <td class="center">@($"{Model.Delivery.Kmw:N1}")</td>
-                <td class="number">@($"{Model.Delivery.Weight:N0}")</td>
-            </tr>
-        }
-    </tbody>
-</table>
-@if (Model.Delivery.Comment != null) {
-    <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
-}
-@if (Model.DisplayStats > 0) {
-    @Raw(Model.PrintBucketTable(
-        Model.Delivery.Season, Model.MemberBuckets, isTiny: true,
-        filter: Model.DisplayStats > 2 ? null :
-                Model.DisplayStats == 1 ? new List<string>() :
-                Model.Delivery.Parts.Select(p => p.SortId).Distinct().ToList()
-    ))
-}
-</main>
-@for (int i = 0; i < 2; i++) {
-    <div class="text @(i == 0 ? "hidden" : "bottom")">
-        @if (Model.Text != null) {
-            <p class="comment">@Model.Text</p>
-        }
-        <div class="signatures">
-            <div>Genossenschaft</div>
-            <div>Mitglied</div>
-        </div>
-    </div>
-}

Elwig/Documents/DeliveryNote.css

@@ -1,46 +0,0 @@
-
-main h1 {
-    margin-bottom: 1.5em !important;
-}
-
-table.delivery {
-    margin-bottom: 5mm;
-}
-
-table.delivery tr:not(.main) {
-    break-before: avoid;
-}
-
-table.delivery th.main {
-    text-align: left;
-}
-
-table.delivery tr.main td {
-    font-weight: bold;
-    padding-top: 2mm;
-}
-
-table.delivery tbody tr:not(.main) td {
-    font-size: 8pt;
-}
-
-table.delivery tr.tight:not(.first) td {
-    padding-top: 0;
-    padding-bottom: 0;
-}
-
-table.delivery tr.tight.first td {
-    padding-bottom: 0;
-}
-
-table.delivery tr.tight:has(+ tr:not(.tight)) td {
-    padding-bottom: 0.5mm !important;
-}
-
-table.delivery tr.sum td {
-    padding-top: 1mm;
-}
-
-table.delivery-note-stats {
-    break-after: avoid;
-}

Elwig/Documents/Document.Page.css

@@ -1,76 +0,0 @@
-
-.m1, .m2, .m3 {
-    height: 0;
-    width: 10mm;
-    position: fixed;
-    left: -25mm;
-    border-top: var(--border-thickness) solid black;
-}
-.m1.r, .m2.r, .m3.r {
-    left: initial;
-    right: -20mm;
-}
-.m1 {top: 80mm;}
-.m2 {top: 123.5mm;}
-.m3 {top: 185mm;}
-
-.page-break {
-    break-before: page;
-}
-hr.page-break {
-    display: none;
-}
-
-@page {
-    size: A4;
-    margin: 25mm 20mm 35mm 25mm;
-
-    @bottom-center {
-        content: element(page-footer);
-    }
-}
-
-@media screen {
-    body, header, .footer-wrapper {
-        width: 210mm;
-    }
-
-    header, .address-wrapper, aside, main {
-        border: 1px solid lightgray;
-    }
-
-    .m1, .m2, .m3 {
-        display: none;
-    }
-
-    header {
-        top: 0;
-    }
-
-    .spacing {
-        height: 45mm;
-    }
-
-    .main-wrapper {
-        margin: 0 20mm 40mm 25mm;
-    }
-
-    .footer-wrapper {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background: white;
-    }
-}
-
-@media print {
-    .page::after {
-        content: "Seite " counter(page) " von " counter(pages) !important;
-    }
-
-    a {
-        text-decoration: inherit;
-        color: inherit;
-    }
-}

Elwig/Documents/Document.Table.css

@@ -1,178 +0,0 @@
-
-main table {
-    border-collapse: collapse;
-    margin-bottom: 10mm;
-    font-size: 10pt;
-}
-main table.large {font-size: 12pt;}
-main table.tiny {
-    font-size: 8pt;
-    margin-bottom: 5mm;
-}
-
-main table.border {
-    border: var(--border-thickness) solid black;
-}
-
-main table tr {
-    break-inside: avoid;
-}
-
-main table th,
-main table td {
-    overflow: hidden;
-    white-space: nowrap;
-    vertical-align: middle;
-    padding: 0.5mm 1mm;
-    font-weight: normal;
-}
-main table.small th,
-main table.small td,
-main table.tiny th,
-main table.tiny td {
-    padding: 0.125mm 0.125mm;
-}
-
-main table td[rowspan] {
-    vertical-align: top;
-}
-
-main table thead {
-    font-size: 8pt;
-}
-main table.large thead {
-    font-size: 10pt;
-}
-
-main table th {
-    font-style: italic;
-}
-
-main table tbody {
-}
-
-main table .small {
-    font-size: 8pt;
-}
-main table .large {
-    font-size: 12pt;
-}
-main table .tiny {
-    font-size: 6pt;
-}
-
-main table.number td,
-main table.number th {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-main table.number thead th,
-main table.number td,
-main table tbody td.number {
-    text-align: right;
-}
-
-main table.center tbody td,
-main table tbody td.center {
-    text-align: center;
-}
-
-main table tbody th {
-    text-align: left;
-}
-
-main table.cohere {
-    break-inside: avoid;
-}
-
-main table tr.subheading th,
-main table tr.subheading td {
-    font-weight: bold;
-}
-
-main table tr.subheading th {
-    text-align: left;
-    font-size: 10pt;
-}
-
-main table.small tr.subheading th,
-main table.small tr.subheading td,
-main table.tiny tr.subheading th,
-main table.tiny tr.subheading td {
-    font-size: 8pt;
-}
-
-main table tr.sectionheading {
-    background-color: #E0E0E0;
-}
-
-main table tr.sectionheading th {
-    padding-top: 0.5mm;
-    padding-bottom: 0.5mm;
-    font-weight: bold;
-    text-align: center;
-    font-size: 10pt;
-    border-top: var(--border-thickness) solid black;
-}
-
-main table tr.header {
-    border: var(--border-thickness) solid black;
-    background-color: #E0E0E0;
-}
-
-main table tr.header th {
-    font-weight: bold;
-    font-style: normal;
-    font-size: 16pt;
-    padding: 1mm 2mm;
-}
-
-main table tr.spacing td,
-main table tr.spacing th {
-    height: 5mm;
-}
-
-main table tr.spacing ~ tr.header {
-    break-before: avoid;
-}
-
-main table.number thead tr:first-child th:first-child {
-    text-align: left;
-}
-
-main table tr.bold td {
-    font-weight: bold;
-}
-
-main table tr.sum,
-main table td.sum,
-main table tr.new,
-main table tr.border {
-    border-top: var(--border-thickness) solid black;
-}
-
-main table th.unit {
-    font-size: 8pt;
-}
-
-main table.number th.unit {
-    padding-right: 2mm;
-}
-
-main table th.narrow {
-    padding-left: 0;
-    padding-right: 0;
-}
-
-main table .tborder {border-top: var(--border-thickness) solid black;}
-main table .lborder {border-left: var(--border-thickness) solid black;}
-main table .rborder {border-right: var(--border-thickness) solid black;}
-
-main table .fleft {
-    float: left;
-}
-
-main tbody.sum tr:last-child {
-    border-bottom: var(--border-thickness) solid black;
-}

Elwig/Documents/Document.cs

@@ -1,19 +1,42 @@
-using System;
-using System.Threading.Tasks;
-using System.IO;
 using Elwig.Helpers;
-using System.Collections.Generic;
-using System.Linq;
 using Elwig.Helpers.Printing;
+using iText.IO.Font;
+using iText.Kernel.Font;
+using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Canvas;
+using iText.Kernel.Pdf.Event;
+using iText.Kernel.Pdf.Xobject;
+using iText.Kernel.Utils;
+using iText.Layout;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using MimeKit;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace Elwig.Documents {
-    public abstract partial class Document : IDisposable {
+    public class Document : IDisposable {
 
         public static string Name => "Dokument";
 
-        protected static readonly double GenerationProportion = 0.125;
+        public const float PtInMM = 2.8346456693f;
+        public const float BorderThickness = 0.5f;
+
+        protected PdfFont NF = null!;
+        protected PdfFont BF = null!;
+        protected PdfFont IF = null!;
+        protected PdfFont BI = null!;
+        protected PdfFont SF = null!;
+
+        //protected readonly PdfFont NF = PdfFontFactory.CreateFont(StandardFonts.TIMES_ROMAN);
+        //protected readonly PdfFont BF = PdfFontFactory.CreateFont(StandardFonts.TIMES_BOLD);
+        //protected readonly PdfFont IF = PdfFontFactory.CreateFont(StandardFonts.TIMES_ITALIC);
+        //protected readonly PdfFont BI = PdfFontFactory.CreateFont(StandardFonts.TIMES_BOLDITALIC);
 
         protected TempFile? _pdfFile = null;
         protected string? _pdfPath;
@@ -24,24 +47,18 @@ namespace Elwig.Documents {
         public bool ShowFoldMarks = App.Config.Debug;
         public bool IsDoublePaged = false;
         public bool IsPreview = false;
+        private iText.Layout.Document? _doc;
 
-        public string DocumentsPath;
         public int CurrentNextSeason;
         public string? DocumentId;
         public string Title;
         public string Author;
-        public string Header;
-        public string Footer;
         public DateOnly Date;
 
         public Document(string title) {
-            var c = App.Client;
-            DocumentsPath = App.DocumentsPath;
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
-            Author = c.NameFull;
-            Header = "";
-            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ").Item(c.NameFull).ToString();
+            Author = App.Client.NameFull;
             Date = DateOnly.FromDateTime(Utils.Today);
         }
 
@@ -60,99 +77,173 @@ namespace Elwig.Documents {
         }
 
         public static Document FromPdf(string path) {
-            return new PdfDocument(path);
+            return new RawPdfDocument(path);
         }
 
-        private async Task<string> Render() {
-            string name;
-            if (this is BusinessLetter) {
-                name = "BusinessLetter";
-            } else if (this is DeliveryNote) {
-                name = "DeliveryNote";
-            } else if (this is CreditNote) {
-                name = "CreditNote";
-            } else if (this is DeliveryJournal) {
-                name = "DeliveryJournal";
-            } else if (this is DeliveryDepreciationList) {
-                name = "DeliveryDepreciationList";
-            } else if (this is Letterhead) {
-                name = "Letterhead";
-            } else if (this is DeliveryConfirmation) {
-                name = "DeliveryConfirmation";
-            } else if (this is MemberDataSheet) {
-                name = "MemberDataSheet";
-            } else if (this is MemberList) {
-                name = "MemberList";
-            } else if (this is WineQualityStatistics) {
-                name = "WineQualityStatistics";
-            } else if (this is PaymentVariantSummary) {
-                name = "PaymentVariantSummary";
-            } else if (this is DeliveryAncmtList) {
-                name = "DeliveryAncmtList";
-            } else {
-                throw new InvalidOperationException("Invalid document object");
+        private class RawPdfDocument : Document {
+            public RawPdfDocument(string pdfPath) :
+                base(Path.GetFileNameWithoutExtension(pdfPath)) {
+                _pdfPath = pdfPath;
             }
-            return await Render(name);
         }
 
-        private async Task<string> Render(string name) {
-            return await Html.CompileRenderAsync(name, this); ;
+        public int Render(string path) {
+            using var writer = new PdfWriter(path);
+            return Render(writer);
+        }
+
+        private int Render(PdfWriter writer) {
+            NF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\times.ttf",    PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
+            BF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesbd.ttf",  PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
+            IF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesi.ttf",   PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
+            BI = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\timesbi.ttf",  PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
+            SF = PdfFontFactory.CreateFont(@"C:\Windows\Fonts\seguisym.ttf", PdfEncodings.IDENTITY_H, PdfFontFactory.EmbeddingStrategy.PREFER_NOT_EMBEDDED);
+            NF.SetSubset(true);
+            BF.SetSubset(true);
+            IF.SetSubset(true);
+            BI.SetSubset(true);
+            SF.SetSubset(true);
+            writer.SetCompressionLevel(CompressionConstants.BEST_COMPRESSION);
+            writer.SetSmartMode(true);
+            using var pdf = new PdfDocument(writer);
+            pdf.GetDocumentInfo()
+                .SetTitle(Title)
+                .SetAuthor(Author)
+                .SetCreator($"Elwig {App.Version}");
+            var handler = new EventHandler(this);
+            pdf.AddEventHandler(PdfDocumentEvent.START_PAGE, handler);
+            pdf.AddEventHandler(PdfDocumentEvent.END_PAGE, handler);
+            pdf.AddEventHandler(PdfDocumentEvent.START_DOCUMENT_CLOSING, handler);
+            _doc = new iText.Layout.Document(pdf, iText.Kernel.Geom.PageSize.A4);
+            try {
+                _doc.SetFont(NF).SetFontSize(12);
+                RenderHeader(_doc, pdf);
+                RenderBody(_doc, pdf);
+                var pageNum = pdf.GetNumberOfPages();
+                return pageNum;
+            } finally {
+                _doc.Close();
+            }
+        }
+
+        protected virtual void RenderHeader(iText.Layout.Document doc, PdfDocument pdf) { }
+
+        protected virtual void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { }
+
+        protected virtual Paragraph GetFooter() {
+            return new KernedParagraph(App.Client.NameFull, 10);
         }
 
         public async Task Generate(CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
             if (_pdfFile != null)
                 return;
             progress?.Report(0.0);
-            if (this is PdfDocument) {
+            if (this is RawPdfDocument) {
                 // nothing to do
             } else if (this is MergedDocument m) {
+                using var tmpPdf = new TempFile("pdf");
                 var pdf = new TempFile("pdf");
-                var tmpHtmls = new List<TempFile>();
-                var tmpFiles = new List<string>();
                 try {
-                    var n = m.Documents.Count();
-                    int i = 0;
-                    foreach (var doc in m.Documents) {
-                        if (doc is PdfDocument) {
-                            tmpFiles.Add(doc.PdfPath!);
-                            continue;
-                        }
+                    var pageNums = new List<int>();
+
+                    using var writer = new PdfWriter(pdf.FilePath);
+                    using var mergedPdf = new PdfDocument(writer);
+                    var merger = new PdfMerger(mergedPdf);
+
+                    PdfPage? letterheadPage = null;
+                    int letterheadInsertIndex = 0;
+                    int letterheadDocIndex = 0;
+
+                    for (int i = 0; i < m.Documents.Count; i++) {
                         if (cancelToken?.IsCancellationRequested ?? false)
                             throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
-                        var tmpHtml = new TempFile("html");
-                        await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
-                        tmpHtmls.Add(tmpHtml);
-                        tmpFiles.Add((doc is Letterhead ? "#" : "") + tmpHtml.FileName);
-                        i++;
-                        progress?.Report(GenerationProportion * 100 * i / n);
+                        var doc = m.Documents[i];
+                        int p0 = mergedPdf.GetNumberOfPages();
+
+                        if (letterheadPage != null && doc is Letterhead) {
+                            if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) {
+                                mergedPdf.AddPage(letterheadPage);
+                                mergedPdf.AddNewPage();
+                            } else {
+                                mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage);
+                                mergedPdf.AddNewPage(letterheadInsertIndex + 2);
                             }
-                    progress?.Report(GenerationProportion * 100);
-                    var pages = await Pdf.Convert(tmpFiles, pdf.FileName, IsDoublePaged, cancelToken, new Progress<double>(v => progress?.Report(GenerationProportion * 100 + v * (1 - GenerationProportion))));
-                    TotalPages = pages.Pages;
-                    _pdfFile = pdf;
+
+                            pageNums[letterheadDocIndex] = 1;
+                            letterheadPage = null;
+                        }
+
+                        if (doc is RawPdfDocument) {
+                            if (IsDoublePaged && doc is Letterhead) {
+                                using var reader = new PdfReader(doc.PdfPath);
+                                using var src = new PdfDocument(reader);
+                                letterheadPage = src.GetPage(1).CopyTo(mergedPdf);
+                                letterheadInsertIndex = p0;
+                                letterheadDocIndex = i;
+                            } else {
+                                using var reader = new PdfReader(doc.PdfPath);
+                                using var src = new PdfDocument(reader);
+                                merger.Merge(src, 1, src.GetNumberOfPages());
+                            }
+                        } else {
+                            int pageNum = doc.Render(tmpPdf.FilePath);
+                            if (IsDoublePaged && doc is Letterhead) {
+                                using var reader = new PdfReader(tmpPdf.FilePath);
+                                using var src = new PdfDocument(reader);
+                                letterheadPage = src.GetPage(1).CopyTo(mergedPdf);
+                                letterheadInsertIndex = p0;
+                                letterheadDocIndex = i;
+                            } else {
+                                using var reader = new PdfReader(tmpPdf.FilePath);
+                                using var src = new PdfDocument(reader);
+                                merger.Merge(src, 1, pageNum);
+                            }
+                        }
+
+                        int p1 = mergedPdf.GetNumberOfPages();
+                        pageNums.Add(p1 - p0);
+
+                        if (IsDoublePaged && doc is not Letterhead && mergedPdf.GetNumberOfPages() % 2 != 0) {
+                            if (letterheadPage != null) {
+                                mergedPdf.AddPage(letterheadPage);
+                                letterheadPage = null;
+                            } else {
+                                mergedPdf.AddNewPage();
+                            }
+                        }
+
+                        progress?.Report(100.0 * (i + 1) / (m.Documents.Count + 1));
+                    }
+
+                    if (letterheadPage != null) {
+                        if (mergedPdf.GetNumberOfPages() <= letterheadInsertIndex) {
+                            mergedPdf.AddPage(letterheadPage.CopyTo(mergedPdf));
+                            mergedPdf.AddNewPage();
+                        } else {
+                            mergedPdf.AddPage(letterheadInsertIndex + 1, letterheadPage.CopyTo(mergedPdf));
+                            mergedPdf.AddNewPage(letterheadInsertIndex + 2);
+                        }
+
+                        pageNums[letterheadDocIndex] = 1;
+                    }
+
+                    TotalPages = pageNums.Sum();
                 } catch {
                     pdf.Dispose();
                     throw;
-                } finally {
-                    foreach (var tmp in tmpHtmls) {
-                        tmp.Dispose();
-                    }
                 }
+                _pdfFile = pdf;
             } else {
                 if (cancelToken?.IsCancellationRequested ?? false)
                     throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                 var pdf = new TempFile("pdf");
                 try {
-                    using var tmpHtml = new TempFile("html");
-                    await File.WriteAllTextAsync(tmpHtml.FilePath, await Render(), Utils.UTF8);
-                    progress?.Report(50.0);
-                    var pages = await Pdf.Convert(tmpHtml.FilePath, pdf.FilePath, IsDoublePaged, cancelToken);
-                    TotalPages = pages.Pages;
-                    _pdfFile = pdf;
+                    TotalPages = Render(pdf.FilePath);
                 } catch {
                     pdf.Dispose();
                     throw;
                 }
+                _pdfFile = pdf;
             }
             progress?.Report(100.0);
         }
@@ -182,14 +273,239 @@ namespace Elwig.Documents {
             };
         }
 
-        private class MergedDocument(IEnumerable<Document> docs) : Document("Mehrere Dokumente") {
-            public IEnumerable<Document> Documents = docs;
+        private class MergedDocument : Document {
+            public List<Document> Documents;
+
+            public MergedDocument(IEnumerable<Document> docs) :
+                base("Mehrere Dokumente") {
+                Documents = [.. docs];
+                IsDoublePaged = docs.Any(x => x.IsDoublePaged);
+            }
         }
 
-        private class PdfDocument : Document {
-            public PdfDocument(string pdfPath) :
-                base(Path.GetFileNameWithoutExtension(pdfPath)) {
-                _pdfPath = pdfPath;
+        protected static Cell NewCell(Paragraph? p = null, int rowspan = 1, int colspan = 1, bool overflow = false) {
+            var cell = new Cell(rowspan, colspan)
+                .SetBorder(Border.NO_BORDER)
+                .SetPaddingsMM(0.5f, 1, 0.5f, 1);
+            if (p != null) {
+                p.SetProperty(Property.NO_SOFT_WRAP_INLINE, true);
+                if (!overflow) p.SetProperty(Property.OVERFLOW_X, OverflowPropertyValue.HIDDEN);
+                cell.Add(p);
+            }
+            return cell;
+        }
+
+        protected Cell NewTh(string? text, float fontSize = 8, int rowspan = 1, int colspan = 1, bool left = false, bool rotated = false) {
+            var p = new KernedParagraph(text ?? "", fontSize);
+            if (rotated) p.SetRotationAngle(rotated ? 0.5 * Math.PI : 0);
+            var cell = NewCell(p, rowspan: rowspan, colspan: colspan)
+                .SetTextAlignment(left ? TextAlignment.LEFT : TextAlignment.CENTER)
+                .SetVerticalAlignment(VerticalAlignment.MIDDLE)
+                .SetFont(IF);
+            if (rotated || !left) cell.SetPadding(0);
+            return cell;
+        }
+
+        protected Cell NewTd(string? text = null, float fontSize = 10, int rowspan = 1, int colspan = 1, bool center = false, bool right = false, bool bold = false, bool italic = false, bool borderTop = false, bool overflow = false) {
+            return NewTd(new KernedParagraph(text ?? "", fontSize), rowspan: rowspan, colspan: colspan, center: center, right: right, bold: bold, italic: italic, borderTop: borderTop, overflow: overflow);
+        }
+
+        protected Cell NewTd(KernedParagraph p, int rowspan = 1, int colspan = 1, bool center = false, bool right = false, bool bold = false, bool italic = false, bool borderTop = false, bool overflow = false) {
+            return NewCell(p, rowspan: rowspan, colspan: colspan, overflow: overflow)
+                .SetTextAlignment(center ? TextAlignment.CENTER : right ? TextAlignment.RIGHT : TextAlignment.LEFT)
+                .SetVerticalAlignment(VerticalAlignment.MIDDLE)
+                .SetBorderTop(borderTop ? new SolidBorder(BorderThickness) : Border.NO_BORDER)
+                .SetFont(bold ? (italic ? BI : BF) : (italic ? IF : NF));
+        }
+
+        public static float[] ColsMM(params double[] widths) {
+            return [.. widths.Select(w => (float)w * PtInMM)];
+        }
+
+        public Text Normal(string? text, float? fontSize = null) {
+            var t = new Text(text ?? "").SetFont(NF);
+            if (fontSize != null) t.SetFontSize(fontSize.Value);
+            return t;
+        }
+
+        public Text Bold(string? text, float? fontSize = null) {
+            var t = new Text(text ?? "").SetFont(BF);
+            if (fontSize != null) t.SetFontSize(fontSize.Value);
+            return t;
+        }
+
+        public Text Italic(string? text, float? fontSize = null) {
+            var t = new Text(text ?? "").SetFont(IF);
+            if (fontSize != null) t.SetFontSize(fontSize.Value);
+            return t;
+        }
+
+        public Text BoldItalic(string? text, float? fontSize = null) {
+            var t = new Text(text ?? "").SetFont(BI);
+            if (fontSize != null) t.SetFontSize(fontSize.Value);
+            return t;
+        }
+
+        private class EventHandler : AbstractPdfDocumentEventHandler {
+
+            private const float _fontSize = 10;
+            private const float _placeholderWidth = 50 * PtInMM;
+
+            private readonly Document _doc;
+            private readonly List<PdfFormXObject> _pageNumPlaceholders;
+
+
+            public int NumberOfPages { get; private set; }
+
+            public EventHandler(Document doc) {
+                _doc = doc;
+                _pageNumPlaceholders = [];
+            }
+
+            protected override void OnAcceptedEvent(AbstractPdfDocumentEvent evt) {
+                if (evt.GetType() == PdfDocumentEvent.START_PAGE) {
+                    OnPageStart((PdfDocumentEvent)evt);
+                } else if (evt.GetType() == PdfDocumentEvent.END_PAGE) {
+                    OnPageEnd((PdfDocumentEvent)evt);
+                } else if (evt.GetType() == PdfDocumentEvent.START_DOCUMENT_CLOSING) {
+                    OnDocumentClose((PdfDocumentEvent)evt);
+                }
+            }
+
+            private void OnPageStart(PdfDocumentEvent evt) {
+                var pdf = evt.GetDocument();
+                var page = evt.GetPage();
+                var pageNum = pdf.GetPageNumber(page);
+
+                if (pageNum == 1) {
+                    // first page
+                    if (_doc is BusinessDocument) {
+                        _doc._doc?.SetMarginsMM(90, 20, 35, 25);
+                    } else {
+                        _doc._doc?.SetMarginsMM(20, 20, 35, 25);
+                    }
+                } else if (_doc.IsDoublePaged && (pageNum % 2) == 0) {
+                    // left page (= swapped)
+                    _doc._doc?.SetMarginsMM(20, 25, 25, 20);
+                } else {
+                    // right page
+                    _doc._doc?.SetMarginsMM(20, 20, 25, 25);
+                }
+            }
+
+            private void OnPageEnd(PdfDocumentEvent evt) {
+                var pdf = evt.GetDocument();
+                var page = evt.GetPage();
+                var pageNum = pdf.GetPageNumber(page);
+
+                var pageSize = page.GetPageSize();
+                float leftX1 = pageSize.GetLeft() + 25 * PtInMM;
+                float leftX2 = pageSize.GetLeft() + 20 * PtInMM;
+                float rightX1 = pageSize.GetRight() - 20 * PtInMM;
+                float rightX2 = pageSize.GetRight() - 25 * PtInMM;
+                float footerY = pageSize.GetBottom() + 25 * PtInMM;
+                float y1 = footerY + _fontSize;
+                float y2 = footerY - _fontSize;
+
+                var pdfCanvas = new PdfCanvas(page.NewContentStreamAfter(), page.GetResources(), pdf);
+                using var canvas = new Canvas(pdfCanvas, pageSize);
+
+                var placeholder = new PdfFormXObject(new iText.Kernel.Geom.Rectangle(0, 0, _placeholderWidth, _fontSize));
+                _pageNumPlaceholders.Add(placeholder);
+
+                var c = App.Client;
+                var dateP = new KernedParagraph($"{_doc.Date:dddd, d. MMMM yyyy}", _fontSize).SetFont(_doc.NF);
+                var centerP = new KernedParagraph(_doc.DocumentId ?? "", _fontSize).SetFont(_doc.IF);
+                var pageNumP = new KernedParagraph(_fontSize).Add(new Image(placeholder)).SetFont(_doc.NF);
+
+                if (pageNum == 1) {
+                    // first page
+                    canvas.ShowTextAligned(dateP, leftX1, y1, TextAlignment.LEFT, VerticalAlignment.BOTTOM);
+                    canvas.ShowTextAligned(centerP, (leftX1 + rightX1) / 2, y1, TextAlignment.CENTER, VerticalAlignment.BOTTOM);
+                    canvas.ShowTextAligned(pageNumP, rightX1, y1, TextAlignment.RIGHT, VerticalAlignment.BOTTOM);
+
+                    var footer = _doc.GetFooter();
+                    using var footerCanvas = new Canvas(page, pageSize);
+                    footerCanvas.Add(new Table(1).AddCell(new Cell().Add(footer).SetBorder(Border.NO_BORDER).SetPaddingsMM(1, 0, 0, 0))
+                        .SetFixedPositionMM(25, 0, 165).SetHeightMM(25)
+                        .SetFont(_doc.NF).SetFontSize(10)
+                        .SetTextAlignment(TextAlignment.CENTER)
+                        .SetBorder(Border.NO_BORDER)
+                        .SetBorderTop(new SolidBorder(BorderThickness)));
+                } else if (_doc.IsDoublePaged && (pageNum % 2 == 0)) {
+                    // left page (= swapped)
+                    canvas.ShowTextAligned(pageNumP, leftX2, y2, TextAlignment.LEFT, VerticalAlignment.TOP);
+                    canvas.ShowTextAligned(centerP, (leftX2 + rightX2) / 2, y2, TextAlignment.CENTER, VerticalAlignment.TOP);
+                    canvas.ShowTextAligned(dateP, rightX2, y2, TextAlignment.RIGHT, VerticalAlignment.TOP);
+                } else {
+                    // right page
+                    canvas.ShowTextAligned(dateP, leftX1, y2, TextAlignment.LEFT, VerticalAlignment.TOP);
+                    canvas.ShowTextAligned(centerP, (leftX1 + rightX1) / 2, y2, TextAlignment.CENTER, VerticalAlignment.TOP);
+                    canvas.ShowTextAligned(pageNumP, rightX1, y2, TextAlignment.RIGHT, VerticalAlignment.TOP);
+                }
+
+                if (_doc.ShowFoldMarks) {
+                    var m1 = pageSize.GetTop() - 105 * PtInMM;
+                    var m2 = pageSize.GetTop() - 148.5 * PtInMM;
+                    var m3 = pageSize.GetTop() - 210 * PtInMM;
+                    pdfCanvas.SetLineWidth(BorderThickness);
+
+                    pdfCanvas.MoveTo(0, m1);
+                    pdfCanvas.LineTo(10 * PtInMM, m1);
+                    pdfCanvas.MoveTo(pageSize.GetRight(), m1);
+                    pdfCanvas.LineTo(pageSize.GetRight() - 10 * PtInMM, m1);
+
+                    pdfCanvas.MoveTo(0, m2);
+                    pdfCanvas.LineTo(7 * PtInMM, m2);
+                    pdfCanvas.MoveTo(pageSize.GetRight(), m2);
+                    pdfCanvas.LineTo(pageSize.GetRight() - 7 * PtInMM, m2);
+
+                    pdfCanvas.MoveTo(0, m3);
+                    pdfCanvas.LineTo(10 * PtInMM, m3);
+                    pdfCanvas.MoveTo(pageSize.GetRight(), m3);
+                    pdfCanvas.LineTo(pageSize.GetRight() - 10 * PtInMM, m3);
+
+                    pdfCanvas.ClosePathStroke();
+                }
+
+                if (NumberOfPages > 0) {
+                    // FillPlaceholders() was already called
+                    FillPlaceholder(pdf, pageNum);
+                }
+            }
+
+            private void OnDocumentClose(PdfDocumentEvent evt) {
+                var pdf = evt.GetDocument();
+                var page = evt.GetPage();
+                var pageNum = pdf.GetPageNumber(page);
+
+                // ...
+
+                FillPlaceholders(pdf);
+            }
+
+            private void FillPlaceholders(PdfDocument pdf) {
+                NumberOfPages = pdf.GetNumberOfPages();
+                for (int i = 0; i < _pageNumPlaceholders.Count; i++)
+                    FillPlaceholder(pdf, i + 1);
+            }
+
+            private void FillPlaceholder(PdfDocument pdf, int pageNum) {
+                var placeholder = _pageNumPlaceholders[pageNum - 1];
+                using var canvas = new Canvas(placeholder, pdf);
+                if (_doc.IsDoublePaged && (pageNum % 2 == 0)) {
+                    // left page (= swapped)
+                    var p = new KernedParagraph(_fontSize).SetFont(_doc.NF);
+                    if (_doc.IsPreview) p.Add(_doc.Bold("(vorläufig) "));
+                    p.Add(_doc.Normal($"Seite {pageNum:N0} von {NumberOfPages:N0} "));
+                    canvas.ShowTextAligned(p, 0, 0, TextAlignment.LEFT);
+                } else {
+                    // right page
+                    var p = new KernedParagraph(_fontSize).SetFont(_doc.NF)
+                        .Add(_doc.Normal($"Seite {pageNum:N0} von {NumberOfPages:N0}"));
+                    if (_doc.IsPreview) p.Add(_doc.Bold(" (vorläufig)"));
+                    canvas.ShowTextAligned(p, _placeholderWidth, 0, TextAlignment.RIGHT);
+                }
             }
         }
     }

Elwig/Documents/Document.cshtml

@@ -1,57 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.Document>
-@model Elwig.Documents.Document
-<!DOCTYPE html>
-<html lang="de-AT">
-<head>
-    <title>@Model.Title</title>
-    <meta name="author" value="@Model.Author"/>
-    <meta charset="UTF-8"/>
-    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Page.css" />
-    <link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\Document.Table.css" />
-    @if (Model.IsDoublePaged) {
-        <style>
-            @@page :left {
-                margin: 25mm 25mm 35mm 20mm;
-                @@bottom-center {
-                    content: element(page-footer-left);
-                }
-            }
-        </style>
-    }
-</head>
-<body>
-    @if (Model.ShowFoldMarks) {
-        <div class="m1"></div>
-        <div class="m2"></div>
-        <div class="m3"></div>
-        <div class="m1 r"></div>
-        <div class="m2 r"></div>
-        <div class="m3 r"></div>
-    }
-    <div class="footer-wrapper">
-        <div class="pre-footer">
-            <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
-            <span class="doc-id">@Model.DocumentId</span>
-            <span><span class="page"></span>@Raw(Model.IsPreview ? " <b>(vorläufig)</b>" : "")</span>
-        </div>
-        <footer>@Raw(Model.Footer)</footer>
-    </div>
-    @if (Model.IsDoublePaged) {
-        <div class="footer-wrapper left">
-            <div class="pre-footer">
-                <span>@Raw(Model.IsPreview ? "<b>(vorläufig)</b> " : "")<span class="page"></span></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">
-        @RenderBody()
-    </div>
-</body>
-</html>

Elwig/Documents/Document.css

@@ -1,113 +0,0 @@
-
-:root {
-    font-family: "Times New Roman", serif;
-    line-height: 1;
-    --border-thickness: 0.5pt;
-}
-
-* {
-    box-sizing: border-box;
-}
-
-body {
-    margin: 0;
-}
-
-table {
-    width: 100%;
-    border-collapse: collapse;
-    table-layout: fixed;
-}
-
-table td,
-table th {
-    padding: 0.5mm 1mm;
-}
-
-table th {
-    text-align: center;
-}
-
-header {
-    height: 45mm;
-    padding: 10mm 0 0 0;
-    position: absolute;
-    top: -25mm;
-    left: 0;
-    right: 0;
-    text-align: center;
-    overflow: hidden;
-}
-
-header .name {
-    font-size: 18pt;
-    margin-top: 8mm;
-    font-weight: bold;
-}
-
-header .suffix {
-    font-size: 14pt;
-    font-weight: bold;
-}
-
-header .type {
-    font-size: 12pt;
-    font-weight: normal;
-}
-
-.footer-wrapper {
-    position: running(page-footer);
-    width: 165mm;
-    /* for some reason the position without the following statement changes on the second page */
-    border: var(--border-thickness) solid #00000000;
-}
-
-.footer-wrapper.left {
-    position: running(page-footer-left);
-}
-
-.pre-footer {
-    margin: 1em 0;
-    font-size: 10pt;
-}
-
-.pre-footer > * {
-    display: inline-block;
-    width: 33%;
-}
-
-.pre-footer > *:first-child {
-    text-align: left;
-}
-
-.pre-footer > *:nth-child(2) {
-    text-align: center;
-    font-style: italic;
-}
-
-.pre-footer > *:last-child {
-    text-align: right;
-    float: right;
-}
-
-.pre-footer .page::after {
-    content: "Seite 1 von 1";
-}
-
-footer {
-    font-size: 10pt;
-    border-top: var(--border-thickness) solid black;
-    height: 25mm;
-    padding-top: 1mm;
-    text-align: center;
-}
-
-.hidden {
-    visibility: hidden;
-}
-
-hr {
-    border: none;
-    border-top: var(--border-thickness) solid black;
-    margin: 5mm 0;
-}

Elwig/Documents/Extensions.cs

@@ -0,0 +1,93 @@
+using iText.Kernel.Geom;
+using iText.Layout;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+
+namespace Elwig.Documents {
+    public static class Extensions {
+
+        public static T SetFixedPositionMM<T>(this BlockElement<T> element, float left, float top, float width, Rectangle pageSize) where T : IElement {
+            element.SetVerticalAlignment(VerticalAlignment.TOP);
+            return element.SetFixedPosition(left * Document.PtInMM, pageSize.GetTop() - top * Document.PtInMM, width * Document.PtInMM);
+        }
+
+        public static T SetFixedPositionMM<T>(this BlockElement<T> element, float left, float top, float width, float height, Rectangle pageSize) where T : IElement {
+            element.SetHeight(height * Document.PtInMM);
+            return element.SetFixedPosition(left * Document.PtInMM, pageSize.GetTop() - (top + height) * Document.PtInMM, width * Document.PtInMM);
+        }
+
+        public static T SetFixedPositionMM<T>(this ElementPropertyContainer<T> element, float left, float bottom, float width) where T : IPropertyContainer {
+            return element.SetFixedPosition(left * Document.PtInMM, bottom * Document.PtInMM, width * Document.PtInMM);
+        }
+
+        public static T SetHeightMM<T>(this BlockElement<T> element, float height) where T : IElement {
+            return element.SetHeight(height * Document.PtInMM);
+        }
+
+        public static T SetPaddingTopMM<T>(this BlockElement<T> element, float top) where T : IElement {
+            return element.SetPaddingTop(top * Document.PtInMM);
+        }
+
+        public static T SetPaddingRightMM<T>(this BlockElement<T> element, float right) where T : IElement {
+            return element.SetPaddingRight(right * Document.PtInMM);
+        }
+
+        public static T SetPaddingBottomMM<T>(this BlockElement<T> element, float bottom) where T : IElement {
+            return element.SetPaddingBottom(bottom * Document.PtInMM);
+        }
+
+        public static T SetPaddingLeftMM<T>(this BlockElement<T> element, float left) where T : IElement {
+            return element.SetPaddingLeft(left * Document.PtInMM);
+        }
+
+        public static T SetPaddingsMM<T>(this BlockElement<T> element, float top, float right, float bottom, float left) where T : IElement {
+            return element.SetPaddings(top * Document.PtInMM, right * Document.PtInMM, bottom * Document.PtInMM, left * Document.PtInMM);
+        }
+
+        public static T SetMarginTopMM<T>(this BlockElement<T> element, float top) where T : IElement {
+            return element.SetMarginTop(top * Document.PtInMM);
+        }
+
+        public static T SetMarginRightMM<T>(this BlockElement<T> element, float right) where T : IElement {
+            return element.SetMarginRight(right * Document.PtInMM);
+        }
+
+        public static T SetMarginBottomMM<T>(this BlockElement<T> element, float bottom) where T : IElement {
+            return element.SetMarginBottom(bottom * Document.PtInMM);
+        }
+
+        public static T SetMarginLeftMM<T>(this BlockElement<T> element, float left) where T : IElement {
+            return element.SetMarginLeft(left * Document.PtInMM);
+        }
+
+        public static T SetMarginsMM<T>(this BlockElement<T> element, float top, float right, float bottom, float left) where T : IElement {
+            return element.SetMargins(top * Document.PtInMM, right * Document.PtInMM, bottom * Document.PtInMM, left * Document.PtInMM);
+        }
+
+        public static void SetTopMarginMM(this iText.Layout.Document element, float top) {
+            element.SetTopMargin(top * Document.PtInMM);
+        }
+
+        public static void SetRightMarginMM(this iText.Layout.Document element, float right) {
+            element.SetRightMargin(right * Document.PtInMM);
+        }
+
+        public static void SetBottomMarginMM(this iText.Layout.Document element, float bottom) {
+            element.SetBottomMargin(bottom * Document.PtInMM);
+        }
+
+        public static void SetLeftMarginMM(this iText.Layout.Document element, float left) {
+            element.SetLeftMargin(left * Document.PtInMM);
+        }
+
+        public static void SetMarginsMM(this iText.Layout.Document element, float top, float right, float bottom, float left) {
+            element.SetMargins(top * Document.PtInMM, right * Document.PtInMM, bottom * Document.PtInMM, left * Document.PtInMM);
+        }
+
+        public static Table AddCells(this Table table, params Cell[] cells) {
+            foreach (var cell in cells)
+                table.AddCell(cell);
+            return table;
+        }
+    }
+}

Elwig/Documents/KernedParagraph.cs

@@ -0,0 +1,82 @@
+using iText.IO.Font;
+using iText.IO.Font.Otf;
+using iText.Kernel.Font;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+using iText.Layout.Renderer;
+using System;
+
+namespace Elwig.Documents {
+    public class KernedParagraph : Paragraph {
+
+        public KernedParagraph(float fontSize) :
+            base() {
+            SetFontKerning(FontKerning.YES);
+            SetFixedLeading(fontSize);
+            SetFontSize(fontSize);
+        }
+
+        public KernedParagraph(string text, float fontSize) :
+            base(text) {
+            SetFontKerning(FontKerning.YES);
+            SetFixedLeading(fontSize);
+            SetFontSize(fontSize);
+        }
+
+        public KernedParagraph(Text text, float fontSize) :
+            base(text) {
+            SetFontKerning(FontKerning.YES);
+            SetFixedLeading(fontSize);
+            SetFontSize(fontSize);
+        }
+
+        public override KernedParagraph Add(ILeafElement element) {
+            if (element is Text t) {
+                t.SetFontKerning(FontKerning.YES);
+                t.SetNextRenderer(new KerningTextRenderer(t));
+            }
+            base.Add(element);
+            return this;
+        }
+
+        public override Paragraph Add(IBlockElement element) {
+            base.Add(element);
+            return this;
+        }
+
+        public class KerningTextRenderer(Text textElement) : TextRenderer(textElement) {
+
+            public override IRenderer GetNextRenderer() {
+                return new KerningTextRenderer((Text)modelElement);
+            }
+
+            public override void ApplyOtf() {
+                PdfFont font;
+                try {
+                    font = GetPropertyAsFont(Property.FONT);
+                } catch (InvalidCastException) {
+                    return;
+                }
+                if (strToBeConverted != null) {
+                    SetProcessedGlyphLineAndFont(TextPreprocessingUtil.ReplaceSpecialWhitespaceGlyphs(font.CreateGlyphLine(strToBeConverted), font), font);
+                }
+                if (otfFeaturesApplied || text.GetStart() >= text.GetEnd()) {
+                    return;
+                }
+                if (GetProperty(Property.FONT_KERNING, (FontKerning?)FontKerning.NO) == FontKerning.YES) {
+                    ApplyKerning(font.GetFontProgram(), text);
+                }
+                otfFeaturesApplied = true;
+            }
+
+            private static void ApplyKerning(FontProgram font, GlyphLine text) {
+                for (int i = 1; i < text.Size(); i++) {
+                    var kerning = font.GetKerning(text.Get(i - 1), text.Get(i));
+                    if (kerning != 0) {
+                        text.Set(i - 1, new Glyph(text.Get(i - 1), 0, 0, kerning, 0, 0));
+                    }
+                }
+            }
+        }
+    }
+}

Elwig/Documents/Letterhead.cs

@@ -2,8 +2,9 @@ using Elwig.Models.Entities;
 
 namespace Elwig.Documents {
     public class Letterhead : BusinessDocument {
-        public Letterhead(Member m) : base($"Briefkopf {m.FullName}", m, true) {
-            Aside = "";
+        public Letterhead(Member m) :
+            base($"Briefkopf {m.FullName}", m, true) {
+            Aside = null;
         }
     }
 }

Elwig/Documents/Letterhead.cshtml

@@ -1,9 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.Letterhead>
-@model Elwig.Documents.Letterhead
-@{ Layout = "BusinessDocument"; }
-<style>
-    header, .footer-wrapper {
-        visibility: hidden;
-    }
-</style>

Elwig/Documents/MemberDataSheet.cs

@@ -1,8 +1,14 @@
 using Elwig.Helpers;
 using Elwig.Models.Entities;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Elwig.Documents {
     public class MemberDataSheet : BusinessDocument {
@@ -11,13 +17,168 @@ namespace Elwig.Documents {
 
         public Season Season;
         public Dictionary<string, MemberBucket> MemberBuckets;
-        public IEnumerable<AreaCom> ActiveAreaCommitments;
+        public List<AreaCom> ActiveAreaCommitments;
 
         public MemberDataSheet(Member m, AppDbContext ctx) : base($"{Name} {m.AdministrativeName}", m) {
             DocumentId = $"{Name} {m.MgNr}";
             Season = ctx.Seasons.ToList().MaxBy(s => s.Year) ?? throw new ArgumentException("invalid season");
             MemberBuckets = ctx.GetMemberBuckets(Utils.CurrentYear, m.MgNr).GetAwaiter().GetResult();
-            ActiveAreaCommitments = m.ActiveAreaCommitments(ctx);
+            ActiveAreaCommitments = [.. m.ActiveAreaCommitments(ctx)];
+        }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(NewMemberData().SetMarginBottomMM(5));
+            doc.Add(NewBucketTable(Season, MemberBuckets, includeDelivery: false));
+            if (ActiveAreaCommitments.Count != 0) {
+                bool firstOnPage = false;
+                if (pdf.GetNumberOfPages() == 1) {
+                    doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
+                    firstOnPage = true;
+                }
+                doc.Add(new KernedParagraph(12).Add(Bold($"Flächenbindungen per {Date:dd.MM.yyyy}")).SetMargins(firstOnPage ? 0 : 24, 0, 12, 0));
+                doc.Add(NewAreaComTable());
+            }
+        }
+
+        protected Cell NewDataHdr(string title, int colspan) {
+            return NewTd(title, 10, colspan: colspan, bold: true, italic: true, center: true, borderTop: true)
+                .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0));
+        }
+
+        protected Cell NewDataTh(string text, float fontSize = 10, int colspan = 1) {
+            return NewTd(text, fontSize, colspan: colspan, italic: true)
+                .SetPaddingRightMM(0);
+        }
+
+        protected Table NewMemberData() {
+            var tbl = new Table(ColsMM(30.0, 51.5, 20.0, 12.0, 18.0, 31.5))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorder(new SolidBorder(BorderThickness));
+
+            tbl.AddCell(NewDataHdr("Persönliche Daten", 6));
+            if (Member.IsJuridicalPerson) {
+                tbl
+                    .AddCell(NewDataTh("Name", 8, colspan: 3))
+                    .AddCell(NewDataTh("Zu Handen", 8, colspan: 3))
+                    .AddCell(NewTd(Member.Name, 12, colspan: 3))
+                    .AddCell(NewTd(Member.ForTheAttentionOf, 12, colspan: 3));
+            } else {
+                tbl
+                    .AddCell(NewDataTh("Titel (vorangestellt)", 8))
+                    .AddCell(NewDataTh("Vorname", 8))
+                    .AddCell(NewDataTh("Nachname", 8, colspan: 3))
+                    .AddCell(NewDataTh("Titel (nachgestellt)", 8))
+                    .AddCell(NewTd(Member.Prefix, 12))
+                    .AddCell(NewTd($"{Member.GivenName} {Member.MiddleName}", 12))
+                    .AddCell(NewTd(Member.Name, 12, colspan: 3))
+                    .AddCell(NewTd(Member.Suffix, 12));
+            }
+
+            tbl
+                .AddCell(NewDataTh("Mitglieds-Nr.:")).AddCell(NewTd($"{Member.MgNr}"))
+                .AddCell(NewDataTh(Member.IsJuridicalPerson ? "Gründungsjahr/-tag:" : "Geburtsjahr/-tag:", colspan: 2))
+                    .AddCell(NewTd(string.Join('.', Member.Birthday?.Split('-')?.Reverse() ?? []), colspan: 2))
+                .AddCell(NewDataTh("Adresse:")).AddCell(NewTd(Member.Address, colspan: 5))
+                .AddCell(NewDataTh("PLZ/Ort:"))
+                    .AddCell(NewTd($"{Member.PostalDest.AtPlz?.Plz} {Member.PostalDest.AtPlz?.Dest} ({Member.PostalDest.AtPlz?.Ort.Name})", colspan: 5))
+                .AddCell(NewDataHdr("Rechnungsadresse (optional)", colspan: 6))
+                .AddCell(NewDataTh("Name:")).AddCell(NewTd(Member.BillingAddress?.FullName, colspan: 5))
+                .AddCell(NewDataTh("Adresse:")).AddCell(NewTd(Member.BillingAddress?.Address, colspan: 5))
+                .AddCell(NewDataTh("PLZ/Ort:"))
+                .AddCell(NewTd(Member.BillingAddress != null ? $"{Member.BillingAddress.PostalDest.AtPlz?.Plz} {Member.BillingAddress.PostalDest.AtPlz?.Dest} ({Member.BillingAddress.PostalDest.AtPlz?.Ort.Name})" : "", colspan: 5));
+
+            tbl.AddCell(NewDataHdr("Kontaktdaten", colspan: 3))
+                .AddCell(NewDataHdr("Bankverbindung", colspan: 3).SetBorderLeft(new SolidBorder(BorderThickness)));
+            List<string?[]> subTbl1 = [
+                .. Member.EmailAddresses.Select(a => new[] { "E-Mail-Adresse", a.Address }),
+                .. Member.TelephoneNumbers.Select(n => new[] { Utils.PhoneNrTypeToString(n.Type), n.Number, n.Comment }),
+                ["Tel.-Nr./E-Mail-Adr.", null],
+            ];
+            List<string?[]> subTbl2 = [
+                ["IBAN", Member.Iban != null ? Utils.FormatIban(Member.Iban) : null],
+                ["BIC", Member.Bic],
+            ];
+            for (int i = 0; i < Math.Max(subTbl1.Count, subTbl2.Count); i++) {
+                tbl.AddCell(NewDataTh(i < subTbl1.Count ? subTbl1[i][0] + ":" : ""));
+                if (i < subTbl1.Count && subTbl1[i].Length >= 3 && subTbl1[i][2] != null) {
+                    tbl.AddCell(NewTd(subTbl1[i][1])).AddCell(NewTd($"({subTbl1[i][2]})"));
+                } else {
+                    tbl.AddCell(NewTd(i < subTbl1.Count ? subTbl1[i][1] : "", colspan: 2));
+                }
+                tbl.AddCell(NewDataTh(i < subTbl2.Count ? subTbl2[i][0] + ":" : "").SetBorderLeft(new SolidBorder(BorderThickness)))
+                    .AddCell(NewTd(i < subTbl2.Count ? subTbl2[i][1] : "", colspan: 2));
+            }
+
+            tbl.AddCell(NewDataHdr("Betrieb", colspan: 6))
+                .AddCell(NewDataTh("Betriebs-Nr.:")).AddCell(NewTd(Member.LfbisNr))
+                .AddCell(NewDataTh("UID:", colspan: 2)).AddCell(NewTd(Member.UstIdNr, colspan: 2))
+                .AddCell(NewDataTh("Stammgemeinde:")).AddCell(NewTd(Member.DefaultKg?.Name))
+                .AddCell(NewDataTh("Buchführend:", colspan: 2)).AddCell(NewTd(new KernedParagraph(Member.IsBuchführend ? "Ja " : "Nein ", 10)
+                    .Add(Normal($"({(Member.IsBuchführend ? Season.VatNormal : Season.VatFlatrate) * 100:N0}% USt.)", 8)), colspan: 2))
+                .AddCell(NewDataTh("(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)", 8, colspan: 2))
+                .AddCell(NewDataTh("Bio:", colspan: 2)).AddCell(NewTd(Member.IsOrganic ? "Ja" : "Nein", colspan: 2))
+                .AddCell(NewDataHdr("Genossenschaft", colspan: 6))
+                .AddCell(NewDataTh("Status:")).AddCell(NewTd(new KernedParagraph(Member.IsActive ? "Aktiv " : "Nicht aktiv ", 10)
+                    .Add(Normal("(" + (Member.ExitDate != null ? $"{Member.EntryDate:dd.MM.yyyy}\u2013{Member.ExitDate:dd.MM.yyyy}" : $"seit {Member.EntryDate:dd.MM.yyyy}") + ")", 8))))
+                .AddCell(NewDataTh("Geschäftsanteile:", colspan: 2)).AddCell(NewTd($"{Member.BusinessShares:N0}", colspan: 2))
+                .AddCell(NewDataTh("Stamm-Zweigstelle:")).AddCell(NewTd(Member.Branch?.Name))
+                .AddCell(NewDataTh("Volllieferant:", colspan: 2)).AddCell(NewTd(Member.IsVollLieferant ? "Ja" : "Nein", colspan: 2))
+                .AddCell(NewDataTh("Zusendungen per\u2026")).AddCell(NewTd(new KernedParagraph(10)
+                    .Add(Italic("Post:")).Add(Normal(Member.ContactViaPost ? " Ja \u2013 " : " Nein \u2013 "))
+                    .Add(Italic("E-Mail:")).Add(Normal(Member.ContactViaEmail ? " Ja" : " Nein"))))
+                .AddCell(NewDataTh("Funktionär:", colspan: 2)).AddCell(NewTd(Member.IsFunktionär ? "Ja" : "Nein", colspan: 2));
+
+            return tbl;
+        }
+
+        protected Table NewAreaComTable() {
+            var areaComs = ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
+                Type = group.Key,
+                AreaComs = group.OrderBy(c => c.Kg.AtKg.Name).ToList(),
+                Size = group.Sum(c => c.Area)
+            }).OrderByDescending(a => a.Size).ToList();
+
+            var tbl = new Table(ColsMM(40, 30, 35, 15, 25, 20), true)
+              .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+              .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+              .SetBorder(Border.NO_BORDER)
+              .SetFontSize(10);
+
+            tbl.AddHeaderCell(NewTh("Katastralgemeinde", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Ried", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Parzelle(n)", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Fläche"))
+                .AddHeaderCell(NewTh("Bewirt.", rowspan: 2))
+                .AddHeaderCell(NewTh("Laufzeit", rowspan: 2))
+                .AddHeaderCell(NewTh("[m²]"));
+
+            var lastContract = "";
+            foreach (var contractType in areaComs) {
+                tbl.AddCell(NewCell(new KernedParagraph(10).Add(BoldItalic($"{contractType.Type.WineVar.Name} {(contractType.Type.WineAttr != null ? "(" + contractType.Type.WineAttr + ")" : "")}")), colspan: 3)
+                        .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER))
+                    .AddCell(NewCell(new KernedParagraph(10).Add(Bold($"{contractType.Size:N0}")).SetTextAlignment(TextAlignment.RIGHT))
+                        .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER))
+                    .AddCell(NewCell(colspan: 2)
+                        .SetBorderTop(contractType.Type.DisplayName != lastContract && lastContract != "" ? new SolidBorder(BorderThickness) : Border.NO_BORDER));
+
+                foreach (var areaCom in contractType.AreaComs) {
+                    tbl.AddCell(NewTd(new KernedParagraph(10).Add(Normal($"{areaCom.Kg.AtKg.Name} ")).Add(Normal($"({areaCom.Kg.AtKg.KgNr:00000})", 8))))
+                        .AddCell(NewTd(areaCom.Rd?.Name))
+                        .AddCell(NewTd(Regex.Replace(areaCom.GstNr.Replace(",", ", ").Replace("-", "\u2013"), @"\s+", " "), 10))
+                        .AddCell(NewTd($"{areaCom.Area:N0}", right: true))
+                        .AddCell(NewTd(areaCom.WineCult?.Name, center: true))
+                        .AddCell(NewTd(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"), center: true));
+                    lastContract = contractType.Type.DisplayName;
+                }
+            }
+
+            tbl.AddCell(NewTd("Gesamt:", 12, colspan: 2, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            tbl.AddCell(NewTd($"{ActiveAreaCommitments.Sum(a => a.Area):N0}", 12, colspan: 2, right: true, bold: true, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+            tbl.AddCell(NewTd(colspan: 2, borderTop: true).SetPaddingsMM(1, 1, 1, 1));
+
+            return tbl;
         }
     }
 }

Elwig/Documents/MemberDataSheet.cshtml

@@ -1,222 +0,0 @@
-@using RazorLight
-@using Elwig.Helpers
-@inherits TemplatePage<Elwig.Documents.MemberDataSheet>
-@model Elwig.Documents.MemberDataSheet
-@{ Layout = "BusinessDocument"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberDataSheet.css" />
-<main>
-    <h1>@Model.Title</h1>
-    <table class="member border">
-        <colgroup>
-            <col style="width: 30.0mm;"/>
-            <col style="width: 51.5mm;"/>
-            <col style="width: 20.0mm;"/>
-            <col style="width: 12.0mm;"/>
-            <col style="width: 18.0mm;"/>
-            <col style="width: 31.5mm;"/>
-        </colgroup>
-        <tbody>
-            <tr class="sectionheading"><th colspan="6">Persönliche Daten</th></tr>
-            <tr>
-                @if (Model.Member.IsJuridicalPerson) {
-                    <th colspan="3" class="small">Name</th>
-                    <th colspan="3" class="small">Zu Handen</th>
-                } else {
-                    <th class="small">Titel (vorangestellt)</th>
-                    <th class="small">Vorname</th>
-                    <th colspan="3" class="small">Nachname</th>
-                    <th class="small">Titel (nachgestellt)</th>
-                }
-            </tr>
-            <tr>
-                @if (Model.Member.IsJuridicalPerson) {
-                    <td colspan="3" class="large">@Model.Member.Name</td>
-                    <td colspan="3" class="large">@Model.Member.ForTheAttentionOf</td>
-                } else {
-                    <td class="large">@Model.Member.Prefix</td>
-                    <td class="large">@Model.Member.GivenName @Model.Member.MiddleName</td>
-                    <td class="large" colspan="3">@Model.Member.Name</td>
-                    <td class="large">@Model.Member.Suffix</td>
-                }
-            </tr>
-            <tr>
-                <th>Mitglieds-Nr.:</th>
-                <td>@Model.Member.MgNr</td>
-                <th colspan="2">@(Model.Member.IsJuridicalPerson ? "Gründungsjahr/-tag" : "Geburtsjahr/-tag"):</th>
-                <td colspan="2">@(string.Join('.', Model.Member.Birthday?.Split('-')?.Reverse() ?? Array.Empty<string>()))</td>
-            </tr>
-            <tr>
-                <th>Adresse:</th>
-                <td colspan="5">@Model.Member.Address</td>
-            </tr>
-            <tr>
-                <th>PLZ/Ort:</th>
-                <td colspan="5">
-                    @Model.Member.PostalDest.AtPlz?.Plz
-                    @Model.Member.PostalDest.AtPlz?.Dest
-                    (@Model.Member.PostalDest.AtPlz?.Ort.Name)
-                </td>
-            </tr>
-            <tr class="sectionheading"><th colspan="6">Rechnungsadresse (optional)</th></tr>
-            <tr>
-                <th>Name:</th>
-                <td colspan="5">@Model.Member.BillingAddress?.FullName</td>
-            </tr>
-            <tr>
-                <th>Adresse:</th>
-                <td colspan="5">@Model.Member.BillingAddress?.Address</td>
-            </tr>
-            <tr>
-                <th>PLZ/Ort:</th>
-                <td colspan="5">
-                    @if (Model.Member.BillingAddress != null) {
-                        @Model.Member.BillingAddress.PostalDest.AtPlz?.Plz
-                        @(" ")@Model.Member.BillingAddress.PostalDest.AtPlz?.Dest
-                        @(" (")@Model.Member.BillingAddress.PostalDest.AtPlz?.Ort.Name@(")")
-                    }
-                </td>
-            </tr>
-            <tr class="sectionheading">
-                <th colspan="3">Kontaktdaten</th>
-                <th colspan="3" class="lborder">Bankverbindung</th>
-            </tr>
-            @{
-                List<string?[]> subTbl1 = new();
-                subTbl1.AddRange(Model.Member.EmailAddresses.Select(a => new[] { "E-Mail-Adresse", a.Address }));
-                subTbl1.AddRange(Model.Member.TelephoneNumbers.Select(n => new[] { Utils.PhoneNrTypeToString(n.Type), n.Number, n.Comment }));
-                subTbl1.Add(new[] { "Tel.-Nr./E-Mail-Adr.", null });
-
-                List<string?[]> subTbl2 = new();
-                subTbl2.Add(new[] { "IBAN", Model.Member.Iban != null ? Elwig.Helpers.Utils.FormatIban(Model.Member.Iban) : null });
-                subTbl2.Add(new[] { "BIC", Model.Member.Bic });
-            }
-            @for (int i = 0; i < Math.Max(subTbl1.Count, subTbl2.Count); i++) {
-                <tr>
-                    <th>@(i < subTbl1.Count ? subTbl1[i][0] + ":" : "")</th>
-                    @if (i < subTbl1.Count && subTbl1[i].Length >= 3 && subTbl1[i][2] != null) {
-                        <td>@subTbl1[i][1]</td>
-                        <td>(@subTbl1[i][2])</td>
-                    } else {
-                        <td colspan="2">@(i < subTbl1.Count ? subTbl1[i][1] : "")</td>
-                    }
-
-                    <th class="lborder">@(i < subTbl2.Count ? subTbl2[i][0] + ":" : "")</th>
-                    <td colspan="2">@(i < subTbl2.Count ? subTbl2[i][1] : "")</td>
-                </tr>
-            }
-            <tr class="sectionheading"><th colspan="6">Betrieb</th></tr>
-            <tr>
-                <th>Betriebs-Nr.:</th>
-                <td>@Model.Member.LfbisNr</td>
-                <th colspan="2">UID:</th>
-                <td colspan="2">@Model.Member.UstIdNr</td>
-            </tr>
-            <tr>
-                <th>Stammgemeinde:</th>
-                <td>@Model.Member.DefaultKg?.Name</td>
-                <th colspan="2">Buchführend:</th>
-                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
-            </tr>
-            <tr>
-                <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
-                <th colspan="2">Bio:</th>
-                <td colspan="2">@(Model.Member.IsOrganic ? "Ja" : "Nein")</td>
-            </tr>
-            <tr class="sectionheading"><th colspan="6">Genossenschaft</th></tr>
-            <tr>
-                <th>Status:</th>
-                <td>
-                    @(Model.Member.IsActive ? "Aktiv" : "Nicht aktiv")
-                    <span class="small">
-                        (@(Model.Member.ExitDate != null ?
-                        $"{Model.Member.EntryDate:dd.MM.yyyy}–{Model.Member.ExitDate:dd.MM.yyyy}" :
-                        $"seit {Model.Member.EntryDate:dd.MM.yyyy}"))
-                    </span>
-                </td>
-                <th colspan="2">Geschäftsanteile:</th>
-                <td colspan="2">@Model.Member.BusinessShares</td>
-            </tr>
-            <tr>
-                <th>Stamm-Zweigstelle:</th>
-                <td>@Model.Member.Branch?.Name</td>
-                <th colspan="2">Volllierferant:</th>
-                <td colspan="2">@(Model.Member.IsVollLieferant ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th>Zusendungen via...</th>
-                <td>
-                    <i>Post:</i> @(Model.Member.ContactViaPost ? "Ja" : "Nein") –
-                    <i>E-Mail:</i> @(Model.Member.ContactViaEmail ? "Ja" : "Nein")
-                </td>
-                <th colspan="2">Funktionär:</th>
-                <td colspan="2">@(Model.Member.IsFunktionär ? "Ja" : "Nein")</td>
-            </tr>
-        </tbody>
-    </table>
-
-    @Raw(Model.PrintBucketTable(Model.Season, Model.MemberBuckets, includeDelivery: false))
-
-    @{
-        var areaComs = Model.ActiveAreaCommitments.GroupBy(a => a.AreaComType).Select(group => new {
-            AreaComType = group.Key,
-            AreaComs = group.OrderBy(c => c.Kg.AtKg.Name),
-            Size = group.Sum(c => c.Area)
-        }).OrderByDescending(a => a.Size).ToList();
-        var lastContract = "";
-    }
-
-    @if (areaComs.Count != 0) {
-        <br class="area-commitements"/>
-        <h2>Flächenbindungen per @($"{Model.Date:dd.MM.yyyy}")</h2>
-        <table class="area-commitements">
-            <colgroup>
-                <col style="width: 40mm;"/>
-                <col style="width: 30mm;"/>
-                <col style="width: 35mm;"/>
-                <col style="width: 15mm;"/>
-                <col style="width: 25mm;"/>
-                <col style="width: 20mm;"/>
-            </colgroup>
-            <thead>
-                <tr>
-                    <th rowspan="2" style="text-align: left;">Katastralgemeinde</th>
-                    <th rowspan="2" style="text-align: left;">Ried</th>
-                    <th rowspan="2" style="text-align: left;">Parzelle(n)</th>
-                    <th>Fläche</th>
-                    <th rowspan="2" style="text-align: center;">Bewirt.</th>
-                    <th rowspan="2" style="text-align: center;">Laufzeit</th>
-                </tr>
-                <tr>
-                    <th>[m²]</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var contractType in areaComs) {
-                    <tr class="subheading @(contractType.AreaComType.DisplayName != lastContract && lastContract != "" ? "new" : "")">
-                        <th colspan="3">
-                            @($"{contractType.AreaComType.WineVar.Name} {(contractType.AreaComType.WineAttr != null ? "(" + contractType.AreaComType.WineAttr + ")" : "")}")
-                        </th>
-                        <td class="number">@($"{contractType.Size:N0}")</td>
-                        <td colspan="2"></td>
-                    </tr>
-                    @foreach (var areaCom in contractType.AreaComs) {
-                        <tr class="area-commitment">
-                            <td>@areaCom.Kg.AtKg.Name <span style="font-size: 8pt;">(@($"{areaCom.Kg.AtKg.KgNr:00000}"))</span></td>
-                            <td>@areaCom.Rd?.Name</td>
-                            <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
-                            <td class="number">@($"{areaCom.Area:N0}")</td>
-                            <td class="center">@areaCom.WineCult?.Name</td>
-                            <td class="center">@(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
-                        </tr>
-                        lastContract = contractType.AreaComType.DisplayName;
-                    }
-                }
-                <tr class="sum bold">
-                    <td colspan="3">Gesamt:</td>
-                    <td class="number">@($"{Model.ActiveAreaCommitments.Sum(a => a.Area):N0}")</td>
-                    <td colspan="2"></td>
-                </tr>
-            </tbody>
-        </table>
-    }
-</main>

Elwig/Documents/MemberDataSheet.css

@@ -1,30 +0,0 @@
-
-h2 {
-    margin-bottom: 0.5em !important;
-}
-
-table.member {
-    margin-bottom: 5mm;
-}
-
-table.area-commitements {
-    margin-top: 0;
-}
-
-table.area-commitements td {
-    vertical-align: top;
-}
-
-table.area-commitements td.text {
-    white-space: normal;
-}
-
-table.area-commitements tr.sum {
-    font-size: 12pt;
-}
-
-@page :not(:first) {
-    br.area-commitements {
-        display: none;
-    }
-}

Elwig/Documents/MemberList.cs

@@ -1,4 +1,10 @@
 using Elwig.Models.Dtos;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -8,14 +14,15 @@ namespace Elwig.Documents {
         public new static string Name => "Mitgliederliste";
 
         public string Filter;
-        public IEnumerable<MemberListRow> Members;
+        public List<MemberListRow> Members;
 
         public string[] AreaComFilters;
         public bool FilterAreaComs => AreaComFilters.Length > 0;
 
-        public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
+        public MemberList(string filter, IEnumerable<MemberListRow> members) :
+            base(Name) {
             Filter = filter;
-            Members = members;
+            Members = [.. members];
             AreaComFilters = [..members
                 .SelectMany(m => m.AreaCommitmentsFiltered)
                 .Select(c => c.VtrgId)
@@ -26,5 +33,79 @@ namespace Elwig.Documents {
         public MemberList(string filter, MemberListData data) :
             this(filter, data.Rows) {
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph(Name, 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(new KernedParagraph(Filter, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(NewMemberTable(Members));
+        }
+
+        protected Table NewMemberTable(List<MemberListRow> members) {
+            var tbl = new Table(AreaComFilters.Length > 1 ? ColsMM(8, 38, 36, 8, 18, 12, 5, 16, 12, 12) : ColsMM(8, 42, 40, 8, 20, 12, 5, 18, 12), true)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            var headerSpan = FilterAreaComs ? 3 : 2;
+            tbl.AddHeaderCell(NewTh("Nr.", rowspan: headerSpan))
+                .AddHeaderCell(NewTh("Name", rowspan: headerSpan, left: true))
+                .AddHeaderCell(NewTh("Adresse", rowspan: headerSpan, left: true))
+                .AddHeaderCell(NewTh("PLZ", rowspan: headerSpan))
+                .AddHeaderCell(NewTh("Ort", rowspan: headerSpan, left: true))
+                .AddHeaderCell(NewTh("Betr.-Nr.", rowspan: headerSpan))
+                .AddHeaderCell(NewTh("GA", rowspan: headerSpan).SetPaddingLeft(0).SetPaddingRight(0))
+                .AddHeaderCell(NewTh("Stamm-KG", rowspan: headerSpan, left: true))
+                .AddHeaderCell(NewTh("Geb. Fl.", colspan: FilterAreaComs ? AreaComFilters.Length : 1));
+            if (FilterAreaComs) {
+                foreach (var vtrgId in AreaComFilters) {
+                    tbl.AddHeaderCell(NewTh(vtrgId));
+                }
+            }
+            for (int i = 0; i < (FilterAreaComs ? AreaComFilters.Length : 1); i++) {
+                tbl.AddHeaderCell(NewTh("[m²]"));
+            }
+
+            string? lastBranch = members.Select(m => m.Branch).Distinct().Count() == 1 ? null : "";
+            foreach (var m in members) {
+                if (lastBranch != null && m.Branch != lastBranch) {
+                    tbl.AddCell(NewCell(colspan: 8 + Math.Max(AreaComFilters.Length, 1)).SetHeightMM(5).SetKeepWithNext(true));
+                    tbl.AddCell(NewCell(new KernedParagraph(m.Branch ?? "", 16).SetFont(BF), colspan: 8 + Math.Max(AreaComFilters.Length, 1))
+                        .SetPaddingsMM(1, 2, 1, 2)
+                        .SetBorder(new SolidBorder(BorderThickness))
+                        .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0)));
+                    lastBranch = m.Branch;
+                }
+
+                tbl.AddCell(NewTd($"{m.MgNr}", 8, rowspan: m.BillingName != null ? 2 : 1, right: true).SetVerticalAlignment(VerticalAlignment.TOP))
+                    .AddCell(NewTd($"{m.AdminName1} {m.Name2}", 8))
+                    .AddCell(NewTd(m.Address, 8))
+                    .AddCell(NewTd($"{m.Plz}", 8))
+                    .AddCell(NewTd(m.Locality, 6))
+                    .AddCell(NewTd(m.LfbisNr ?? "", 8))
+                    .AddCell(NewTd($"{m.BusinessShares:N0}", 8, right: true).SetPaddingLeft(0).SetPaddingRight(0))
+                    .AddCell(NewTd(m.DefaultKg ?? "", 6));
+                if (AreaComFilters.Length > 0) {
+                    foreach (var v in AreaComFilters) {
+                        tbl.AddCell(NewTd($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}", 8, right: true));
+                    }
+                } else {
+                    tbl.AddCell(NewTd($"{m.AreaCommitment:N0}", 8, right: true));
+                }
+
+                if (m.BillingName != null) {
+                    tbl.AddCell(NewTd(m.BillingName, 8))
+                        .AddCell(NewTd(m.BillingAddress ?? "", 8))
+                        .AddCell(NewTd($"{m.BillingPlz}", 8))
+                        .AddCell(NewTd(m.BillingLocality ?? "", 6))
+                        .AddCell(NewTd(colspan: 3 + Math.Max(AreaComFilters.Length, 1)));
+                }
+            }
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/MemberList.cshtml

@@ -1,109 +0,0 @@
-@using RazorLight
-@inherits TemplatePage<Elwig.Documents.MemberList>
-@model Elwig.Documents.MemberList
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\MemberList.css" />
-<main>
-    <h1>Mitgliederliste</h1>
-    <h2>@Model.Filter</h2>
-    <table class="members">
-        <colgroup>
-            <col style="width:  8mm;"/>
-            @if (Model.AreaComFilters.Length > 1) {
-                <col style="width: 38mm;"/>
-            } else {
-                <col style="width: 42mm;"/>
-            }
-            @if (Model.AreaComFilters.Length > 1) {
-                <col style="width: 36mm;"/>
-            } else {
-                <col style="width: 40mm;"/>
-            }
-            <col style="width:  8mm;"/>
-            @if (Model.AreaComFilters.Length > 1) {
-                <col style="width: 18mm;"/>
-            } else {
-                <col style="width: 20mm;"/>
-            }
-            <col style="width: 12mm;"/>
-            <col style="width:  5mm;"/>
-            @if (Model.AreaComFilters.Length > 1) {
-                <col style="width: 16mm;"/>
-            } else {
-                <col style="width: 18mm;"/>
-            }
-            <col style="width: 12mm;"/>
-            @if (Model.AreaComFilters.Length > 1) {
-                <col style="width: 12mm;"/>
-            }
-        </colgroup>
-        <thead>
-            <tr>
-                @{
-                    var headerSpan = Model.FilterAreaComs ? 3 : 2;
-                }
-                <th rowspan="@headerSpan">Nr.</th>
-                <th rowspan="@headerSpan" style="text-align: left;">Name</th>
-                <th rowspan="@headerSpan" style="text-align: left;">Adresse</th>
-                <th rowspan="@headerSpan">PLZ</th>
-                <th rowspan="@headerSpan" style="text-align: left;">Ort</th>
-                <th rowspan="@headerSpan">Betr.-Nr.</th>
-                <th rowspan="@headerSpan">GA</th>
-                <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th>
-                <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th>
-            </tr>
-            @if (Model.FilterAreaComs) {
-                <tr>
-                    @foreach (var vtrgId in Model.AreaComFilters) {
-                        <th>@vtrgId</th>
-                    }
-                </tr>
-            }
-            <tr>
-                @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) {
-                    <th class="unit">[m²]</th>
-                }
-            </tr>
-        </thead>
-        <tbody class="small">
-            @{
-                string? lastBranch = Model.Members.Select(m => m.Branch).Distinct().Count() == 1 ? null : "";
-            }
-            @foreach (var m in Model.Members) {
-                if (lastBranch != null && m.Branch != lastBranch) {
-                    <tr class="spacing"><td colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr>
-                    <tr class="header">
-                        <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th>
-                    </tr>
-                    lastBranch = m.Branch;
-                }
-                <tr>
-                    <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
-                    <td>@m.AdminName1 @m.Name2</td>
-                    <td>@m.Address</td>
-                    <td>@m.Plz</td>
-                    <td class="tiny">@m.Locality</td>
-                    <td>@m.LfbisNr</td>
-                    <td class="number">@m.BusinessShares</td>
-                    <td class="tiny">@m.DefaultKg</td>
-                    @if (Model.AreaComFilters.Length > 0) {
-                        foreach (var v in Model.AreaComFilters) {
-                            <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td>
-                        }
-                    } else {
-                        <td class="number">@($"{m.AreaCommitment:N0}")</td>
-                    }
-                </tr>
-                if (m.BillingName != null) {
-                    <tr>
-                        <td>@m.BillingName</td>
-                        <td>@m.BillingAddress</td>
-                        <td>@m.BillingPlz</td>
-                        <td class="tiny">@m.BillingLocality</td>
-                        <td colspan="4"></td>
-                    </tr>
-                }
-            }
-        </tbody>
-    </table>
-</main>

Elwig/Documents/MemberList.css

@@ -1,13 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}

Elwig/Documents/PaymentVariantSummary.cs

@@ -2,6 +2,12 @@ using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -33,5 +39,258 @@ namespace Elwig.Documents {
             ModifierStat = AppDbContext.GetModifierStats(v.Year, v.AvNr).GetAwaiter().GetResult();
             Modifiers = v.Season.Modifiers.ToDictionary(m => m.ModId);
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph($"{Name} Lese {Variant.Year}", 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 2, 0));
+            doc.Add(new KernedParagraph(Variant.Name, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginsMM(0, 0, 10, 0));
+            doc.Add(NewVariantStatTable().SetMarginBottomMM(10));
+            doc.Add(NewModifierStatTable());
+            doc.Add(new AreaBreak(AreaBreakType.NEXT_PAGE));
+            doc.Add(NewPriceTable());
+        }
+
+        protected Cell NewSectionHdr(string text, int colspan = 1, bool borderLeft = false) {
+            return NewTd(text, 10, colspan: colspan, bold: true, italic: true, center: true, borderTop: true)
+                .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0))
+                .SetPaddingsMM(0.5f, 1, 0.5f, 1)
+                .SetBorderLeft(borderLeft ? new SolidBorder(BorderThickness) : Border.NO_BORDER);
+        }
+
+        protected Cell NewSectionTh(string? text = null, float fontSize = 10, int colspan = 1, bool borderTop = false, bool borderLeft = false, bool overflow = false) {
+            return NewTd(text, fontSize, colspan: colspan, italic: true, borderTop: borderTop, overflow: overflow)
+                .SetPaddingRightMM(0)
+                .SetBorderLeft(borderLeft ? new SolidBorder(BorderThickness) : Border.NO_BORDER);
+        }
+
+        protected Table NewVariantStatTable() {
+            var tbl = new Table(ColsMM(20, 30, 4.5, 4.5, 23.5, 47.5, 15, 20))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorder(new SolidBorder(BorderThickness));
+
+            //var sum1 = Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
+            //var sum2 = Variant.Credits.Sum(p => p.);  //Variant.MemberPayments.Sum(p => p.Amount);
+            var deliveryModifiers = Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
+            var memberModifiers = Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
+            var sum2 = Variant.Credits.Sum(p => p.NetAmount);
+            var sum1 = sum2 - deliveryModifiers - memberModifiers;
+            var payed = -Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var netSum = Variant.Credits.Sum(p => p.NetAmount) - Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
+            var vat = Variant.Credits.Sum(p => p.VatAmount);
+            var grossSum = Variant.Credits.Sum(p => p.GrossAmount);
+            var totalMods = Variant.Credits.Sum(p => p.Modifiers ?? 0m);
+            var considered = -Variant.Credits.Sum(p => p.PrevModifiers ?? 0m);
+            var totalSum = Variant.Credits.Sum(p => p.Amount);
+
+            var weiRows = Data.Rows.Where(r => r.QualityLevel == "Wein");
+            var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
+            var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
+            var quwRows = Data.Rows.Where(r => r.QualityLevel != "Wein");
+            var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
+            var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
+            var gebRows = Data.Rows
+                       .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
+                       .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
+            var minGeb = gebRows.Min();
+            var maxGeb = gebRows.Max();
+
+            tbl.AddCell(NewSectionHdr("Allgemein", colspan: 5))
+                .AddCell(NewSectionHdr("Berücksichtigt", colspan: 3, borderLeft: true))
+
+                .AddCell(NewSectionTh("Name:"))
+                .AddCell(NewTd(Variant.Name, colspan: 4))
+                .AddCell(NewSectionTh("Zu-/Abschläge bei Lieferungen:", colspan: 2, borderLeft: true))
+                .AddCell(NewTd(BillingData.ConsiderDelieryModifiers ? "Ja" : "Nein", center: true))
+
+                 .AddCell(NewSectionTh("Beschr.:"))
+                .AddCell(NewTd(Variant.Comment, colspan: 4))
+                .AddCell(NewSectionTh("Pönalen bei Unterlieferungen (FB):", colspan: 2, borderLeft: true))
+                .AddCell(NewTd(BillingData.ConsiderContractPenalties ? "Ja" : "Nein", center: true))
+
+                .AddCell(NewSectionTh("Rebel-Zuschl.:", overflow: true))
+                .AddCell(NewTd($"{Utils.GetSign(BillingData.NetWeightModifier)}{Math.Abs(BillingData.NetWeightModifier) * 100:N2} % / {Utils.GetSign(BillingData.GrossWeightModifier)}{Math.Abs(BillingData.GrossWeightModifier) * 100:N2} %", colspan: 4, center: true))
+                .AddCell(NewSectionTh("Strafen bei Unterlieferungen (GA):", colspan: 2, borderLeft: true))
+                .AddCell(NewTd(BillingData.ConsiderTotalPenalty ? "Ja" : "Nein", center: true))
+
+                .AddCell(NewSectionTh("Datum/Überw.:", overflow: true))
+                .AddCell(NewTd($"{Variant.Date:dd.MM.yyyy} / {Variant.TransferDate:dd.MM.yyyy}", colspan: 4, center: true))
+                .AddCell(NewSectionTh("Automatische Nachzeichnung der GA:", colspan: 2, borderLeft: true))
+                .AddCell(NewTd(BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein", center: true))
+
+                .AddCell(NewSectionTh("Berechnung:"))
+                .AddCell(NewTd($"{Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}", colspan: 4, center: true))
+                .AddCell(NewSectionTh("Benutzerdef. Zu-/Abschläge pro Mitglied:", colspan: 2, borderLeft: true))
+                .AddCell(NewTd(BillingData.ConsiderCustomModifiers ? "Ja" : "Nein", center: true))
+
+                .AddCell(NewSectionHdr("Beträge", colspan: 5))
+                .AddCell(NewSectionHdr("Statistik", colspan: 3, borderLeft: true))
+
+                .AddCell(NewSectionTh("Zwischensumme:", colspan: 2))
+                .AddCell(NewTd())
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{sum1:N2}", right: true))
+                .AddCell(NewSectionTh("Lieferanten:", borderLeft: true))
+                .AddCell(NewTd($"{MemberNum:N0}", colspan: 2, right: true))
+
+                .AddCell(NewSectionTh("Zu-/Abschläge (Mitglieder):", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(memberModifiers), right: true))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(memberModifiers):N2}", right: true))
+                .AddCell(NewSectionTh("Lieferungen:", borderLeft: true))
+                .AddCell(NewTd($"{DeliveryNum:N0}", colspan: 2, right: true))
+
+                .AddCell(NewSectionTh("Zu-/Abschläge (Lieferungen):", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(deliveryModifiers), right: true))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(deliveryModifiers):N2}", right: true))
+                .AddCell(NewSectionTh("Teillieferungen:", borderLeft: true))
+                .AddCell(NewTd($"{DeliveryPartNum:N0}", colspan: 2, right: true))
+
+                .AddCell(NewSectionTh("Gesamtsumme:", colspan: 2))
+                .AddCell(NewTd(borderTop: true))
+                .AddCell(NewTd(CurrencySymbol, borderTop: true))
+                .AddCell(NewTd($"{sum2:N2}", right: true, borderTop: true))
+                .AddCell(NewSectionTh(borderLeft: true))
+                .AddCell(NewTd(colspan: 2))
+
+                .AddCell(NewSectionTh("Bisher ausgezahlt:", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(payed), right: true))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(payed):N2}", right: true))
+                .AddCell(NewSectionTh("Preis (abgewertet):", borderTop: true, borderLeft: true))
+                .AddCell(NewTd((minWei != maxWei ? $"{minWei:N4}\u2013{maxWei:N4}" : $"{minWei:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true, borderTop: true))
+
+                .AddCell(NewSectionTh("Nettosumme:", colspan: 2))
+                .AddCell(NewTd(borderTop: true))
+                .AddCell(NewTd(CurrencySymbol, borderTop: true))
+                .AddCell(NewTd($"{netSum:N2}", right: true, borderTop: true))
+                .AddCell(NewSectionTh("Preis (ungeb., nicht abgew.):", borderLeft: true))
+                .AddCell(NewTd((minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") + $" {CurrencySymbol}/kg", colspan: 2, center: true))
+
+                .AddCell(NewSectionTh("Mehrwertsteuer:", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(vat), right: true))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(vat):N2}", right: true))
+                .AddCell(NewSectionTh("Gebunden-Zuschlag:", borderLeft: true))
+                .AddCell(NewTd(minGeb != maxGeb ? $"{minGeb:N4}\u2013{maxGeb:N4} {CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {CurrencySymbol}/kg", colspan: 2, center: true))
+
+                .AddCell(NewSectionTh("Bruttosumme:", colspan: 2))
+                .AddCell(NewTd(borderTop: true))
+                .AddCell(NewTd(CurrencySymbol, borderTop: true))
+                .AddCell(NewTd($"{grossSum:N2}", right: true, borderTop: true))
+                .AddCell(NewSectionTh(borderLeft: true))
+                .AddCell(NewTd(colspan: 2))
+
+                .AddCell(NewSectionTh("Abzüge (Strafen/Pönalen, GA, \u2026):", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(totalMods)))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(totalMods):N2}", right: true))
+                .AddCell(NewSectionTh("Menge (ungebunden):", borderLeft: true, borderTop: true))
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight):N0} kg", colspan: 2, right: true, borderTop: true))
+
+                .AddCell(NewSectionTh("Bereits berücksichtigte Abzüge:", colspan: 2))
+                .AddCell(NewTd(Utils.GetSign(considered)))
+                .AddCell(NewTd(CurrencySymbol))
+                .AddCell(NewTd($"{Math.Abs(considered):N2}", right: true))
+                .AddCell(NewSectionTh("Menge (gebunden):", borderLeft: true))
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0} kg", colspan: 2, right: true))
+
+                .AddCell(NewSectionTh("Auszahlungsbetrag:", colspan: 2))
+                .AddCell(NewTd(borderTop: true))
+                .AddCell(NewTd(CurrencySymbol, borderTop: true))
+                .AddCell(NewTd($"{totalSum:N2}", right: true, borderTop: true))
+                .AddCell(NewSectionTh("Gesamtmenge:", borderLeft: true))
+                .AddCell(NewTd($"{Data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0} kg", colspan: 2, right: true, borderTop: true));
+
+            return tbl;
+        }
+
+        protected Table NewModifierStatTable() {
+            var tbl = new Table(ColsMM(35, 30, 25, 25, 25, 25))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorder(new SolidBorder(BorderThickness));
+
+            tbl.AddCell(NewSectionHdr("Statistik Zu-/Abschläge", colspan: 6))
+                .AddCell(NewTh("Name", rowspan: 2))
+                .AddCell(NewTh("Zu-/Abschlag", rowspan: 2))
+                .AddCell(NewTh("Lieferungen"))
+                .AddCell(NewTh("Minimum"))
+                .AddCell(NewTh("Maximum"))
+                .AddCell(NewTh("Betrag"))
+                .AddCell(NewTh("[#]"))
+                .AddCell(NewTh($"[{CurrencySymbol}]"))
+                .AddCell(NewTh($"[{CurrencySymbol}]"))
+                .AddCell(NewTh($"[{CurrencySymbol}]"));
+
+            foreach (var m in ModifierStat) {
+                var mod = Modifiers[m.ModId];
+                tbl.AddCell(NewTd(mod.Name, italic: true))
+                    .AddCell(NewTd(mod.ValueStr, right: true))
+                    .AddCell(NewTd($"{m.Count:N0}", right: true))
+                    .AddCell(NewTd($"{m.Min:N2}", right: true))
+                    .AddCell(NewTd($"{m.Max:N2}", right: true))
+                    .AddCell(NewTd($"{m.Sum:N2}", right: true));
+            }
+
+            return tbl;
+        }
+
+        protected Table NewPriceTable() {
+            var tbl = new Table(ColsMM(25, 19, 18, 15, 18, 15, 18, 15, 22))
+               .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+               .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE);
+
+            tbl.AddHeaderCell(NewTh("Sorte/Attr./Bewirt.\nQualitätsstufe", rowspan: 2, left: true))
+                .AddHeaderCell(NewTh("Gradation"))
+                .AddHeaderCell(NewTh("ungebunden", colspan: 2))
+                .AddHeaderCell(NewTh("attributlos gebunden", colspan: 2))
+                .AddHeaderCell(NewTh("gebunden", colspan: 2))
+                .AddHeaderCell(NewTh("Gesamt"))
+                .AddHeaderCell(NewTh(true ? "[°Oe]" : "[°KMW]"))
+                .AddHeaderCell(NewTh("[kg]"))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}/kg]"))
+                .AddHeaderCell(NewTh("[kg]"))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}/kg]"))
+                .AddHeaderCell(NewTh("[kg]"))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}/kg]"))
+                .AddHeaderCell(NewTh($"[{CurrencySymbol}]"));
+
+            string? lastHdr = null;
+            foreach (var row in Data.Rows) {
+                var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
+                if (lastHdr != hdr) {
+                    var rows = Data.Rows
+                        .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation)
+                        .ToList();
+                    var border = lastHdr != null;
+                    tbl.AddCell(NewTd(hdr, colspan: 2, bold: true, italic: true, borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.Ungeb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd(borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.LowGeb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd(borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.Geb.Weight):N0}", right: true, bold: true, borderTop: border))
+                        .AddCell(NewTd(borderTop: border))
+                        .AddCell(NewTd($"{rows.Sum(r => r.Amount):N2}", right: true, bold: true, borderTop: border));
+                }
+                tbl.AddCell(NewTd(row.QualityLevel))
+                    .AddCell(NewTd($"{row.Oe:N0}", center: true))
+                    .AddCell(NewTd(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-", right: true))
+                    .AddCell(NewTd(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-", right: true))
+                    .AddCell(NewTd($"{row.Amount:N2}", right: true));
+                lastHdr = hdr;
+            }
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/PaymentVariantSummary.cshtml

@@ -1,288 +0,0 @@
-@using RazorLight
-@using Elwig.Helpers
-@inherits TemplatePage<Elwig.Documents.PaymentVariantSummary>
-@model Elwig.Documents.PaymentVariantSummary
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\PaymentVariantSummary.css" />
-<main>
-    <h1>Auszahlungsvariante Lese @Model.Variant.Year</h1>
-    <h2>@Model.Variant.Name</h2>
-    <table class="payment-variant border">
-        <colgroup>
-            <col style="width: 20.0mm;"/>
-            <col style="width: 30.0mm;"/>
-            <col style="width:  4.5mm;"/>
-            <col style="width: 28.0mm;"/>
-            <col style="width: 47.5mm;"/>
-            <col style="width: 15.0mm;"/>
-            <col style="width: 20.0mm;"/>
-        </colgroup>
-        @{
-            //var sum1 = Model.Variant.DeliveryPartPayments.Sum(p => p.NetAmount);
-            //var sum2 = Model.Variant.Credits.Sum(p => p.);  //Model.Variant.MemberPayments.Sum(p => p.Amount);
-            var deliveryModifiers = Model.Variant.DeliveryPartPayments.Sum(p => p.Amount - p.NetAmount);
-            var memberModifiers = Model.Variant.Credits.Sum(c => c.Payment.Amount - c.Payment.NetAmount);
-            var sum2 = Model.Variant.Credits.Sum(p => p.NetAmount);
-            var sum1 = sum2 - deliveryModifiers - memberModifiers;
-            var payed = -Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var netSum = Model.Variant.Credits.Sum(p => p.NetAmount) - Model.Variant.Credits.Sum(p => p.PrevNetAmount ?? 0m);
-            var vat = Model.Variant.Credits.Sum(p => p.VatAmount);
-            var grossSum = Model.Variant.Credits.Sum(p => p.GrossAmount);
-            var totalMods = Model.Variant.Credits.Sum(p => p.Modifiers ?? 0m);
-            var considered = -Model.Variant.Credits.Sum(p => p.PrevModifiers ?? 0m);
-            var totalSum = Model.Variant.Credits.Sum(p => p.Amount);
-        }
-        <tbody>
-            <tr class="sectionheading">
-                <th colspan="4">Allgemein</th>
-                <th colspan="3" class="lborder">Berücksichtigt</th>
-            </tr>
-            <tr>
-                <th>Name:</th>
-                <td colspan="3">@Model.Variant.Name</td>
-                <th colspan="2" class="lborder">Zu-/Abschläge bei Lieferungen:</th>
-                <td class="center">@(Model.BillingData.ConsiderDelieryModifiers ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th>Beschr.:</th>
-                <td colspan="3">@Model.Variant.Comment</td>
-                <th colspan="2" class="lborder">Pönalen bei Unterlieferungen (FB):</th>
-                <td class="center">@(Model.BillingData.ConsiderContractPenalties ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th style="overflow: visible;">Rebel-Zuschl.:</th>
-                <td colspan="3" class="center">
-                    @($"{Utils.GetSign(Model.BillingData.NetWeightModifier)}{Math.Abs(Model.BillingData.NetWeightModifier) * 100:N2}") % /
-                    @($"{Utils.GetSign(Model.BillingData.GrossWeightModifier)}{Math.Abs(Model.BillingData.GrossWeightModifier) * 100:N2}") %
-                </td>
-                <th colspan="2" class="lborder">Strafen bei Unterlieferungen (GA):</th>
-                <td class="center">@(Model.BillingData.ConsiderTotalPenalty ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th style="overflow: visible;">Datum/Überw.:</th>
-                <td colspan="3" class="center">
-                    @($"{Model.Variant.Date:dd.MM.yyyy}") /
-                    @($"{Model.Variant.TransferDate:dd.MM.yyyy}")
-                </td>
-                <th colspan="2" class="lborder">Automatische Nachzeichnung der GA:</th>
-                <td class="center">@(Model.BillingData.ConsiderAutoBusinessShares ? "Ja" : "Nein")</td>
-            </tr>
-            <tr>
-                <th>Berechnung:</th>
-                <td colspan="3" class="center">@($"{Model.Variant.CalcTime:dd.MM.yyyy, HH:mm:ss}")</td>
-                <th colspan="2" class="lborder">Benutzerdef. Zu-/Abschläge pro Mitglied:</th>
-                <td class="center">@(Model.BillingData.ConsiderCustomModifiers ? "Ja" : "Nein")</td>
-            </tr>
-            <tr class="sectionheading">
-                <th colspan="4">Beträge</th>
-                <th colspan="3" class="lborder">Statistik</th>
-            </tr>
-            <tr>
-                <th colspan="2">Zwischensumme:</th>
-                <td></td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum1:N2}")</td>
-                <th class="lborder">Lieferanten:</th>
-                <td colspan="2" class="number">@($"{Model.MemberNum:N0}")</td>
-            </tr>
-            <tr>
-                <th colspan="2">Zu-/Abschläge (Mitglieder):</th>
-                <td class="number">@Utils.GetSign(memberModifiers)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(memberModifiers):N2}")</td>
-                <th class="lborder">Lieferungen:</th>
-                <td colspan="2" class="number">@($"{Model.DeliveryNum:N0}")</td>
-            </tr>
-            <tr>
-                <th colspan="2">Zu-/Abschläge (Lieferungen):</th>
-                <td class="number">@Utils.GetSign(deliveryModifiers)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(deliveryModifiers):N2}")</td>
-                <th class="lborder">Teillieferungen:</th>
-                <td colspan="2" class="number">@($"{Model.DeliveryPartNum:N0}")</td>
-            </tr>
-            <tr>
-                <th colspan="2">Gesamtsumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{sum2:N2}")</td>
-                <th class="lborder"></th>
-                <td colspan="2"></td>
-            </tr>
-            <tr>
-                <th colspan="2">Bisher ausgezahlt:</th>
-                <td class="number">@Utils.GetSign(payed)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(payed):N2}")</td>
-                @{
-                    var weiRows = Model.Data.Rows.Where(r => r.QualityLevel == "Wein");
-                    var minWei = weiRows.Min(r => r.Ungeb.MinPrice);
-                    var maxWei = weiRows.Max(r => r.Ungeb.MaxPrice);
-                }
-                <th class="lborder tborder">Preis (abgewertet):</th>
-                <td colspan="2" class="center tborder">@(minWei != maxWei ? $"{minWei:N4}–{maxWei:N4}" : $"{minWei:N4}") @Model.CurrencySymbol/kg</td>
-            </tr>
-            <tr>
-                <th colspan="2">Nettosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{netSum:N2}")</td>
-                @{
-                    var quwRows = Model.Data.Rows.Where(r => r.QualityLevel != "Wein");
-                    var minPrice = quwRows.Min(r => r.Ungeb.MinPrice);
-                    var maxPrice = quwRows.Max(r => r.Ungeb.MaxPrice);
-                }
-                <th class="lborder">Preis (ungeb., nicht abgew.):</th>
-                <td colspan="2" class="center">@(minPrice != maxPrice ? $"{minPrice:N4}–{maxPrice:N4}" : $"{minPrice:N4}") @Model.CurrencySymbol/kg</td>
-            </tr>
-            <tr>
-                <th colspan="2">Mehrwertsteuer:</th>
-                <td class="number">@Utils.GetSign(vat)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(vat):N2}")</td>
-                @{
-                    var gebRows = Model.Data.Rows
-                        .Where(r => r.Geb.MaxPrice != null && r.Ungeb.MinPrice != null)
-                        .Select(r => r.Geb.MaxPrice - r.Ungeb.MinPrice);
-                    var minGeb = gebRows.Min();
-                    var maxGeb = gebRows.Max();
-                }
-                <th class="lborder">Gebunden-Zuschlag:</th>
-                <td colspan="2" class="center">
-                    @(minGeb != maxGeb ? $"{minGeb:N4}–{maxGeb:N4} {Model.CurrencySymbol}/kg" : minGeb == 0 ? "-" : $"{minGeb:N4} {Model.CurrencySymbol}/kg")
-                </td>
-            </tr>
-            <tr>
-                <th colspan="2">Bruttosumme:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{grossSum:N2}")</td>
-                <th class="lborder"></th>
-                <td colspan="2"></td>
-            </tr>
-            <tr>
-                <th colspan="2">Abzüge (Strafen/Pönalen, GA, ...):</th>
-                <td class="number">@Utils.GetSign(totalMods)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(totalMods):N2}")</td>
-                <th class="lborder tborder">Menge (ungebunden):</th>
-                <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight):N0}") kg</td>
-            </tr>
-            <tr>
-                <th colspan="2">Bereits berücksichtigte Abzüge:</th>
-                <td class="number">@Utils.GetSign(considered)</td>
-                <td class="number"><span class="fleft">@Model.CurrencySymbol</span>@($"{Math.Abs(considered):N2}")</td>
-                <th class="lborder">Menge (gebunden):</th>
-                <td colspan="2" class="number">@($"{Model.Data.Rows.Sum(r => r.Geb.Weight + r.LowGeb.Weight):N0}") kg</td>
-            </tr>
-            <tr>
-                <th colspan="2">Auszahlungsbetrag:</th>
-                <td class="number tborder"></td>
-                <td class="number tborder"><span class="fleft">@Model.CurrencySymbol</span>@($"{totalSum:N2}")</td>
-                <th class="lborder">Gesamtmenge:</th>
-                <td colspan="2" class="number tborder">@($"{Model.Data.Rows.Sum(r => r.Ungeb.Weight + r.LowGeb.Weight + r.Geb.Weight):N0}") kg</td>
-            </tr>
-        </tbody>
-    </table>
-    <table class="payment-variant border">
-        <colgroup>
-            <col style="width: 35mm;"/>
-            <col style="width: 30mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 25mm;"/>
-            <col style="width: 25mm;"/>
-        </colgroup>
-        <thead>
-            <tr class="sectionheading">
-                <th colspan="6">Statistik Zu-/Abschläge</th>
-            </tr>
-            <tr>
-                <th rowspan="2">Name</th>
-                <th rowspan="2">Zu-/Abschlag</th>
-                <th>Lieferungen</th>
-                <th>Minimum</th>
-                <th>Maximum</th>
-                <th>Betrag</th>
-            </tr>
-            <tr>
-                <th>[#]</th>
-                <th>[@Model.CurrencySymbol]</th>
-                <th>[@Model.CurrencySymbol]</th>
-                <th>[@Model.CurrencySymbol]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var m in Model.ModifierStat) {
-                var mod = Model.Modifiers[m.ModId];
-                <tr>
-                    <th>@mod.Name</th>
-                    <td class="number">@mod.ValueStr</td>
-                    <td class="number">@($"{m.Count:N0}")</td>
-                    <td class="number">@($"{m.Min:N2}")</td>
-                    <td class="number">@($"{m.Max:N2}")</td>
-                    <td class="number">@($"{m.Sum:N2}")</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-    <table class="payment-variant-data">
-        <colgroup>
-            <col style="width: 25mm;"/>
-            <col style="width: 19mm;"/>
-            <col style="width: 18mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 18mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 18mm;"/>
-            <col style="width: 15mm;"/>
-            <col style="width: 22mm;"/>
-        </colgroup>
-        <thead>
-            <tr>
-                <th rowspan="2" style="text-align: left;">Qualitätsstufe</th>
-                <th>Gradation</th>
-                <th colspan="2">ungebunden</th>
-                <th colspan="2">attributlos gebunden</th>
-                <th colspan="2">gebunden</th>
-                <th>Gesamt</th>
-            </tr>
-            <tr>
-                <th>[@(true ? "°Oe" : "°KMW")]</th>
-                <th>[kg]</th>
-                <th>[@(Model.CurrencySymbol)/kg]</th>
-                <th>[kg]</th>
-                <th>[@(Model.CurrencySymbol)/kg]</th>
-                <th>[kg]</th>
-                <th>[@(Model.CurrencySymbol)/kg]</th>
-                <th>[@(Model.CurrencySymbol)]</th>
-            </tr>
-        </thead>
-        <tbody>
-            @{
-                string? lastHdr = null;
-            }
-            @foreach (var row in Model.Data.Rows) {
-                var hdr = $"{row.Variety}{(row.Attribute != null ? " / " : "")}{row.Attribute}{(row.Cultivation != null ? " / " : "")}{row.Cultivation}";
-                if (lastHdr != hdr) {
-                    var rows = Model.Data.Rows
-                        .Where(r => r.Variety == row.Variety && r.Attribute == row.Attribute && r.Cultivation == row.Cultivation)
-                        .ToList();
-                    <tr class="subheading @(lastHdr != null ? "new" : "")">
-                        <th colspan="2">@hdr</th>
-                        <td class="number">@($"{rows.Sum(r => r.Ungeb.Weight):N0}")</td>
-                        <td></td>
-                        <td class="number">@($"{rows.Sum(r => r.LowGeb.Weight):N0}")</td>
-                        <td></td>
-                        <td class="number">@($"{rows.Sum(r => r.Geb.Weight):N0}")</td>
-                        <td></td>
-                        <td class="number">@($"{rows.Sum(r => r.Amount):N2}")</td>
-                    </tr>
-                }
-                <tr>
-                    <td>@(row.QualityLevel)</td>
-                    <td class="center">@($"{row.Oe:N0}")</td>
-                    <td class="number">@(row.Ungeb.Weight != 0 ? $"{row.Ungeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Ungeb.MaxPrice != null ? $"{row.Ungeb.MaxPrice:N4}" : "-")</td>
-                    <td class="number">@(row.LowGeb.Weight != 0 ? $"{row.LowGeb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.LowGeb.MaxPrice != null ? $"{row.LowGeb.MaxPrice:N4}" : "-")</td>
-                    <td class="number">@(row.Geb.Weight != 0 ? $"{row.Geb.Weight:N0}" : "-")</td>
-                    <td class="number">@(row.Geb.MaxPrice != null ? $"{row.Geb.MaxPrice:N4}" : "-")</td>
-                    <td class="number">@($"{row.Amount:N2}")</td>
-                </tr>
-                lastHdr = hdr;
-            }
-        </tbody>
-    </table>
-</main>

Elwig/Documents/PaymentVariantSummary.css

@@ -1,21 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}
-
-table.payment-variant {
-    margin-top: 10mm;
-}
-
-table.payment-variant-data {
-    break-before: page;
-}

Elwig/Documents/WineQualityStatistics.cs

@@ -1,5 +1,13 @@
+using Elwig.Helpers;
 using Elwig.Models.Dtos;
+using iText.Kernel.Colors;
+using iText.Kernel.Pdf;
+using iText.Layout.Borders;
+using iText.Layout.Element;
+using iText.Layout.Properties;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Elwig.Documents {
     public class WineQualityStatistics : Document {
@@ -19,9 +27,99 @@ namespace Elwig.Documents {
         public WineQualityStatisticsData Data;
         public bool UseOe => Data.UseOe;
 
-        public WineQualityStatistics(string filter, WineQualityStatisticsData data) : base($"{Name} {filter}") {
+        public WineQualityStatistics(string filter, WineQualityStatisticsData data) :
+            base($"{Name} {filter}") {
             Filter = filter;
             Data = data;
         }
+
+        protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {
+            base.RenderBody(doc, pdf);
+            doc.Add(new KernedParagraph(Name, 24)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginBottomMM(2));
+            doc.Add(new KernedParagraph(Filter, 14)
+                .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)
+                .SetMarginBottomMM(10));
+            foreach (var sec in Data.Sections) {
+                doc.Add(NewQualitySectionTable(sec).SetMarginBottomMM(5));
+            }
+        }
+
+        protected Table NewQualityColumnTable(string[] qualIds, WineQualityStatisticsData.QualitySection sec) {
+            var tbl = new Table(ColsMM(9.5, 10, 19.5))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetMarginsMM(1, 0, 1, 0)
+                .AddCell(NewCell(new KernedParagraph(UseOe ? "[°Oe]" : "[°KMW]", 8)
+                    .SetTextAlignment(TextAlignment.CENTER).SetFont(IF)).SetPaddingsMM(1, 1, 1, 2))
+                .AddCell(NewCell(new KernedParagraph("[#]", 8)
+                    .SetTextAlignment(TextAlignment.CENTER).SetFont(IF)).SetPaddingsMM(1, 1, 1, 1))
+                .AddCell(NewCell(new KernedParagraph("[kg]", 8)
+                    .SetTextAlignment(TextAlignment.CENTER).SetFont(IF)).SetPaddingsMM(1, 2, 1, 1));
+
+            foreach (var qualId in qualIds) {
+                tbl.AddCell(NewCell(new KernedParagraph(QualityLevels.GetValueOrDefault(qualId, qualId), 10)
+                    .SetFont(BI).SetTextAlignment(TextAlignment.CENTER), colspan: 3)
+                    .SetPaddingsMM(2, 0, 2, 0));
+                foreach (var (grad, avgKmw, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(double, double, int, int)>())) {
+                    tbl.AddCell(NewCell(new KernedParagraph(UseOe ? $"{grad:N0}" : $"{grad:N1}", 10)
+                            .SetTextAlignment(TextAlignment.CENTER)).SetPaddingsMM(0, 0, 0, 2))
+                        .AddCell(NewCell(new KernedParagraph($"{num:N0}", 10)
+                            .SetTextAlignment(TextAlignment.RIGHT)).SetPaddingsMM(0, 0, 0, 0))
+                        .AddCell(NewCell(new KernedParagraph($"{weight:N0}", 10)
+                            .SetTextAlignment(TextAlignment.RIGHT)).SetPaddingsMM(0, 2, 0, 0));
+                }
+            }
+            return tbl;
+        }
+
+        protected Table NewQualitySumTable(double kmw, int num, int weight) {
+            return new Table(ColsMM(9.5, 10, 19.5))
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetMarginsMM(1, 0, 1, 0)
+                .AddCell(NewCell(new KernedParagraph(weight == 0 ? "-" : UseOe ? $"{Utils.KmwToOe(kmw):N0}" : $"{kmw:N1}", 10)
+                    .SetTextAlignment(TextAlignment.CENTER).SetFont(BF)).SetPaddingsMM(0, 0, 0, 2))
+                .AddCell(NewCell(new KernedParagraph($"{num:N0}", 10)
+                    .SetTextAlignment(TextAlignment.RIGHT).SetFont(BF)).SetPaddingsMM(0, 0, 0, 0))
+                .AddCell(NewCell(new KernedParagraph($"{weight:N0}", 10)
+                    .SetTextAlignment(TextAlignment.RIGHT).SetFont(BF)).SetPaddingsMM(0, 2, 0, 0));
+        }
+
+        protected Table NewQualitySectionTable(WineQualityStatisticsData.QualitySection sec) {
+            var tbl = new Table(4)
+                .SetWidth(UnitValue.CreatePercentValue(100)).SetFixedLayout()
+                .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE)
+                .SetBorder(new SolidBorder(BorderThickness))
+                .SetKeepTogether(true);
+
+            var bgColor = sec.Type == "R" ? new DeviceRgb(0xff, 0xc0, 0xc0) : sec.Type == "W" ? new DeviceRgb(0xc0, 0xff, 0xc0) : new DeviceRgb(0xe0, 0xe0, 0xe0);
+            tbl.AddCell(NewCell(new KernedParagraph(sec.Name, 14).SetFont(BF), colspan: 4)
+                .SetBackgroundColor(bgColor).SetPaddingsMM(1, 2, 1, 2));
+
+            foreach (var qualIds in QualIds) {
+                tbl.AddCell(NewCell().SetPadding(0).Add(NewQualityColumnTable(qualIds, sec))
+                    .SetBorder(new SolidBorder(BorderThickness)));
+            }
+
+            foreach (var qualIds in QualIds) {
+                var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(double Grad, double AvgKmw, int Num, int Weight)>()));
+                var weight = quals.Sum(q => q.Sum(kv => kv.Weight));
+                var num = quals.Sum(q => q.Sum(kv => kv.Num));
+                var kmw = quals.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / weight;
+                tbl.AddCell(NewCell().SetPaddingsMM(0.5f, 0, 0.5f, 0).Add(NewQualitySumTable(kmw, num, weight))
+                    .SetBorder(new SolidBorder(BorderThickness)));
+            }
+
+            var totalWeight = sec.Data.Values.Sum(q => q.Sum(kv => kv.Weight));
+            var totalNum = sec.Data.Values.Sum(q => q.Sum(kv => kv.Num));
+            var totalKmw = sec.Data.Values.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / totalWeight;
+            tbl.AddCell(NewCell(colspan: 3).SetBackgroundColor(bgColor))
+                .AddCell(NewCell().SetPadding(0).Add(NewQualitySumTable(totalKmw, totalNum, totalWeight))
+                    .SetBackgroundColor(bgColor));
+
+            return tbl;
+        }
     }
 }

Elwig/Documents/WineQualityStatistics.cshtml

@@ -1,81 +0,0 @@
-@using RazorLight
-@using Elwig.Helpers
-@inherits TemplatePage<Elwig.Documents.WineQualityStatistics>
-@model Elwig.Documents.WineQualityStatistics
-@{ Layout = "Document"; }
-<link rel="stylesheet" href="file:///@Raw(Model.DocumentsPath)\WineQualityStatistics.css" />
-<main>
-    <h1>Qualitätsstatistik</h1>
-    <h2>@Model.Filter</h2>
-    @foreach (var sec in Model.Data.Sections) {
-        <table>
-            <colgroup>
-                <col style="width: 25%;"/>
-                <col style="width: 25%;"/>
-                <col style="width: 25%;"/>
-                <col style="width: 25%;"/>
-            </colgroup>
-            <thead>
-                <tr>
-                    <th colspan="4" class="header @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")">
-                        <h3>@sec.Name</h3>
-                    </th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr>
-                    @foreach (var qualIds in Model.QualIds) {
-                        <td class="container">
-                            <div class="row">
-                                <span class="units">[@(Model.UseOe ? "°Oe" : "°KMW")]</span>
-                                <span class="units">[#]</span>
-                                <span class="units">[kg]</span>
-                            </div>
-                            @foreach (var qualId in qualIds) {
-                                <h4>@(Model.QualityLevels.GetValueOrDefault(qualId, qualId))</h4>
-                                @foreach (var (grad, avgKmw, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(double, double, int, int)>())) {
-                                    <div class="row">
-                                        <span class="gradation">@(Model.UseOe ? $"{grad:N0}" : $"{grad:N1}")</span>
-                                        <span class="number">@($"{num:N0}")</span>
-                                        <span class="number">@($"{weight:N0}")</span>
-                                    </div>
-                                }
-                            }
-                        </td>
-                    }
-                </tr>
-                <tr>
-                    @foreach (var qualIds in Model.QualIds) {
-                        var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(double Grad, double AvgKmw, int Num, int Weight)>()));
-                        var weight = quals.Sum(q => q.Sum(kv => kv.Weight));
-                        var num = quals.Sum(q => q.Sum(kv => kv.Num));
-                        var kmw = quals.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / weight;
-                        <td class="container bold">
-                            <div class="row">
-                                <span class="gradation">@(weight == 0 ? "-" : Model.UseOe ? $"{Utils.KmwToOe(kmw):N0}" : $"{kmw:N1}")</span>
-                                <span class="number">@($"{num:N0}")</span>
-                                <span class="number">@($"{weight:N0}")</span>
-                            </div>
-                        </td>
-                    }
-                </tr>
-            </tbody>
-            <tfoot>
-                <tr>
-                    @{
-                        var totalWeight = sec.Data.Values.Sum(q => q.Sum(kv => kv.Weight));
-                        var totalNum = sec.Data.Values.Sum(q => q.Sum(kv => kv.Num));
-                        var totalKmw = sec.Data.Values.Sum(q => q.Sum(kv => kv.AvgKmw * kv.Weight)) / totalWeight;
-                    }
-                    <td colspan="4" class="container bold footer @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")">
-                        <div class="row" style="width: 24%; margin-left: 76%;">
-                            <span class="gradation">@(totalWeight == 0 ? "-" : Model.UseOe ? $"{Utils.KmwToOe(totalKmw):N0}" : $"{totalKmw:N1}")</span>
-                            <span class="number">@($"{totalNum:N0}")</span>
-                            <span class="number">@($"{totalWeight:N0}")</span>
-                        </div>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
-    }
-</main>

Elwig/Documents/WineQualityStatistics.css

@@ -1,97 +0,0 @@
-
-h1 {
-    text-align: center;
-    font-size: 24pt;
-    margin-top: 0;
-    margin-bottom: 2mm;
-}
-
-h2 {
-    text-align: center;
-    font-size: 14pt;
-    margin-top: 2mm;
-}
-
-h3 {
-    font-weight: bold;
-    font-style: normal;
-    font-size: 14pt;
-    margin: 0;
-    text-align: left;
-}
-
-h4 {
-    font-weight: bold;
-    font-style: italic;
-    font-size: 10pt;
-    margin: 0;
-    text-align: center;
-    margin: 2mm 0 2mm 0;
-}
-
-.row:first-child { margin-top: 0.5mm; }
-.row:last-child { margin-bottom: 0.5mm; }
-
-.bold {
-    font-weight: bold;
-}
-
-table {
-    margin-top: 10mm;
-    break-inside: avoid;
-}
-
-table th,
-table td {
-    border: var(--border-thickness) solid black;
-    vertical-align: top !important;
-}
-
-table .header {
-    padding: 1mm 2mm;
-}
-
-table .header,
-table .footer {
-    background-color: #E0E0E0;
-}
-
-table .header.red,
-table .footer.red {
-    background-color: #FFC0C0;
-}
-
-table .header.green,
-table .footer.green {
-    background-color: #C0FFC0;
-}
-
-.row {
-    display: flex;
-    width: 100%;
-    font-size: 10pt;
-}
-
-.row span {
-    flex: 10mm 1 1;
-    display: block;
-    padding: 0 1mm;
-}
-
-.row .units {
-    text-align: center;
-    font-size: 8pt;
-    font-style: italic;
-    padding: 1mm;
-}
-
-.gradation {
-    text-align: center;
-}
-
-.number {
-    text-align: right;
-}
-
-.row span:first-child { flex-basis: 7.5mm; }
-.row span:last-child { flex-basis: 17.5mm; }

Elwig/Elwig.csproj

@@ -3,11 +3,13 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net10.0-windows</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>1.0.3.0</Version>
+    <Version>1.0.4.0</Version>
     <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -21,24 +23,22 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="bblanchon.PDFium.Win32" Version="148.0.7734" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-    <PackageReference Include="LinqKit" Version="1.3.9" />
-    <PackageReference Include="MailKit" Version="4.14.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.2" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3650.58" />
+    <PackageReference Include="itext" Version="9.5.0" />
+    <PackageReference Include="itext.bouncy-castle-adapter" Version="9.5.0" />
+    <PackageReference Include="LinqKit" Version="1.3.11" />
+    <PackageReference Include="MailKit" Version="4.15.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="10.0.5" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3856.49" />
     <PackageReference Include="NJsonSchema" Version="11.5.2" />
-    <PackageReference Include="PdfiumViewer" Version="2.13.0" />
-    <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
-    <PackageReference Include="RazorLight" Version="2.3.1" />
     <PackageReference Include="ScottPlot.WPF" Version="5.1.57" />
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
-    <PackageReference Include="System.IO.Hashing" Version="10.0.2" />
-    <PackageReference Include="System.IO.Ports" Version="10.0.2" />
-    <PackageReference Include="System.Management" Version="10.0.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.2" />
+    <PackageReference Include="System.IO.Hashing" Version="10.0.5" />
+    <PackageReference Include="System.IO.Ports" Version="10.0.5" />
+    <PackageReference Include="System.Management" Version="10.0.5" />
   </ItemGroup>
 
 </Project>

Elwig/Helpers/AppDbUpdater.cs

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

Elwig/Helpers/Billing/BillingVariant.cs

@@ -80,7 +80,7 @@ namespace Elwig.Helpers.Billing {
                         LEFT JOIN v_penalty_area_commitments u ON (u.year, u.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN v_auto_business_shares a ON (a.year, a.mgnr) = (s.year, m.mgnr)
                         LEFT JOIN payment_custom x ON (x.year, x.mgnr) = (s.year, m.mgnr)
-                    WHERE s.year = {Year} AND v.avnr = {AvNr};
+                    WHERE s.year = {Year} AND v.avnr = {AvNr} AND p.amount > COALESCE(lp.amount, 0);
                     """);
             await cnx.ExecuteBatch($"""
                 UPDATE payment_variant SET test_variant = FALSE WHERE (year, avnr) = ({Year}, {AvNr});

Elwig/Helpers/Export/ElwigData.cs

@@ -783,15 +783,15 @@ namespace Elwig.Helpers.Export {
                 Comment = json["comment"]?.AsValue().GetValue<string>(),
                 ImportedAt = DateTime.Now,
             }, json["parts"]!.AsArray().Select(p => p!.AsObject()).Select(p => {
-                var kgnr = p["kgnr"]!.AsValue().GetValue<int>();
+                var kgnr = p["kgnr"]?.AsValue().GetValue<int>();
                 var ried = p["ried"]?.AsValue().GetValue<string>();
                 WbRd? rd = null;
-                if (ried != null) {
-                    var rde = riede.GetValueOrDefault(kgnr, []);
+                if (ried != null && kgnr != null) {
+                    var rde = riede.GetValueOrDefault(kgnr.Value, []);
                     rd = rde.FirstOrDefault(r => r.Name == ried);
                     if (rd == null) {
                         rd = new WbRd {
-                            KgNr = kgnr,
+                            KgNr = kgnr.Value,
                             RdNr = (rde.Count == 0 ? 1 : rde.Max(r => r.RdNr)) + 1,
                             Name = ried,
                         };

Elwig/Helpers/Printing/Html.cs

@@ -1,35 +0,0 @@
-using RazorLight;
-using System;
-using System.Threading.Tasks;
-
-namespace Elwig.Helpers.Printing {
-    public static class Html {
-
-        private static RazorLightEngine? Engine = null;
-        public static bool IsReady => Engine != null;
-
-        public static async Task Init(Action? evtHandler = null) {
-            var e = new RazorLightEngineBuilder()
-                .UseFileSystemProject(App.DocumentsPath)
-                .UseMemoryCachingProvider()
-                .Build();
-
-            await e.CompileTemplateAsync("Document");
-            await e.CompileTemplateAsync("BusinessDocument");
-            await e.CompileTemplateAsync("BusinessLetter");
-            await e.CompileTemplateAsync("DeliveryNote");
-            await e.CompileTemplateAsync("CreditNote");
-            await e.CompileTemplateAsync("DeliveryJournal");
-            await e.CompileTemplateAsync("Letterhead");
-            await e.CompileTemplateAsync("DeliveryConfirmation");
-
-            Engine = e;
-            evtHandler?.Invoke();
-        }
-
-        public static async Task<string> CompileRenderAsync(string key, object model) {
-            if (Engine == null) throw new InvalidOperationException("The razor engine has not been initialized yet");
-            return await Engine.CompileRenderAsync(key, model);
-        }
-    }
-}

Elwig/Helpers/Printing/Pdf.cs

@@ -1,102 +1,21 @@
 using Elwig.Windows;
-using PdfiumViewer;
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing.Printing;
-using System.IO;
-using System.Linq;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 
 namespace Elwig.Helpers.Printing {
     public static class Pdf {
 
-        private static readonly string WinziPrint = (Assembly.GetEntryAssembly()?.Location.Contains(@"\bin\") ?? false) ?
-            Path.Combine(Assembly.GetEntryAssembly()!.Location.Split(@"\bin\")[0], "../Installer/Files/WinziPrint.exe") :
-            new string[] { App.InstallPath }
-                .Union(Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [])
-                .Select(x => Path.Combine(x, "WinziPrint.exe"))
-                .Where(File.Exists)
-                .FirstOrDefault() ?? throw new FileNotFoundException("WiniPrint executable not found");
-        private static Process? WinziPrintProc;
-        public static bool IsReady => WinziPrintProc != null;
-
-        public static async Task Init(Action? evtHandler = null) {
-            // NOTE: If the WinziPrint daemon is already running this will succeed, but the process will fail.
-            //       Should be no problem, as long as the daemon is not closed
-            var p = new Process() { StartInfo = new() {
-                FileName = WinziPrint,
-                CreateNoWindow = true,
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-            } };
-            p.StartInfo.ArgumentList.Add("-D");
-            p.StartInfo.ArgumentList.Add("-d");
-            p.StartInfo.ArgumentList.Add(App.TempPath);
-            p.Start();
-            await p.StandardOutput.ReadLineAsync();
-            WinziPrintProc = p;
+        public static Task Init(Action? evtHandler = null) {
+            PdfiumNative.FPDF_InitLibrary();
             evtHandler?.Invoke();
-        }
-
-        public static Task Cleanup() {
-            WinziPrintProc?.Kill(true);
-            WinziPrintProc?.Close();
             return Task.CompletedTask;
         }
 
-        public static async Task<(int Pages, IEnumerable<int> PerDoc)> Convert(string htmlPath, string pdfPath, bool doublePaged = false, CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
-            return await Convert([htmlPath], pdfPath, doublePaged, cancelToken, progress);
-        }
-
-        public static async Task<(int Pages, IEnumerable<int> PerDoc)> Convert(IEnumerable<string> htmlPath, string pdfPath, bool doublePaged = false, CancellationToken? cancelToken = null, IProgress<double>? progress = null) {
-            if (WinziPrintProc == null) throw new InvalidOperationException("The WinziPrint process has not been initialized yet");
-            progress?.Report(0.0);
-            using var client = new TcpClient("127.0.0.1", 30983);
-            using var stream = client.GetStream();
-            string cnxId;
-            using var reader = new StreamReader(stream);
-            var first = await reader.ReadLineAsync() ?? throw new IOException("Invalid response from WinziPrint");
-            if (first.StartsWith("id:")) {
-                cnxId = first[3..].Trim();
-            } else {
-                throw new IOException("Invalid response from WinziPrint");
-            }
-            await stream.WriteAsync(Utils.UTF8.GetBytes(
-                "-e utf-8;-p;" + (doublePaged ? "-2;" : "") +
-                $"{string.Join(';', htmlPath)};{pdfPath}" +
-                "\r\n"));
-            bool cancelled = false;
-            while (true) {
-                if (!cancelled && (cancelToken?.IsCancellationRequested ?? false)) {
-                    try {
-                        using var cancelClient = new TcpClient("127.0.0.1", 30983);
-                        using var cancelStream = cancelClient.GetStream();
-                        using var cancelReader = new StreamReader(cancelStream);
-                        await cancelReader.ReadLineAsync();
-                        await cancelStream.WriteAsync(Utils.UTF8.GetBytes($"cancel;{cnxId}\r\n"));
-                    } catch { }
-                    cancelled = true;
-                }
-                var line = await reader.ReadLineAsync() ?? throw new IOException("Invalid response from WinziPrint");
-                if (line.StartsWith("error:")) {
-                    var msg = line[6..].Trim();
-                    if (msg == "aborted")
-                        throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
-                    throw new IOException($"WinziPrint: {msg}");
-                } 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]+) pages \(([0-9, ]+)\)");
-                    return (int.Parse(m.Groups[1].Value), m.Groups[2].Value.Split(", ").Select(int.Parse).ToList());
-                }
-            }
+        public static Task Cleanup() {
+            PdfiumNative.FPDF_DestroyLibrary();
+            return Task.CompletedTask;
         }
 
         public static void Show(TempFile file, string title) {
@@ -123,9 +42,9 @@ namespace Elwig.Helpers.Printing {
 
         public static Task Print(string path, PrinterSettings settings) {
             try {
-                using var doc = PdfDocument.Load(path);
-                using var printDoc = doc.CreatePrintDocument(PdfPrintMode.CutMargin);
-                printDoc.PrinterSettings = settings;
+                using var printDoc = new PdfPrintDocument(path) {
+                    PrinterSettings = settings,
+                };
                 printDoc.Print();
             } catch (Exception e) {
                 MessageBox.Show("Beim Drucken ist ein Fehler aufgetreten:\n\n" + e.Message, "Fehler beim Drucken", MessageBoxButton.OK, MessageBoxImage.Error);

Elwig/Helpers/Printing/PdfPrintDocument.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Drawing.Printing;
+using System.Runtime.InteropServices;
+
+namespace Elwig.Helpers.Printing {
+    public class PdfPrintDocument : PrintDocument {
+
+        private readonly IntPtr _handle;
+        private readonly int _pageCount;
+        private readonly double _dpi;
+
+        private int _currentPage;
+
+        public PdfPrintDocument(string path, string? password = null, double dpi = 300.0) :
+            base() {
+            _handle = PdfiumNative.FPDF_LoadDocument(path, password);
+            _pageCount = PdfiumNative.FPDF_GetPageCount(_handle);
+            _dpi = dpi;
+        }
+
+        protected override void Dispose(bool disposing) {
+            PdfiumNative.FPDF_CloseDocument(_handle);
+            base.Dispose(disposing);
+        }
+
+        protected override void OnBeginPrint(PrintEventArgs evt) {
+            _currentPage = (PrinterSettings.FromPage != 0) ? (PrinterSettings.FromPage - 1) : 0;
+            base.OnBeginPrint(evt);
+        }
+
+        protected override void OnPrintPage(PrintPageEventArgs evt) {
+            if (_currentPage < _pageCount) {
+                IntPtr page = PdfiumNative.FPDF_LoadPage(_handle, _currentPage);
+                double width = PdfiumNative.FPDF_GetPageWidth(page);
+                double height = PdfiumNative.FPDF_GetPageHeight(page);
+                int pixelWidth = (int)(width / 72.0 * _dpi);
+                int pixelHeight = (int)(height / 72.0 * _dpi);
+
+                IntPtr bitmap = PdfiumNative.FPDFBitmap_Create(pixelWidth, pixelHeight, 1);
+                PdfiumNative.FPDF_RenderPageBitmap(bitmap, page, 0, 0, pixelWidth, pixelHeight, 0, 0);
+
+                IntPtr buffer = PdfiumNative.FPDFBitmap_GetBuffer(bitmap);
+                int stride = PdfiumNative.FPDFBitmap_GetStride(bitmap);
+                using (var bmp = new Bitmap(pixelWidth, pixelHeight, stride, PixelFormat.Format32bppArgb, buffer)) {
+                    evt.Graphics?.DrawImage(bmp, evt.PageBounds);
+                }
+                _currentPage++;
+
+                PdfiumNative.FPDFBitmap_Destroy(bitmap);
+                PdfiumNative.FPDF_ClosePage(page);
+            }
+            evt.HasMorePages = _currentPage < ((PrinterSettings.ToPage == 0) ? _pageCount : Math.Min(PrinterSettings.ToPage, _pageCount));
+            base.OnPrintPage(evt);
+        }
+    }
+
+    internal partial class PdfiumNative {
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_InitLibrary();
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_DestroyLibrary();
+
+        [LibraryImport("pdfium.dll", StringMarshalling = StringMarshalling.Utf8)]
+        public static partial IntPtr FPDF_LoadDocument(string filePath, string? password);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_CloseDocument(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDF_GetPageCount(IntPtr document);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDF_LoadPage(IntPtr document, int pageIndex);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_ClosePage(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageWidth(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial double FPDF_GetPageHeight(IntPtr page);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_Create(int width, int height, int alpha);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDFBitmap_Destroy(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial IntPtr FPDFBitmap_GetBuffer(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial int FPDFBitmap_GetStride(IntPtr bitmap);
+
+        [LibraryImport("pdfium.dll")]
+        public static partial void FPDF_RenderPageBitmap(IntPtr bitmap, IntPtr page, int start_x, int start_y, int size_x, int size_y, int rotate, int flags);
+    }
+}

Elwig/Helpers/Utils.cs

@@ -3,6 +3,7 @@ using Elwig.Documents;
 using Elwig.Helpers.Billing;
 using Elwig.Models;
 using Elwig.Models.Entities;
+using iText.Layout.Element;
 using LinqKit;
 using MailKit.Net.Smtp;
 using MailKit.Security;
@@ -299,28 +300,23 @@ namespace Elwig.Helpers {
             return d.ShowDialog() == true ? d.Price : null;
         }
 
-        public static Footer GenerateFooter(string lineBreak, string seperator) {
-            return new Footer(lineBreak, seperator);
+        public static Footer GenerateFooter(string lineBreak, string separator) {
+            return new Footer(lineBreak, separator);
         }
 
         public class Footer {
-            private string Text = "";
+            private readonly List<List<object>> Items = [[]];
             private readonly string LineBreak;
-            private readonly string Seperator;
-            private bool FirstLine = true;
-            private bool FirstItemInLine = true;
+            private readonly string Separator;
 
-            public Footer(string lineBreak, string seperator) {
+            public Footer(string lineBreak, string separator) {
                 LineBreak = lineBreak;
-                Seperator = seperator;
+                Separator = separator;
             }
 
-            public Footer Item(string? text) {
+            public Footer Item(object? text) {
                 if (text == null) return this;
-                Text += FirstItemInLine ? (FirstLine ? "" : LineBreak) : Seperator;
-                Text += text;
-                FirstLine = false;
-                FirstItemInLine = false;
+                Items[^1].Add(text);
                 return this;
             }
 
@@ -329,12 +325,28 @@ namespace Elwig.Helpers {
             }
 
             public Footer NextLine() {
-                FirstItemInLine = true;
+                Items.Add([]);
                 return this;
             }
 
             public override string ToString() {
-                return Text;
+                return string.Join(LineBreak, Items.Select(l => string.Join(Separator, l.ToString())));
+            }
+
+            public IList<ILeafElement> ToLeafElements() {
+                var l = new List<ILeafElement>();
+                var first1 = true;
+                foreach (var line in Items) {
+                    if (!first1) l.Add(new Text(LineBreak));
+                    var first2 = true;
+                    foreach (var item in line) {
+                        if (!first2) l.Add(new Text(Separator));
+                        l.Add(item as ILeafElement ?? new Text(item.ToString() ?? ""));
+                        first2 = false;
+                    }
+                    first1 = false;
+                }
+                return l;
             }
         }
 

Elwig/Helpers/Weighing/GassnerScale.cs

@@ -53,9 +53,16 @@ namespace Elwig.Helpers.Weighing {
             return line[1..^1];
         }
 
-        protected async Task<WeighingResult> Weigh(bool incIdentNr) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
+            string record;
+            try {
                 await SendCommand(incIdentNr ? '\x05' : '?');
-            string record = await ReceiveResponse();
+                record = await ReceiveResponse();
+            } catch (IOException) {
+                if (!retry || Tcp == null) throw;
+                ReconnectTcp();
+                return await Weigh(incIdentNr, false);
+            }
             if (record.Length != 45)
                 throw new FormatException("Invalid response from scale: Received record has invalid size");
             var line = record[2..];

Elwig/Helpers/Weighing/Scale.cs

@@ -10,6 +10,7 @@ namespace Elwig.Helpers.Weighing {
 
         protected enum Output { RTS, DTR, OUT1, OUT2 };
 
+        protected readonly string Connection;
         protected SerialPort? Serial = null;
         protected SerialPort? ControlSerialEmpty = null, ControlSerialFilling = null;
         protected TcpClient? Tcp = null;
@@ -37,6 +38,7 @@ namespace Elwig.Helpers.Weighing {
         }
 
         protected Scale(string cnx, string? empty, string? filling, int? limit, string? log, bool softFail = false, bool failSilent = false) {
+            Connection = cnx;
             if (cnx.StartsWith("serial:")) {
                 try {
                     Serial = Utils.OpenSerialConnection(cnx);
@@ -95,6 +97,14 @@ namespace Elwig.Helpers.Weighing {
             GC.SuppressFinalize(this);
         }
 
+        protected void ReconnectTcp() {
+            if (Connection.StartsWith("tcp:")) {
+                Tcp = Utils.OpenTcpConnection(Connection);
+                Stream = Tcp.GetStream();
+                Reader = new(Stream, Encoding.ASCII, false, 512);
+            }
+        }
+
         protected static Output? ConvertOutput(string? value) {
             return value switch {
                 null => null,

Elwig/Helpers/Weighing/SysTecITScale.cs

@@ -33,7 +33,9 @@ namespace Elwig.Helpers.Weighing {
         protected async Task<string> ReceiveResponse() {
             var line = await Reader.ReadUntilAsync("\r\n");
             if (LogPath != null) await File.AppendAllTextAsync(LogPath, line);
-            if (line == null || line.Length < 4 || !line.StartsWith('<') || !line.EndsWith(">\r\n")) {
+            if (line == null) {
+                throw new IOException("Verbindung zu Waage verloren");
+            } else if (line.Length < 4 || !line.StartsWith('<') || !line.EndsWith(">\r\n")) {
                 throw new FormatException("Invalid response from scale");
             }
 
@@ -72,9 +74,16 @@ namespace Elwig.Helpers.Weighing {
             return line[1..^3];
         }
 
-        protected async Task<WeighingResult> Weigh(bool incIdentNr) {
+        protected async Task<WeighingResult> Weigh(bool incIdentNr, bool retry = true) {
+            string record;
+            try {
                 await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}");
-            string record = await ReceiveResponse();
+                record = await ReceiveResponse();
+            } catch (IOException) {
+                if (!retry || Tcp == null) throw;
+                ReconnectTcp();
+                return await Weigh(incIdentNr, false);
+            }
             if (record.Length != 62)
                 throw new FormatException("Invalid response from scale: Received record has invalid size");
             var line = record[2..];

Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs

@@ -1,5 +1,6 @@
 using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -69,12 +70,15 @@ namespace Elwig.Models.Dtos {
     }
 
     public class DeliveryConfirmationDeliveryRow {
+        public DateOnly Date;
         public string LsNr;
         public int DPNr;
         public string Variety;
         public string? Attribute;
         public string? Cultivation;
         public string QualityLevel;
+        public string QualId;
+        public bool IsDepreciated;
         public (double Oe, double Kmw) Gradation;
         public string[] Modifiers;
         public int Weight;
@@ -83,23 +87,23 @@ namespace Elwig.Models.Dtos {
 
         public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
             var d = p.Delivery;
+            Date = d.Date;
             LsNr = d.LsNr;
             DPNr = p.DPNr;
             Variety = p.Variety.Name;
             Attribute = p.Attribute?.Name;
             Cultivation = p.Cultivation?.Name;
             QualityLevel = p.Quality.Name;
+            QualId = p.Quality.QualId;
+            IsDepreciated = p.QualId == "WEI";
             Gradation = (p.Oe, p.Kmw);
-            Modifiers = p.Modifiers
-                .Select(m => m.Name)
-                .ToArray();
+            Modifiers = [.. p.Modifiers.Select(m => m.Name)];
             Weight = p.Weight;
             IsNetWeight = p.IsNetWeight;
-            Buckets = p.Buckets
+            Buckets = [.. p.Buckets
                 .Where(b => b.Value > 0)
                 .OrderByDescending(b => b.BktNr)
-                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))
-                .ToArray();
+                .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))];
         }
     }
 }

Elwig/Resources/Sql/34-35.sql

@@ -1,6 +1,8 @@
 -- schema version 34 to 35
 
+UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
 ALTER TABLE delivery_part ADD COLUMN unloading TEXT DEFAULT NULL;
 UPDATE delivery_part SET unloading = 'pumped' WHERE lesewagen;
 UPDATE delivery_part SET unloading = 'box' WHERE (SELECT zwstid IN ('H','S') FROM delivery d WHERE (d.year, d.did) = (delivery_part.year, delivery_part.did));
 ALTER TABLE delivery_part DROP COLUMN lesewagen;
+UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';

Elwig/Resources/Sql/36-37.sql

@@ -0,0 +1,12 @@
+-- schema version 36 to 37
+
+UPDATE client_parameter SET value = '0' WHERE param = 'ENABLE_TIME_TRIGGERS';
+
+-- fix old deliveries
+UPDATE delivery         SET xtime = NULL, mtime = ctime WHERE year <= 2022 AND mtime >= 1768521600 AND mtime < 1772323200;
+UPDATE delivery_part    SET xtime = NULL, mtime = ctime WHERE year <= 2022 AND mtime >= 1768521600 AND mtime < 1772323200;
+-- clear xtime at one laptop to force updates from this one
+UPDATE delivery         SET xtime = NULL WHERE year >= 2023 AND xtime >= 1771200000 AND xtime < 1771286400;
+UPDATE delivery_part    SET xtime = NULL WHERE year >= 2023 AND xtime >= 1771200000 AND xtime < 1771286400;
+
+UPDATE client_parameter SET value = '1' WHERE param = 'ENABLE_TIME_TRIGGERS';

Elwig/Services/DeliveryService.cs

@@ -1180,5 +1180,104 @@ namespace Elwig.Services {
                 await ctx.SaveChangesAsync();
             });
         }
+
+        public static async Task<(int Year, int DId, int DPNr)[]> GetDidsFromFilters(this DeliveryAdminViewModel vm) {
+            using var ctx = new AppDbContext();
+            var (_, _, parts, _, _) = await vm.GetFilters(ctx);
+            return [.. (await parts.Select(p => new { p.Year, p.DId, p.DPNr }).ToListAsync()).Select(p => (p.Year, p.DId, p.DPNr))];
+        }
+
+        public static async Task BulkSetAttribute(this DeliveryAdminViewModel vm, string? attributeName) {
+            try {
+                string attrid;
+                if (attributeName == null) {
+                    attrid = "NULL";
+                } else {
+                    using var ctx = new AppDbContext();
+                    var attr = await ctx.WineAttributes.Where(a => a.Name == attributeName).SingleAsync();
+                    attrid = $"'{attr.AttrId}'";
+                }
+                var dids = await vm.GetDidsFromFilters();
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) das Attribut\n'{attributeName}' gesetz werden?",
+                    "Massenaktion: Attribut setzen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (res != MessageBoxResult.OK) return;
+
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    using (var cnx = await AppDbContext.ConnectAsync()) {
+                        await cnx.ExecuteBatch($"""
+                        UPDATE delivery_part SET attrid = {attrid}
+                        WHERE (year, did, dpnr) IN ({string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr})"))})
+                        """);
+                    }
+                    App.HintContextChange();
+                });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task BulkAddModifier(this DeliveryAdminViewModel vm, string modifierName) {
+            try {
+                string modid;
+                using (var ctx = new AppDbContext()) {
+                    var attr = await ctx.Modifiers.Where(a => a.Name == modifierName).FirstAsync();
+                    modid = $"'{attr.ModId}'";
+                }
+
+                var dids = await vm.GetDidsFromFilters();
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' hinzugefügt werden?",
+                    "Massenaktion: Zu-/Abschlag hinzufügen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (res != MessageBoxResult.OK) return;
+
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    using (var cnx = await AppDbContext.ConnectAsync()) {
+                        await cnx.ExecuteBatch($"""
+                        INSERT INTO delivery_part_modifier (year, did, dpnr, modid)
+                        VALUES {string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr},{modid})"))}
+                        ON CONFLICT DO NOTHING
+                        """);
+                    }
+                    App.HintContextChange();
+                });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        public static async Task BulkRemoveModifier(this DeliveryAdminViewModel vm, string modifierName) {
+            try {
+                string modid;
+                using (var ctx = new AppDbContext()) {
+                    var attr = await ctx.Modifiers.Where(a => a.Name == modifierName).FirstAsync();
+                    modid = $"'{attr.ModId}'";
+                }
+
+                var dids = await vm.GetDidsFromFilters();
+                var res = MessageBox.Show($"Soll wirklich für {dids.Length:N0} Teillieferung(en) der Zu-/Abschlag\n'{modifierName}' entfernt werden?",
+                    "Massenaktion: Zu-/Abschlag entfernen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                if (res != MessageBoxResult.OK) return;
+
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    using (var cnx = await AppDbContext.ConnectAsync()) {
+                        await cnx.ExecuteBatch($"""
+                        DELETE FROM delivery_part_modifier
+                        WHERE (year, did, dpnr, modid) IN ({string.Join(", ", dids.Select(d => $"({d.Year},{d.DId},{d.DPNr},{modid})"))})
+                        """);
+                    }
+                    App.HintContextChange();
+                });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                Mouse.OverrideCursor = null;
+            }
+        }
     }
 }

Elwig/Services/SyncService.cs

@@ -271,7 +271,11 @@ namespace Elwig.Services {
         }
 
         public static async Task<bool> ChangesAvailable(AppDbContext ctx, string url, string username, string password) {
+            try {
                 return await ctx.Members.AnyAsync(ChangedMembers) || await ctx.Deliveries.AnyAsync(ChangedDeliveries) || (Utils.HasInternetConnectivity() && (await GetFilesToImport(url, username, password)).Count > 0);
+            } catch {
+                return false;
+            }
         }
     }
 }

Elwig/ViewModels/PaymentVariantsViewModel.cs

@@ -14,7 +14,7 @@ namespace Elwig.ViewModels {
         private IEnumerable<PaymentVar> _paymentVariants = [];
 
         public BillingData? BillingData;
-        public bool SeasonLocked;
+        public bool SeasonLocked = false;  // never locked
         public bool WeightModifierChanged;
 
         [ObservableProperty]

Elwig/Windows/AboutWindow.xaml

@@ -16,13 +16,13 @@
             <Bold>Entwickler:</Bold> Lorenz Stechauner, Thomas Hilscher<LineBreak/>
             <Bold>Kontakt:</Bold> <Hyperlink NavigateUri="mailto:lorenz.stechauner@necronda.net" RequestNavigate="Hyperlink_RequestNavigate">lorenz.stechauner@necronda.net</Hyperlink>, <Hyperlink NavigateUri="mailto:thomas.hilscher@gmail.com" RequestNavigate="Hyperlink_RequestNavigate">thomas.hilscher@gmail.com</Hyperlink><LineBreak/>
             <Bold>Quellcode:</Bold> <Hyperlink NavigateUri="https://git.necronda.net/winzer/elwig" RequestNavigate="Hyperlink_RequestNavigate">https://git.necronda.net/winzer/elwig</Hyperlink><LineBreak/>
-            <Bold>Entwicklungszeitraum:</Bold> 2022–2025<LineBreak/>
+            <Bold>Entwicklungszeitraum:</Bold> 2022–2026<LineBreak/>
             <LineBreak/>
             <Bold>Verwendete Technologien:</Bold><LineBreak/>
             Programmiersprache: C#<LineBreak/>
             Framework: Windows Presentation Framework (WPF)<LineBreak/>
             Datenbank: <Hyperlink NavigateUri="https://sqlite.org/" RequestNavigate="Hyperlink_RequestNavigate">SQLite</Hyperlink><LineBreak/>
-            PDF-Erstellung: <Hyperlink NavigateUri="https://weasyprint.org/" RequestNavigate="Hyperlink_RequestNavigate">WeasyPrint</Hyperlink>, <Hyperlink NavigateUri="https://github.com/toddams/RazorLight" RequestNavigate="Hyperlink_RequestNavigate">RazorLight</Hyperlink>, <Hyperlink NavigateUri="https://github.com/pvginkel/PdfiumViewer" RequestNavigate="Hyperlink_RequestNavigate">PdfiumViewer</Hyperlink><LineBreak/>
+            PDF-Erstellung: <Hyperlink NavigateUri="https://itextpdf.com/" RequestNavigate="Hyperlink_RequestNavigate">iText</Hyperlink>, <Hyperlink NavigateUri="https://github.com/bblanchon/pdfium-binaries" RequestNavigate="Hyperlink_RequestNavigate">Pdfium</Hyperlink><LineBreak/>
             Paketierung: <Hyperlink NavigateUri="https://www.firegiant.com/wixtoolset/" RequestNavigate="Hyperlink_RequestNavigate">WiX Toolset</Hyperlink>
         </TextBlock>
 

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -131,7 +131,11 @@
             </MenuItem>
             <MenuItem Header="Liefermengen" x:Name="Menu_DeliveryDataList">
                 <MenuItem x:Name="Menu_DeliveryDataList_SaveFilters" Header="...aus Filtern speichern... (Excel)"
-                          Click="Menu_DeliveryDataList_SaveFilters_Click"/>
+                          Click="Menu_DeliveryDataList_SaveFilters_Click">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
             </MenuItem>
             <MenuItem Header="Statistik" x:Name="Menu_Statistics">
                 <MenuItem Header="Qualitätsstatistik..." x:Name="Menu_Statistics_WineQuality">
@@ -162,7 +166,11 @@
                 </MenuItem>
                 <MenuItem x:Name="Menu_Statistics_Locality" Header="Lieferstatistik pro Ort...">
                     <MenuItem x:Name="Menu_Statistic_Locality_SaveFilters" Header="...aus Filtern speichern... (Excel)"
-                              Click="Menu_Statistic_Locality_SaveFilters_Click"/>
+                              Click="Menu_Statistic_Locality_SaveFilters_Click">
+                        <MenuItem.Icon>
+                            <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"/>
+                        </MenuItem.Icon>
+                    </MenuItem>
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="BKI">
@@ -184,6 +192,23 @@
                 <MenuItem x:Name="Menu_Export_UploadSeason" Header="...von Saison/Zweigstelle hochladen"
                           Click="Menu_Export_UploadSeason_Click"/>
             </MenuItem>
+            <MenuItem Header="Massenaktion">
+                <MenuItem x:Name="Menu_BulkAction_SetAttribute" Header="Attribut auf Lieferungen aus Filtern setzen...">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE932;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_BulkAction_AddModifier" Header="Zu-/Abschlag auf Lieferungen aus Filtern hinzufügen...">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xECC8;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem x:Name="Menu_BulkAction_RemoveModifier" Header="Zu-/Abschlag auf Lieferungen aus Filtern entfernen...">
+                    <MenuItem.Icon>
+                        <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xECC9;"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+            </MenuItem>
             <MenuItem Header="Einstellungen">
                 <MenuItem x:Name="Menu_Settings_EnableFreeEditing" Header="Freie Bearbeitung aktivieren"
                           IsCheckable="True" Checked="Menu_Settings_EnableFreeEditing_Checked" Unchecked="Menu_Settings_EnableFreeEditing_Unchecked"/>

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 using System.Windows.Threading;
 
 namespace Elwig.Windows {
@@ -283,6 +284,21 @@ namespace Elwig.Windows {
         private async void Menu_DeliveryDataList_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateDeliveryDataList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList);
 
+        private async void Menu_BulkAction_SetAttribute_Click(object sender, RoutedEventArgs evt) {
+            if (sender is not MenuItem item) return;
+            await ViewModel.BulkSetAttribute(item.Header as string);
+        }
+
+        private async void Menu_BulkAction_AddModifier_Click(object sender, RoutedEventArgs evt) {
+            if (sender is not MenuItem item || item.Header is not string name) return;
+            await ViewModel.BulkAddModifier(name);
+        }
+
+        private async void Menu_BulkAction_RemoveModifier_Click(object sender, RoutedEventArgs evt) {
+            if (sender is not MenuItem item || item.Header is not string name) return;
+            await ViewModel.BulkRemoveModifier(name);
+        }
+
         private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
             if (IsEditing || IsCreating) {
                 DateInput.IsReadOnly = false;
@@ -468,8 +484,10 @@ namespace Elwig.Windows {
                 ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
             }
 
+            int year = 0;
             Menu_Bki_SaveList.Items.Clear();
             foreach (var s in await ctx.Seasons.OrderByDescending(s => s.Year).ToListAsync()) {
+                if (s.Year > year) year = s.Year;
                 var i = new MenuItem {
                     Header = $"Saison {s.Year}",
                 };
@@ -477,6 +495,37 @@ namespace Elwig.Windows {
                 Menu_Bki_SaveList.Items.Add(i);
             }
 
+            var font = new FontFamily("Segoe MDL2 Assets");
+            Menu_BulkAction_SetAttribute.Items.Clear();
+            var noAttr = new MenuItem {
+                Header = new TextBlock() { Text = "Kein Attribut", FontStyle = FontStyles.Italic },
+                Icon = new TextBlock() { Text = "\ue75c", FontFamily = font, FontSize = 16 },
+            };
+            noAttr.Click += Menu_BulkAction_SetAttribute_Click;
+            Menu_BulkAction_SetAttribute.Items.Add(noAttr);
+            foreach (var attr in await ctx.WineAttributes.OrderBy(a => a.AttrId).ToListAsync()) {
+                var i = new MenuItem {
+                    Header = attr.Name,
+                };
+                i.Click += Menu_BulkAction_SetAttribute_Click;
+                Menu_BulkAction_SetAttribute.Items.Add(i);
+            }
+
+            Menu_BulkAction_AddModifier.Items.Clear();
+            Menu_BulkAction_RemoveModifier.Items.Clear();
+            foreach (var mod in await ctx.Modifiers.Where(m => m.Year == year).OrderBy(m => m.ModId).ToListAsync()) {
+                var i1 = new MenuItem {
+                    Header = mod.Name,
+                };
+                i1.Click += Menu_BulkAction_AddModifier_Click;
+                Menu_BulkAction_AddModifier.Items.Add(i1);
+                var i2 = new MenuItem {
+                    Header = mod.Name,
+                };
+                i2.Click += Menu_BulkAction_RemoveModifier_Click;
+                Menu_BulkAction_RemoveModifier.Items.Add(i2);
+            }
+
             await RefreshList();
             var d = DeliveryList.SelectedItem as Delivery;
             var y = d?.Year ?? ViewModel.FilterSeason;

Elwig/Windows/MailWindow.xaml

@@ -69,7 +69,7 @@
                                Grid.Column="0" Margin="10,8,10,10"/>
                         <ListBox x:Name="AvaiableDocumentsList"
                                  Grid.Column="0" Margin="10,30,10,10"
-                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged"/>
+                                 SelectionChanged="AvaiableDocumentsList_SelectionChanged" MouseDoubleClick="AvaiableDocumentsList_MouseDoubleClick"/>
 
                         <Button x:Name="DocumentAddButton" Content="&#xF0AF;" FontFamily="Segoe MDL2 Assets" FontSize="14"
                                 Grid.Column="1" Margin="0,0,0,30" VerticalAlignment="Center" Height="25" IsEnabled="False"
@@ -82,7 +82,7 @@
                                Grid.Column="2" Margin="10,8,10,10"/>
                         <ListBox x:Name="SelectedDocumentsList" DisplayMemberPath="Name"
                                  Grid.Column="2" Margin="10,30,10,37"
-                                 SelectionChanged="SelectedDocumentsList_SelectionChanged">
+                                 SelectionChanged="SelectedDocumentsList_SelectionChanged" MouseDoubleClick="SelectedDocumentsList_MouseDoubleClick">
                             <ListBox.InputBindings>
                                 <KeyBinding Key="Delete" Command="{Binding Path=DeleteCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:MailWindow}}}"/>
                             </ListBox.InputBindings>
@@ -138,58 +138,61 @@
                             <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
                                          Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                            <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsCreditMembersInput" Content="Empfänger von Gutschriften"
                                          Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                            <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                                         Margin="10,130,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
 
-                            <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
+                            <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,160,0,10"/>
                             <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
-                                                Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,160,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>
 
-                            <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
+                            <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,190,0,10"/>
                             <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
                                                 IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
-                                                Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,190,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>
 
-                            <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
+                            <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,220,0,10"/>
                             <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
-                                         Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="80,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
                             <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
-                                         Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="125,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
                             <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
-                                         Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="180,225,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
 
-                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
+                            <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,250,0,10"/>
                             <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
-                                         Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="80,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
                             <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
-                                         Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="125,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
                             <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
-                                         Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                         Margin="180,255,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                          Checked="MemberInput_Checked"/>
 
-                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
+                            <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,280,0,10"/>
                             <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                                 IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
-                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,280,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>
 
-                            <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
+                            <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,280,0,10"/>
                             <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
                                                 IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
-                                                Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="50,280,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>
 
                             <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
                                                 IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
-                                                Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                                Margin="10,160,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                                 SelectionChanged="MemberInput_SelectionChanged"/>
                         </Grid>
                     </GroupBox>

Elwig/Windows/MailWindow.xaml.cs

@@ -333,7 +333,35 @@ namespace Elwig.Windows {
             }
         }
 
-        private async void DocumentAddButton_Click(object sender, RoutedEventArgs evt) {
+        private void AvaiableDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
+            if (evt.LeftButton != MouseButtonState.Pressed) return;
+            var src = evt.OriginalSource;
+            if (src is Border b) {
+                src = (b.Child as ContentPresenter)?.Content.ToString();
+            } else if (src is TextBlock t) {
+                src = t.Text;
+            } else {
+                return;
+            }
+            AvaiableDocumentsList.SelectedIndex = AvaiableDocumentsList.ItemsSource.Cast<object?>().ToList().IndexOf(src);
+            DocumentAddButton_Click(sender, null);
+        }
+
+        private void SelectedDocumentsList_MouseDoubleClick(object sender, MouseEventArgs evt) {
+            if (evt.LeftButton != MouseButtonState.Pressed) return;
+            var src = evt.OriginalSource;
+            if (src is Border b) {
+                src = (b.Child as ContentPresenter)?.Content.ToString();
+            } else if (src is TextBlock t) {
+                src = t.Text;
+            } else {
+                return;
+            }
+            SelectedDocumentsList.SelectedItem = SelectedDocs.FirstOrDefault(d => d.Name == (string?)src);
+            DocumentRemoveButton_Click(sender, null);
+        }
+
+        private async void DocumentAddButton_Click(object sender, RoutedEventArgs? evt) {
             var idx = AvaiableDocumentsList.SelectedIndex;
             using var ctx = new AppDbContext();
             if (AvaiableDocumentsList.SelectedItem is not string s)
@@ -347,13 +375,13 @@ namespace Elwig.Windows {
                 var name = s.Split(" – ")[^1];
                 var pv = await ctx.PaymentVariants.SingleAsync(v => v.Year == Year && v.Name == name)!;
                 SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
-                RecipientsDeliveryMembersInput.IsChecked = true;
+                RecipientsCreditMembersInput.IsChecked = true;
             }
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
             await UpdateRecipients(ctx);
         }
 
-        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs evt) {
+        private async void DocumentRemoveButton_Click(object sender, RoutedEventArgs? evt) {
             DeleteCommand.Execute(null);
             using var ctx = new AppDbContext();
             await UpdateRecipients(ctx);
@@ -456,6 +484,9 @@ namespace Elwig.Windows {
                     query = query.Where(m => m.IsActive && !m.Deliveries.Any(d => d.Year == Year));
                 } else if (RecipientsActiveMembersInput.IsChecked == true && SelectedDocs.Any(d => d.Type == DocType.DeliveryConfirmation || d.Type == DocType.CreditNote)) {
                     query = query.Where(m => m.IsActive || m.Deliveries.Any(d => d.Year == Year));
+                } else if (RecipientsCreditMembersInput.IsChecked == true) {
+                    var avnrs = SelectedDocs.Where(d => d.Type == DocType.CreditNote).Select(d => (((int,int)?)d.Details)?.Item2).ToList();
+                    query = query.Where(m => m.Credits.Any(c => c.Year == Year && avnrs.Contains(c.AvNr)));
                 } else {
                     query = query.Where(m => m.IsActive);
                 }
@@ -623,8 +654,7 @@ namespace Elwig.Windows {
             CancelGeneration?.Dispose();
             CancelGeneration = new();
 
-            using var ctx = new AppDbContext();
-
+            try {
                 var doublePaged = DoublePagedInput.IsChecked == true;
                 var location = PostalLocation.Text.Trim();
                 var docs = SelectedDocs.OrderByDescending(d => d.Type).ToList();
@@ -660,55 +690,64 @@ namespace Elwig.Windows {
                     }
                 }
 
+                var postalDate = DateOnly.ParseExact(PostalDate.Text, "dd.MM.yyyy");
+                var printMode = PostalAllInput.IsChecked == true ? 3 : PostalWishInput.IsChecked == true ? 2 : PostalNoEmailInput.IsChecked == true ? 1 : 0;
+                var emailMode = EmailAllInput.IsChecked == true ? 2 : EmailWishInput.IsChecked == true ? 1 : 0;
+
+                var hasPreviewDocs = await Task.Run(async () => await GenerateDocuments(doublePaged, location, docs, recipients, postalDate, printMode, emailMode));
+                PreviewButton.IsEnabled = true;
+                PrintButton.IsEnabled = PrintDocument != null && !hasPreviewDocs;
+                EmailButton.IsEnabled = EmailDocuments != null && !hasPreviewDocs && App.Config.Smtp != null;
+            } catch (Exception exc) {
+                MessageBox.Show(exc.ToString(), "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            } finally {
+                UnlockInputs();
+                GenerateButton.IsEnabled = true;
+                GenerateButton.Visibility = Visibility.Visible;
+                AbortButton.IsEnabled = false;
+                AbortButton.Visibility = Visibility.Hidden;
+                Mouse.OverrideCursor = null;
+            }
+        }
+
+        private async Task<bool> GenerateDocuments(bool doublePaged, string location, List<SelectedDoc> docs, IEnumerable<Member> recipients, DateOnly postalDate, int printMode, int emailMode) {
+            App.MainDispatcher.Invoke(() => {
+                ProgressBar.Value = 0.0;
+            });
+            using var ctx = new AppDbContext();
+
             Dictionary<int, IDictionary<int, DeliveryConfirmationDeliveryData>> dcData = [];
             Dictionary<(int, int), (IDictionary<int, CreditNoteDeliveryData>, IDictionary<int, PaymentMember>, BillingData)> cnData = [];
             foreach (var doc in docs) {
                 if (doc.Type == DocType.DeliveryConfirmation) {
                     var year = (int)doc.Details!;
-
-                    try {
                     var b = new Billing(year);
                     await b.FinishSeason();
                     await b.CalculateBuckets();
                     App.HintContextChange();
-
                     dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year);
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        UnlockInputs();
-                        GenerateButton.IsEnabled = true;
-                        GenerateButton.Visibility = Visibility.Visible;
-                        AbortButton.IsEnabled = false;
-                        AbortButton.Visibility = Visibility.Hidden;
-                        Mouse.OverrideCursor = null;
-                        return;
-                    }
                 } else if (doc.Type == DocType.CreditNote) {
                     var details = ((int, int))doc.Details!;
                     var year = details.Item1;
                     var avnr = details.Item2;
-                    try {
                     cnData[(year, avnr)] = (
                         await CreditNoteDeliveryData.ForPaymentVariant(ctx.CreditNoteDeliveryRows, ctx.PaymentVariants, year, avnr),
                         await ctx.MemberPayments.Where(p => p.Year == year && p.AvNr == avnr).ToDictionaryAsync(c => c.MgNr),
                         BillingData.FromJson((await ctx.PaymentVariants.FindAsync(year, avnr))!.Data)
                     );
-                    } catch (Exception exc) {
-                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                        UnlockInputs();
-                        GenerateButton.IsEnabled = true;
-                        GenerateButton.Visibility = Visibility.Visible;
-                        AbortButton.IsEnabled = false;
-                        AbortButton.Visibility = Visibility.Hidden;
-                        Mouse.OverrideCursor = null;
-                        return;
-                    }
                     await ctx.GetMemberAreaCommitmentBuckets(year, 0);
                 }
             }
 
-            var postalDate = DateOnly.ParseExact(PostalDate.Text, "dd.MM.yyyy");
-            var memberDocs = recipients.Select(m => new {
+            var (printNum, emailNum) = App.MainDispatcher.Invoke(() => {
+                double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 1 ? PostalNoEmailCount : 0;
+                double emailNum = emailMode == 2 ? EmailAllCount : emailMode == 1 ? EmailWishCount : 0;
+                return (printNum, emailNum);
+            });
+            double totalNum = printNum + emailNum + recipients.Count() / 2;
+            double offset = 0;
+
+            var memberDocs = recipients.Select((m, i) => new {
                 Member = m,
                 Docs = docs.SelectMany<SelectedDoc, GeneratedDoc>(doc => {
                     try {
@@ -750,34 +789,24 @@ namespace Elwig.Windows {
                     } catch (Exception exc) {
                         MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                         return [];
+                    } finally {
+                        App.MainDispatcher.Invoke(() => {
+                            ProgressBar.Value = offset + 100.0 * (i + 1) / 2 / totalNum;
+                        });
                     }
                 }).ToList()
             }).ToList();
+            offset += 100.0 * memberDocs.Count / 2 / totalNum;
 
             var hasPreviewDocs = memberDocs.Any(m => m.Docs.Any(d => d.Doc.IsPreview));
             if (hasPreviewDocs) {
-                var res = MessageBox.Show("Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\nDies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen.\n\nSoll mit dem Generieren fortgefahren werden?",
+                var res = MessageBox.Show("Einige der ausgewählten Dokumente sind nur als vorläufig zu betrachten und können daher nicht verschickt/ausgedruckt werden!\n\nDies könnte an einer noch nicht festgesetzen Auszahlungsvariante liegen oder daran, dass nicht alle Adressaten/Empfänger eine Traubengutschrift erhalten\n(\"Empfänger von Gutschriften\").\n\nSoll mit dem Generieren fortgefahren werden?",
                     "Vorläufige Dokumente", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
                 if (res != MessageBoxResult.OK) {
-                    UnlockInputs();
-                    GenerateButton.IsEnabled = true;
-                    GenerateButton.Visibility = Visibility.Visible;
-                    AbortButton.IsEnabled = false;
-                    AbortButton.Visibility = Visibility.Hidden;
-                    Mouse.OverrideCursor = null;
-                    return;
+                    throw new OperationCanceledException("Dokumentenerzeugung abgebrochen!");
                 }
             }
 
-            var printMode = PostalAllInput.IsChecked == true ? 3 :
-                PostalWishInput.IsChecked == true ? 2 :
-                PostalNoEmailInput.IsChecked == true ? 1 : 0;
-            var emailMode = EmailAllInput.IsChecked == true ? 2 : EmailWishInput.IsChecked == true ? 1 : 0;
-
-            double printNum = printMode == 3 ? PostalAllCount : printMode == 2 ? PostalWishCount : printMode == 1 ? PostalNoEmailCount : 0;
-            double emailNum = emailMode == 2 ? EmailAllCount : emailMode == 1 ? EmailWishCount : 0;
-            double totalNum = printNum + emailNum;
-
             var email = memberDocs
                 .Where(d => d.Member.EmailAddresses.Count > 0 && (emailMode == 2 || (emailMode == 1 && d.Member.ContactViaEmail)))
                 .ToDictionary(d => d.Member, m => {
@@ -792,27 +821,16 @@ namespace Elwig.Windows {
                     return docs;
                 });
             var emailRecipients = email.Select(d => d.Key.MgNr).ToHashSet();
-            try {
             foreach (var item1 in email.Select((e, i) => new { Index = i, e.Key, e.Value })) {
                 foreach (var item2 in item1.Value.Select((d, i) => new { Index = i, Doc = d })) {
-                        await item2.Doc.Generate(CancelGeneration.Token, new Progress<double>(v => {
-                            ProgressBar.Value = v * (item2.Index + 1) / item1.Value.Count / totalNum + 100.0 * item1.Index / totalNum;
-                        }));
+                    await item2.Doc.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                        ProgressBar.Value = offset + v * (item2.Index + 1) / item1.Value.Count / totalNum + 100.0 * item1.Index / totalNum;
+                    })));
                 }
             }
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                UnlockInputs();
-                GenerateButton.IsEnabled = true;
-                GenerateButton.Visibility = Visibility.Visible;
-                AbortButton.IsEnabled = false;
-                AbortButton.Visibility = Visibility.Hidden;
-                Mouse.OverrideCursor = null;
-                return;
-            }
-            if (email.Count > 0) {
+            if (email.Count > 0)
                 EmailDocuments = email;
-            }
+            offset += 100.0 * email.Count / totalNum;
 
             var printMemberDocs = memberDocs
                 .Where(d =>
@@ -838,39 +856,20 @@ namespace Elwig.Windows {
                 .ToList();
 
             if (printDocs.Count > 0) {
-                try {
                 var print = Document.Merge(printDocs);
-                    print.IsDoublePaged = doublePaged;
-                    await print.Generate(CancelGeneration.Token, new Progress<double>(v => {
-                        ProgressBar.Value = 100.0 * emailNum / totalNum + v * printNum / totalNum;
-                    }));
+                await print.Generate(CancelGeneration?.Token, new Progress<double>(v => App.MainDispatcher.Invoke(() => {
+                    ProgressBar.Value = offset + v * printNum / totalNum;
+                })));
                 PrintDocument = print;
                 PrintMemberDocuments = printMemberDocs.ToDictionary(m => m.Member, m => m.Docs.Select(d => d.Doc).ToList());
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                    UnlockInputs();
-                    GenerateButton.IsEnabled = true;
-                    GenerateButton.Visibility = Visibility.Visible;
-                    AbortButton.IsEnabled = false;
-                    AbortButton.Visibility = Visibility.Hidden;
-                    Mouse.OverrideCursor = null;
-                    return;
-                }
             } else {
                 PrintDocument = null;
                 PrintMemberDocuments = null;
             }
+            App.MainDispatcher.Invoke(() => {
                 ProgressBar.Value = 100.0;
-
-            UnlockInputs();
-            GenerateButton.IsEnabled = true;
-            GenerateButton.Visibility = Visibility.Visible;
-            AbortButton.IsEnabled = false;
-            AbortButton.Visibility = Visibility.Hidden;
-            Mouse.OverrideCursor = null;
-            PreviewButton.IsEnabled = true;
-            PrintButton.IsEnabled = PrintDocument != null && !hasPreviewDocs;
-            EmailButton.IsEnabled = EmailDocuments != null && !hasPreviewDocs && App.Config.Smtp != null;
+            });
+            return hasPreviewDocs;
         }
 
         private async void PreviewButton_Click(object sender, RoutedEventArgs evt) {
@@ -1014,7 +1013,7 @@ namespace Elwig.Windows {
             var pv = ctx.PaymentVariants.Single(v => v.Year == Year && v.Name == name)!;
             SelectedDocs.Add(new(DocType.CreditNote, s, (pv.Year, pv.AvNr)));
             SelectedDocumentsList.SelectedIndex = SelectedDocs.Count - 1;
-            RecipientsDeliveryMembersInput.IsChecked = true;
+            RecipientsCreditMembersInput.IsChecked = true;
         }
 
         private void DocumentInput_TextChanged(object sender, TextChangedEventArgs evt) {

Elwig/Windows/MainWindow.xaml

@@ -248,7 +248,7 @@
                 <Button x:Name="BreakdownButton"
                         Click="BreakdownButton_Click"
                         Margin="195,90,0,10" Width="190" Padding="3,5,5,5"
-                        ToolTip="Aufschlüsselung der Menge nach Zweigstelle, Mitglied, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
+                        ToolTip="Aufschlüsselung der Menge nach Zweigstelle, Sorte, Attribut/Bewirt., Qualitätsstufe, gebunden/ungebunden">
                     <Grid>
                         <TextBlock FontFamily="Segoe MDL2 Assets" FontSize="16" Text="&#xE9F9;"
                                    TextAlignment="Left" HorizontalAlignment="Left" Padding="6.5,0.5,0,0"/>

Elwig/Windows/PaymentAdjustmentWindow.xaml.cs

@@ -16,16 +16,14 @@ namespace Elwig.Windows {
     public partial class PaymentAdjustmentWindow : ContextWindow {
 
         public readonly int Year;
-        public readonly bool SeasonLocked;
+        public readonly bool SeasonLocked = false;  // never locked
 
         public Dictionary<int, PaymentCustom>? CustomPayments;
 
         public PaymentAdjustmentWindow(int year) {
             InitializeComponent();
             Year = year;
-            using (var ctx = new AppDbContext()) {
-                SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
-            }
+            // using (var ctx = new AppDbContext()) { SeasonLocked = ctx.Seasons.Find(Year + 1) != null; }
             Title = $"Auszahlung anpassen - Lese {Year} - Elwig";
             AutoAdjustBsButton.IsEnabled = !SeasonLocked;
             UnAdjustBsButton.IsEnabled = !SeasonLocked;

Elwig/Windows/PaymentVariantsWindow.xaml.cs

@@ -1,12 +1,9 @@
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
-using Elwig.Helpers.Export;
-using Elwig.Models.Dtos;
 using Elwig.Models.Entities;
 using Elwig.Services;
 using Elwig.ViewModels;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Win32;
 using System;
 using System.Linq;
 using System.Text.Json;
@@ -35,9 +32,7 @@ namespace Elwig.Windows {
             CommandBindings.Add(new CommandBinding(CtrlÜ, Menu_EbicsSave_Click));
             CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_SummaryPrint_Click));
             Year = year;
-            using (var ctx = new AppDbContext()) {
-                ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null;
-            }
+            // using (var ctx = new AppDbContext()) { ViewModel.SeasonLocked = ctx.Seasons.Find(Year + 1) != null; }
             Title = $"Auszahlungsvarianten - Lese {Year} - Elwig";
             if (!App.Config.Debug) {
                 DataInput.Visibility = Visibility.Hidden;

Installer/Folders.wxs

@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment>
-    <!-- C:\Program Files (x86)\Elwig oder C:\Program Files\Elwig -->
+    <!-- C:\Program Files (x86)\Elwig or C:\Program Files\Elwig -->
     <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)">
-        <Directory Id="InstallFolderResources" Name="resources">
-          <Directory Id="InstallFolderDocuments" Name="Documents" />
-        </Directory>
-      </Directory>
+      <Directory Id="InstallFolder" Name="!(bind.Property.ProductName)" />
     </StandardDirectory>
 
     <!-- C:\ProgramData\Elwig -->

Installer/HeatComponents.wxs

@@ -6,9 +6,6 @@
         <Exclude Files="..\Elwig\bin\Publish\**.exe" />
         <Exclude Files="..\Elwig\bin\Publish\**.pdb" />
       </Files>
-      <Files Directory="InstallFolderDocuments" Include="..\Elwig\Documents\**">
-        <Exclude Files="..\Elwig\Documents\**.cs" />
-      </Files>
     </ComponentGroup>
   </Fragment>
 </Wix>

Installer/Installer.wixproj

@@ -30,11 +30,10 @@
       <Output TaskParameter="Version" PropertyName="ElwigFileVersion" />
     </GetFileVersion>
     <PropertyGroup>
-      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;DocumentPath=..\Elwig\Documents;ElwigProjectDir=..\Elwig</DefineConstants>
+      <DefineConstants>ProductVersion=$(ElwigFileVersion);BuildPath=..\Elwig\bin\Publish;ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>
   </Target>
   <ItemGroup>
     <None Include="Files\config.ini" />
-    <None Include="Files\WinziPrint.exe" />
   </ItemGroup>
 </Project>

Installer/MainComponents.wxs

@@ -7,9 +7,6 @@
       <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>
     </ComponentGroup>
   </Fragment>
 </Wix>

README.md

@@ -13,17 +13,17 @@ About
 **Product:** Elwig  
 **Description:** Electronic Management for Vintners' Cooperatives  
 **Type:** ERP system  
-**Version:** 1.0.3.0 ([Changelog](./CHANGELOG.md))  
+**Version:** 1.0.4.0 ([Changelog](./CHANGELOG.md))  
 **License:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Source code:** https://git.necronda.net/winzer/elwig  
-**Developement period:** 2022–2025
+**Developement period:** 2022–2026
 
 **Technology Stack:**  
 Language: C#  
 Framework: Windows Presentation Framework (WPF)  
 Database: [SQLite](https://sqlite.org/)  
-PDF creation: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
+PDF creation: [iText](https://itextpdf.com/), [Pdfium](https://github.com/bblanchon/pdfium-binaries)  
 Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 
 
@@ -33,15 +33,15 @@ Packaging: [WiX Toolset](https://www.firegiant.com/wixtoolset/)
 **Produkt:** Elwig  
 **Beschreibung:** Elektronische Winzergenossenschaftsverwaltung  
 **Typ:** Warenwirtschaftssystem (ERP-System)  
-**Version:** 1.0.3.0 ([Änderungsprotokoll](./CHANGELOG.md))  
+**Version:** 1.0.4.0 ([Änderungsprotokoll](./CHANGELOG.md))  
 **Lizenz:** [GNU General Public License 3.0 (GPLv3)](./LICENSE)  
 **Website:** https://elwig.at/  
 **Quellcode:** https://git.necronda.net/winzer/elwig  
-**Entwicklungszeitraum:** 2022–2025
+**Entwicklungszeitraum:** 2022–2026
 
 **Verwendete Technologien:**  
 Programmiersprache: C#  
 Framework: Windows Presentation Framework (WPF)  
 Datenbank: [SQLite](https://sqlite.org/)  
-PDF-Erstellung: [WeasyPrint](https://weasyprint.org/), [RazorLight](https://github.com/toddams/RazorLight), [PdfiumViewer](https://github.com/pvginkel/PdfiumViewer)  
+PDF-Erstellung: [iText](https://itextpdf.com/), [Pdfium](https://github.com/bblanchon/pdfium-binaries)  
 Paketierung: [WiX Toolset](https://www.firegiant.com/wixtoolset/)

Setup/Bundle.wxs

@@ -8,18 +8,18 @@
                                               SuppressOptionsUI="yes" ShowVersion="yes"/>
     </BootstrapperApplication>
 
-    <util:RegistrySearch Id="VCredistx86" Variable="VCredistx86" Result="exists"
-                         Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x86,x86,14.36,bundle"/>
+    <util:RegistrySearch Id="VCredistx64" Variable="VCredistx64" Result="exists"
+                         Root="HKLM" Key="SOFTWARE\Classes\Installer\Dependencies\VC,redist.x64,amd64,14.50,bundle"/>
     <util:RegistrySearch Id="Webview2Machine" Variable="Webview2Machine" Result="exists"
                          Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
     <util:RegistrySearch Id="Webview2User" Variable="Webview2User" Result="exists"
                          Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}"/>
 
     <Chain>
-      <ExePackage Id="VCredistx86Installer" DisplayName="VC Redist x86 installer" Name="VC_redist.x86.exe"
-                  SourceFile="$(ProjectDir)\Files\VC_redist.x86.exe"
+      <ExePackage Id="VCredistx64Installer" DisplayName="VC Redist x64 installer" Name="VC_redist.x64.exe"
+                  SourceFile="$(ProjectDir)\Files\VC_redist.x64.exe"
                   Cache="remove" Compressed="yes" PerMachine="yes" Permanent="yes" Vital="yes"
-                  InstallArguments="/install /passive /norestart" DetectCondition="VCredistx86"/>
+                  InstallArguments="/install /passive /norestart" DetectCondition="VCredistx64"/>
       <ExePackage Id="MicrosoftEdgeWebview2" DisplayName="Microsoft Edge Webview2 Runtime" Name="MicrosoftEdgeWebview2Setup.exe"
                   SourceFile="$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe"
                   Cache="remove" Compressed="yes" PerMachine="yes" Permanent ="yes" Vital="no"

Setup/Setup.wixproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
     <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
-    <Exec Command="curl --fail -s -L &quot;https://aka.ms/vs/17/release/vc_redist.x86.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x86.exe&quot;" />
+    <Exec Command="curl --fail -s -L &quot;https://aka.ms/vc14/vc_redist.x64.exe&quot; -z &quot;$(ProjectDir)\Files\VC_redist.x64.exe&quot; -o &quot;$(ProjectDir)\Files\VC_redist.x64.exe&quot;" />
     <PropertyGroup>
       <DefineConstants>ElwigProjectDir=..\Elwig</DefineConstants>
     </PropertyGroup>

Tests/Tests.csproj

@@ -19,16 +19,16 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
     <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
-    <PackageReference Include="NUnit" Version="4.4.0" />
+    <PackageReference Include="NUnit" Version="4.5.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.11.2">
+    <PackageReference Include="NUnit.Analyzers" Version="4.12.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.4">
+    <PackageReference Include="coverlet.collector" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Tests/UnitTests/DocumentTests/CreditNoteTest.cs

@@ -29,10 +29,12 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("AT81 1234 5678 9012 3457"));
                 Assert.That(text, Contains.Substring("""
                     20201001X001 1 Grüner Veltliner 73 15,0 ungeb.: 3 219 0,5000 - - 1 609,50
-                    20201001X003 1 Grüner Veltliner abgew. 75 15,4 ungeb.: 2 561 - -
-                    20201001X003 2 Grüner Veltliner Kabinett / abgew.
-                    87 17,6 ungeb.: 3 129 - -
-                    20201001X003 3 Grüner Veltliner abgew. 79 16,1 ungeb.: 1 280 - -
+                    20201001X003 1 Grüner Veltliner 75 15,4 ungeb.: 2 561 - -
+                    abgew.
+                    20201001X003 2 Grüner Veltliner 87 17,6 ungeb.: 3 129 - -
+                    Kabinett / abgew.
+                    20201001X003 3 Grüner Veltliner 79 16,1 ungeb.: 1 280 - -
+                    abgew.
                     20201001X005 1 Welschriesling 84 17,0 ungeb.: 3 192 - -
                     20201001X005 2 Welschriesling 84 17,1 ungeb.: 2 190 - -
                     """));

Tests/UnitTests/DocumentTests/DeliveryConfirmationTest.cs

@@ -24,12 +24,13 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring($"Wolkersdorf, am {Elwig.Helpers.Utils.Today:dd.MM.yyyy}"));
                 Assert.That(text, Contains.Substring("Anlieferungsbestätigung 2020"));
                 Assert.That(text, Contains.Substring("""
-                    20201001X001 1 Grüner Veltliner Qualitätswein 73 15,0 ungeb.: 3 219 3 219 ☑
-                    20201001X003 2 Grüner Veltliner Kabinett Wein 87 17,6 ungeb.: 3 129 3 129 ☑
-                    20201001X003 3 Grüner Veltliner Wein 79 16,1 ungeb.: 1 280 1 280 ☑
-                    20201001X003 1 Grüner Veltliner Wein 75 15,4 ungeb.: 2 561 2 561 ☑
-                    20201001X005 2 Welschriesling Kabinett 84 17,1 ungeb.: 2 190 2 190 ☑
-                    20201001X005 1 Welschriesling Kabinett 84 17,0 ungeb.: 3 192 3 192 ☑
+                    20201001X001 1 Grüner Veltliner QUW 73 15,0 ungeb.: 3 219 3 219 ☑
+                    20201001X003 2 Grüner Veltliner WEI 87 17,6 ungeb.: 3 129 3 129 ☑
+                    Kabinett
+                    20201001X003 3 Grüner Veltliner WEI 79 16,1 ungeb.: 1 280 1 280 ☑
+                    20201001X003 1 Grüner Veltliner WEI 75 15,4 ungeb.: 2 561 2 561 ☑
+                    20201001X005 2 Welschriesling KAB 84 17,1 ungeb.: 2 190 2 190 ☑
+                    20201001X005 1 Welschriesling KAB 84 17,0 ungeb.: 3 192 3 192 ☑
                     """));
                 Assert.That(text, Contains.Substring("Gesamt: 15 571"));
                 Assert.That(text, Contains.Substring("""

Tests/UnitTests/DocumentTests/DeliveryDepreciationListTest.cs

@@ -18,12 +18,12 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("Saison 2020"));
                 Assert.That(table, Is.EqualTo(new string[][] {
                     ["101, MUSTERMANN Max",                "Teil-Lfrg.:", "3",       "81", "16,5",  "6 970"],
-                    ["20201001X003 1 01.10.2020 10:24", "Grüner Veltliner",             "75", "15,4",  "2 561"],
-                    ["20201001X003 2 01.10.2020 10:24", "Grüner Veltliner", "Kabinett", "87", "17,6",  "3 129"],
-                    ["20201001X003 3 01.10.2020 10:24", "Grüner Veltliner",             "79", "16,1",  "1 280"],
+                    ["20201001X003 1 01.10.2020 10:24 Grüner Veltliner",             "75", "15,4",  "2 561"],
+                    ["20201001X003 2 01.10.2020 10:24 Grüner Veltliner", "Kabinett", "87", "17,6",  "3 129"],
+                    ["20201001X003 3 01.10.2020 10:24 Grüner Veltliner",             "79", "16,1",  "1 280"],
                     ["103, MUSTERBAUER Matthäus",          "Teil-Lfrg.:", "2",       "79", "16,2",  "6 099"],
-                    ["20201002X001 1 02.10.2020 09:13", "Grüner Veltliner", "Bio",      "80", "16,3",  "3 198"],
-                    ["20201002X002 1 02.10.2020 09:28", "Grüner Veltliner", "Bio",      "78", "16,0",  "2 901"],
+                    ["20201002X001 1 02.10.2020 09:13 Grüner Veltliner", "Bio",      "80", "16,3",  "3 198"],
+                    ["20201002X002 1 02.10.2020 09:28 Grüner Veltliner", "Bio",      "78", "16,0",  "2 901"],
                     ["Gesamt:",      "(Teil-)Lieferungen: 3 (5)",                    "80", "16,3", "13 069"],
                 }));
             });

Tests/UnitTests/DocumentTests/MemberListTest.cs

@@ -17,8 +17,8 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("Mitgliederliste"));
                 Assert.That(text, Contains.Substring("Alle Mitglieder"));
                 Assert.That(table.Take(3), Is.EqualTo(new string[][] {
-                     ["101 MUSTERMANN Max",      "Winzerstraße 1", "2223", "Hohenruppersdorf", "0123463", "0", "Hohenruppersdorf"],
-                     ["102 WEINBAUER Wernhardt", "Winzerstraße 2", "2223", "Hohenruppersdorf", "0123471", "0", "Hohenruppersdorf"],
+                     ["101 MUSTERMANN Max",      "Winzerstraße 1", "2223", "Hohenruppersdorf", "0123463", "0 Hohenruppersdorf"],
+                     ["102 WEINBAUER Wernhardt", "Winzerstraße 2", "2223", "Hohenruppersdorf", "0123471", "0 Hohenruppersdorf"],
                      [    "W&B Weinbauer GesbR", "Winzerstraße 2", "2223", "Hohenruppersdorf"],
                 }));
             });

Tests/UnitTests/DocumentTests/PaymentVariantSummaryTest.cs

@@ -18,8 +18,8 @@ namespace Tests.UnitTests.DocumentTests {
                 Assert.That(text, Contains.Substring("Auszahlungsvariante"));
                 Assert.That(text, Contains.Substring(v.Name));
                 Assert.That(table.Skip(17).ToArray(), Is.EqualTo(new string[][] {
-                     [                   "Gradation",   "ungebunden",   "attributlos gebunden",    "gebunden",     "Gesamt" ],
-                     [                     "[°Oe]",   "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[€]"  ],
+                     ["Sorte/Attr./Bewirt.", "Gradation",   "ungebunden",   "attributlos gebunden",    "gebunden",     "Gesamt" ],
+                     ["Qualitätsstufe",        "[°Oe]",   "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[kg]", "[€/kg]",    "[€]"  ],
                      ["Grüner Veltliner",                "3 219",                 "0",                 "0",           "1 609,50"],
                      ["Qualitätswein",          "73",    "3 219", "0,5000",       "-",      "-",       "-",      "-", "1 609,50"]
                 }));

Tests/UnitTests/DocumentTests/Setup.cs

@@ -25,7 +25,6 @@ namespace Tests.UnitTests.DocumentTests {
 
         [OneTimeSetUp]
         public async Task SetupPrinting() {
-            await Html.Init();
             await Pdf.Init();
         }