From 545622a2ab748557eda2f5932168e39e3e458512 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sun, 3 Sep 2023 01:21:46 +0200 Subject: [PATCH] DeliveryNote: Fix forced page break --- Elwig/Documents/DeliveryNote.cshtml | 44 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index 8a44e82..5a96763 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -6,31 +6,32 @@
@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")

@Model.Title

@{ - var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList(); bool displayStats = true; // Model.Delivery.Year == Model.CurrentNextSeason - - int xLines = Model.Delivery.Parts.Count() * 5 + Model.Delivery.Parts.Select(p => p.Modifiers.Count() + (p.Comment != null ? 1 : 0) + (p.Acid != null || p.Temperature != null ? 1 : 0)).Sum(); - if (Model.Delivery.Comment != null) xLines += 2; - if (displayStats) xLines += 2 + Model.MemberBuckets.Select(b => b.Item3 > 0 && b.Item4 > 0 && sortids.Contains(b.Item1[..2]) ? 1 : 0).Sum(); - - int sLines = Model.Text != null ? (Model.Text.Length + 110 - 1) / 110 : 0; - xLines += sLines + (sLines + 1) / 2; - - bool forcePageBreak = xLines > 30; } -@if (forcePageBreak) { - -

Siehe nächste Seite.

- // JS delivery-stats -
-} + hr.before(stats); + + const p = document.createElement("p"); + p.innerText = "Siehe nächste Seite." + stats.before(p); + } + }); + @@ -133,6 +134,7 @@ $"" + $""; } + var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList(); }
{(sum > right ? $"{sum - right:N0}" : "-")}{sum:N0}
Geschäftsanteile