From 65bcc7bbb138c27520243715f3642b6da474495b Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sat, 12 Aug 2023 20:21:52 +0200
Subject: [PATCH] Add optional Document Id to Documents

---
 Elwig/Documents/DeliveryNote.cshtml    | 105 +++++++++++++------------
 Elwig/Documents/DeliveryNote.cshtml.cs |   1 +
 Elwig/Documents/Document.cshtml        |   3 +-
 Elwig/Documents/Document.cshtml.cs     |   1 +
 4 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml
index 59cd4df..9f16223 100644
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -6,64 +6,65 @@
 <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 <h1>@Model.Title</h1>
 <table class="delivery">
-<colgroup>
-    <col span="1" style="width: 1cm;"/>
-    <col span="1" style="width: 50%;"/>
-    <col span="1" style="width: 50%;"/>
-    <col span="1" style="width: 3cm;"/>
-    <col span="1" style="width: 1.25cm;"/>
-    <col span="1" style="width: 1.25cm;"/>
-    <col span="1" style="width: 1.5cm;"/>
-</colgroup>
-<thead>
-<tr>
-    <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
-    <th class="main" rowspan="2">Sorte</th>
-    <th class="main" rowspan="2">Attribut(e)</th>
-    <th class="main" rowspan="2">Qualitätsstufe</th>
-    <th colspan="2">Gradation</th>
-    <th>Gewicht</th>
-</tr>
-<tr>
-    <th style="font-size: 8pt">[°Oe]</th>
-    <th style="font-size: 8pt">[°KMW]</th>
-    <th style="font-size: 8pt">[kg]</th>
-</tr>
-</thead>
-<tbody>
-    @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
-        <tr class="main">
-            <td style="text-align: center;">@part.DPNr</td>
-            <td>@part.Variant.Name</td>
-            <td>@string.Join(" / ", part.Attributes)</td>
-            <td>@part.Quality.Name</td>
-            <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
-            <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
-            <td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
+    <colgroup>
+        <col style="width: 1cm;"/>
+        <col style="width: 50%;"/>
+        <col style="width: 50%;"/>
+        <col style="width: 3cm;"/>
+        <col style="width: 1.25cm;"/>
+        <col style="width: 1.25cm;"/>
+        <col style="width: 1.5cm;"/>
+    </colgroup>
+    <thead>
+        <tr>
+            <th class="main" rowspan="2" style="text-align: center;">Pos.</th>
+            <th class="main" rowspan="2">Sorte</th>
+            <th class="main" rowspan="2">Attribut(e)</th>
+            <th class="main" rowspan="2">Qualitätsstufe</th>
+            <th colspan="2">Gradation</th>
+            <th>Gewicht</th>
         </tr>
-        <tr><td></td><td colspan="3" style="font-size: 8pt; white-space: pre">Herkunft: @part.OriginString</td></tr>
-        <tr><td></td><td colspan="3" style="font-size: 8pt;">
-            @(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
-        </td></tr>
-        @if (part.Comment != null) {
-            <tr><td></td><td colspan="3" style="font-size: 8pt;">Anmerkung: @part.Comment</td></tr>
-        }
-        @if (part.Temperature != null || part.Acid != null) {
+        <tr>
+            <th style="font-size: 8pt;">[°Oe]</th>
+            <th style="font-size: 8pt;">[°KMW]</th>
+            <th style="font-size: 8pt;">[kg]</th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach (var part in Model.Delivery.Parts.OrderBy(p => p.DPNr)) {
+            <tr class="main">
+                <td style="text-align: center;">@part.DPNr</td>
+                <td>@part.Variant.Name</td>
+                <td>@string.Join(" / ", part.Attributes)</td>
+                <td>@part.Quality.Name</td>
+                <td class="narrow" style="text-align: center;">@($"{part.Oe:N0}")</td>
+                <td class="narrow" style="text-align: center;">@($"{part.Kmw:N1}")</td>
+                <td class="narrow" style="text-align: right;">@($"{part.Weight:N0}")</td>
+            </tr>
+            <tr><td></td><td colspan="3" style="font-size: 8pt; white-space: pre">Herkunft: @part.OriginString</td></tr>
+            <tr><td></td><td colspan="3" style="font-size: 8pt;">
+                @(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
+            </td></tr>
+            @if (part.Comment != null) {
+                <tr><td></td><td colspan="3" style="font-size: 8pt;">Anmerkung: @part.Comment</td></tr>
+            }
+            @if (part.Temperature != null || part.Acid != null) {
                 <tr><td></td><td colspan="3" style="font-size: 8pt;">@(part.Temperature != null ? $"Temperatur: {part.Temperature:N1} °C" : "")@(part.Temperature != null && part.Acid != null ? ", " : "")@(part.Acid != null ? $"Säure: {part.Acid:N1} g/l" : "")</td></tr>
             }
         }
-</tbody>
+    </tbody>
 </table>
 @if (Model.Delivery.Comment != null) {
     <p class="comment">Amerkung zur Lieferung: @Model.Delivery.Comment</p>
 }
-<div class="bottom">
-<!-- FIXME page breaking -->
-@if (Model.Text != null) {
-    <p class="comment">@Model.Text</p>
-}
-    <div class="signatures">
-        <div>Genossenschaft</div>
-        <div>Mitglied</div>
+@for (int i = 0; i < 2; i++) {
+    <div class="@(i == 0 ? "bottom" : "hidden")">
+        @if (Model.Text != null) {
+            <p class="comment">@Model.Text</p>
+        }
+        <div class="signatures">
+            <div>Genossenschaft</div>
+            <div>Mitglied</div>
+        </div>
     </div>
-</div>
+}
diff --git a/Elwig/Documents/DeliveryNote.cshtml.cs b/Elwig/Documents/DeliveryNote.cshtml.cs
index 9915ba6..0f83a16 100644
--- a/Elwig/Documents/DeliveryNote.cshtml.cs
+++ b/Elwig/Documents/DeliveryNote.cshtml.cs
@@ -15,6 +15,7 @@ namespace Elwig.Documents {
                 $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
                 $"</tbody></table>";
             Text = App.Client.DeliveryNoteText;
+            DocumentId = d.LsNr;
         }
     }
 }
diff --git a/Elwig/Documents/Document.cshtml b/Elwig/Documents/Document.cshtml
index d711c63..9db33ad 100644
--- a/Elwig/Documents/Document.cshtml
+++ b/Elwig/Documents/Document.cshtml
@@ -21,14 +21,15 @@
     <div class="m1"></div>
     <div class="m2"></div>
     <div class="m3"></div>
-    <header>@Raw(Model.Header)</header>
     <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 class="page"></span>
         </div>
         <footer>@Raw(Model.Footer)</footer>
     </div>
+    <header>@Raw(Model.Header)</header>
     <div class="spacing"></div>
     <div class="main-wrapper">
         @RenderBody()
diff --git a/Elwig/Documents/Document.cshtml.cs b/Elwig/Documents/Document.cshtml.cs
index 2dbddc6..177553f 100644
--- a/Elwig/Documents/Document.cshtml.cs
+++ b/Elwig/Documents/Document.cshtml.cs
@@ -36,6 +36,7 @@ namespace Elwig.Documents {
         public string Header { get; set; }
         public string Footer { get; set; }
         public DateTime Date { get; set; }
+        public string? DocumentId { get; set; }
 
         private async Task<string> Render() {
             string name;