From faaeefe6ce1c4041fd60161a91e7c3897a1f715a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 5 Sep 2023 20:41:03 +0200 Subject: [PATCH] Documents: Update documents --- Elwig/Documents/BusinessDocument.cshtml | 1 - Elwig/Documents/BusinessLetter.cshtml | 1 - Elwig/Documents/DeliveryNote.cshtml | 44 +++++++++++++++---------- Elwig/Documents/Document.cshtml | 11 +++++-- Elwig/Documents/style.css | 6 +++- 5 files changed, 40 insertions(+), 23 deletions(-) diff --git a/Elwig/Documents/BusinessDocument.cshtml b/Elwig/Documents/BusinessDocument.cshtml index 425642c..5633e55 100644 --- a/Elwig/Documents/BusinessDocument.cshtml +++ b/Elwig/Documents/BusinessDocument.cshtml @@ -2,7 +2,6 @@ @inherits TemplatePage @model Elwig.Documents.BusinessDocument @{ Layout = "Document"; } -
diff --git a/Elwig/Documents/BusinessLetter.cshtml b/Elwig/Documents/BusinessLetter.cshtml index cb9d624..d10323e 100644 --- a/Elwig/Documents/BusinessLetter.cshtml +++ b/Elwig/Documents/BusinessLetter.cshtml @@ -2,7 +2,6 @@ @inherits TemplatePage @model Elwig.Documents.BusinessLetter @{ Layout = "BusinessDocument"; } -

Sehr geehrtes Mitglied,

nein.

Mit freundlichen Grüßen
Ihre Winzergenossenschaft

diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index 5a96763..0627836 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -2,7 +2,6 @@ @inherits TemplatePage @model Elwig.Documents.DeliveryNote @{ Layout = "BusinessDocument"; } -
@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")

@Model.Title

@{ @@ -11,24 +10,35 @@ diff --git a/Elwig/Documents/Document.cshtml b/Elwig/Documents/Document.cshtml index 9db33ad..01fbac3 100644 --- a/Elwig/Documents/Document.cshtml +++ b/Elwig/Documents/Document.cshtml @@ -1,7 +1,6 @@ @using RazorLight @inherits TemplatePage @model Elwig.Documents.Document - @@ -13,9 +12,15 @@ window.addEventListener("beforeprint", async () => { await window.PagedPolyfill.preview(); }); window.addEventListener("afterprint", () => { location.reload(); }); } + + const heightA4 = 297, widhtA4 = 210, heightFooter = 35, heightHeader = 25; + const heightMain = heightA4 - heightFooter - heightHeader; + function px2mm(px1, px2) { + return (px2 - px1 + 1) * 2.54 / 96 * window.devicePixelRatio * 10; + } - - + +
diff --git a/Elwig/Documents/style.css b/Elwig/Documents/style.css index f187fc7..66e00ad 100644 --- a/Elwig/Documents/style.css +++ b/Elwig/Documents/style.css @@ -165,7 +165,7 @@ main p.comment { } .pre-footer { - margin: 4.23mm 0; + margin: 1em 0; font-size: 10pt; display: flex; } @@ -327,6 +327,10 @@ hr.page-break { break-after: page; } +tr.page-break { + break-before: page; +} + @page { size: A4; margin: 25mm 0 35mm 0;