From 0e9bae4ec9ed4ebbd6ee89cb96c87fa9b08a2091 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 10 Oct 2023 16:24:16 +0200
Subject: [PATCH] DeliveryNote: Rework according to Herbert

---
 Elwig/Documents/DeliveryNote.cshtml    | 26 ++++++++++++++------------
 Elwig/Documents/DeliveryNote.cshtml.cs |  6 ++++++
 Elwig/Documents/Document.cshtml.cs     |  2 +-
 Elwig/Documents/style-deliverynote.css |  9 +++++++++
 Elwig/Documents/style.css              |  9 +++++++--
 Elwig/Helpers/ClientParameters.cs      |  4 ++++
 6 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml
index 83b32a0..5416f3b 100644
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -5,9 +5,6 @@
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
 <main>
 <h1>@Model.Title</h1>
-@{
-    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
-}
 <script>
     document.addEventListener("DOMContentLoaded", () => {
         const hidden = document.getElementsByClassName("hidden")[0];
@@ -113,9 +110,9 @@
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-@if (displayStats) {
+@if (Model.DisplayStats > 0) {
     <div id="delivery-stats">
-        <table class="delivery-stats">
+        <table class="delivery-stats @(Model.DisplayStats > 2 ? "expanded" : "")">
             <colgroup>
                 <col style="width: 45mm;"/>
                 <col style="width: 20mm;"/>
@@ -150,15 +147,20 @@
                     var buckets = Model.MemberBuckets.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
                 }
                 <tr>
-                    <th>Gesamtlieferung</th>
+                    <th>Gesamtlieferung lt. gez. GA</th>
                     @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
                 </tr>
-                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
-                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
-                            <th>@name</th>
-                            @Raw(FormatRow(obligation, right, sum))
-                        </tr>
+                @if (Model.DisplayStats > 1) {
+                    <tr class="subheading">
+                        <th>Flächenbindungen:</th>
+                    </tr>
+                    @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
+                        if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
+                            <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
+                                <th>@name</th>
+                                @Raw(FormatRow(obligation, right, sum))
+                            </tr>
+                        }
                     }
                 }
             </tbody>
diff --git a/Elwig/Documents/DeliveryNote.cshtml.cs b/Elwig/Documents/DeliveryNote.cshtml.cs
index e6f4a1d..b584e23 100644
--- a/Elwig/Documents/DeliveryNote.cshtml.cs
+++ b/Elwig/Documents/DeliveryNote.cshtml.cs
@@ -9,6 +9,12 @@ namespace Elwig.Documents {
         public string? Text;
         public IEnumerable<(string, string, int, int, int)> MemberBuckets;
 
+        // 0 - none
+        // 1 - only business shares
+        // 2 - only business shares and area commitments of varieties from delivery note
+        // 3 - full
+        public int DisplayStats = 2;
+
         public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
             UseBillingAddress = true;
             ShowDateAndLocation = true;
diff --git a/Elwig/Documents/Document.cshtml.cs b/Elwig/Documents/Document.cshtml.cs
index e51627f..9d75f73 100644
--- a/Elwig/Documents/Document.cshtml.cs
+++ b/Elwig/Documents/Document.cshtml.cs
@@ -29,7 +29,7 @@ namespace Elwig.Documents {
             CurrentNextSeason = Utils.CurrentNextSeason;
             Title = title;
             Author = c.NameFull;
-            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div>";
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div><div class='type'>{c.NameTypeFull}</div>";
             Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
                 .Item(c.NameFull).NextLine()
                 .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
diff --git a/Elwig/Documents/style-deliverynote.css b/Elwig/Documents/style-deliverynote.css
index ec902c7..b7ff3dc 100644
--- a/Elwig/Documents/style-deliverynote.css
+++ b/Elwig/Documents/style-deliverynote.css
@@ -74,6 +74,15 @@ table.delivery-stats:not(.expanded) tr.optional {
     display: none;
 }
 
+table.delivery-stats tr.subheading th {
+    text-align: left;
+}
+
+table.delivery.expanded tr.subheading:not(:has(~ tr)),
+table.delivery tr.subheading:not(:has(~ tr:not(.optional))) {
+    display: none;
+}
+
 table.delivery-stats thead th {
     font-weight: normal;
     font-style: italic;
diff --git a/Elwig/Documents/style.css b/Elwig/Documents/style.css
index 9f3ef7f..af4c521 100644
--- a/Elwig/Documents/style.css
+++ b/Elwig/Documents/style.css
@@ -40,15 +40,20 @@ header {
 
 header .name {
     font-size: 18pt;
-    margin-top: 10mm;
+    margin-top: 8mm;
     font-weight: bold;
 }
 
 header .suffix {
-    font-size: 12pt;
+    font-size: 14pt;
     font-weight: bold;
 }
 
+header .type {
+    font-size: 12pt;
+    font-weight: normal;
+}
+
 .footer-wrapper {
     position: running(page-footer);
     width: 165mm;
diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs
index 3f82795..ec37554 100644
--- a/Elwig/Helpers/ClientParameters.cs
+++ b/Elwig/Helpers/ClientParameters.cs
@@ -20,6 +20,10 @@ namespace Elwig.Helpers {
         public string Name;
         public string? NameSuffix;
         public string NameType;
+        public string NameTypeFull => NameType.Replace(".", "").Replace(" ", "").ToLower() switch {
+            "reggenmbh" => "registrierte Genossenschaft mit beschränkter Haftung",
+            _ => NameType,
+        };
         public string NameFull => NameSuffix == null ? $"{Name} {NameType}" : $"{Name}, {NameSuffix}, {NameType}";
         public Type? Client;