From f14148553730a52d9ff61b384fd3195d1a5cee67 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 15 Jan 2026 14:01:21 +0100 Subject: [PATCH] Documents: Only show header and footer on BusinessDocuments --- Elwig/Documents/BusinessDocument.cs | 10 ++++++++++ Elwig/Documents/DeliveryAncmtList.css | 2 +- Elwig/Documents/DeliveryDepreciationList.css | 2 +- Elwig/Documents/DeliveryJournal.css | 2 +- Elwig/Documents/Document.cs | 11 ++--------- Elwig/Documents/MemberList.css | 2 +- Elwig/Documents/PaymentVariantSummary.css | 2 +- Elwig/Documents/WineQualityStatistics.css | 2 +- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Elwig/Documents/BusinessDocument.cs b/Elwig/Documents/BusinessDocument.cs index 490214a..4fb57ed 100644 --- a/Elwig/Documents/BusinessDocument.cs +++ b/Elwig/Documents/BusinessDocument.cs @@ -19,6 +19,16 @@ namespace Elwig.Documents { Member = m; Location = App.BranchLocation; IncludeSender = includeSender; + var c = App.Client; + Header = $"
{c.Name}
{c.NameSuffix}
{c.NameTypeFull}
"; + Footer = Utils.GenerateFooter("
", " \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 ? $"\">{c.EmailAddress}" : null) + .Item(c.Website != null ? $"{c.Website}" : 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 ? "" : " (pauschaliert)"); Aside = $"" + $"" + diff --git a/Elwig/Documents/DeliveryAncmtList.css b/Elwig/Documents/DeliveryAncmtList.css index f0d3b56..aea8e98 100644 --- a/Elwig/Documents/DeliveryAncmtList.css +++ b/Elwig/Documents/DeliveryAncmtList.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; } diff --git a/Elwig/Documents/DeliveryDepreciationList.css b/Elwig/Documents/DeliveryDepreciationList.css index f0d3b56..aea8e98 100644 --- a/Elwig/Documents/DeliveryDepreciationList.css +++ b/Elwig/Documents/DeliveryDepreciationList.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; } diff --git a/Elwig/Documents/DeliveryJournal.css b/Elwig/Documents/DeliveryJournal.css index f0d3b56..aea8e98 100644 --- a/Elwig/Documents/DeliveryJournal.css +++ b/Elwig/Documents/DeliveryJournal.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; } diff --git a/Elwig/Documents/Document.cs b/Elwig/Documents/Document.cs index 37e23a1..20c5066 100644 --- a/Elwig/Documents/Document.cs +++ b/Elwig/Documents/Document.cs @@ -39,15 +39,8 @@ namespace Elwig.Documents { CurrentNextSeason = Utils.CurrentNextSeason; Title = title; Author = c.NameFull; - Header = $"
{c.Name}
{c.NameSuffix}
{c.NameTypeFull}
"; - Footer = Utils.GenerateFooter("
", " \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 ? $"\">{c.EmailAddress}" : null) - .Item(c.Website != null ? $"{c.Website}" : 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(); + Header = ""; + Footer = Utils.GenerateFooter("
", " \u00b7 ").Item(c.NameFull).ToString(); Date = DateOnly.FromDateTime(Utils.Today); } diff --git a/Elwig/Documents/MemberList.css b/Elwig/Documents/MemberList.css index f0d3b56..aea8e98 100644 --- a/Elwig/Documents/MemberList.css +++ b/Elwig/Documents/MemberList.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; } diff --git a/Elwig/Documents/PaymentVariantSummary.css b/Elwig/Documents/PaymentVariantSummary.css index bc2fbbb..750ede6 100644 --- a/Elwig/Documents/PaymentVariantSummary.css +++ b/Elwig/Documents/PaymentVariantSummary.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; } diff --git a/Elwig/Documents/WineQualityStatistics.css b/Elwig/Documents/WineQualityStatistics.css index c875176..842bd5e 100644 --- a/Elwig/Documents/WineQualityStatistics.css +++ b/Elwig/Documents/WineQualityStatistics.css @@ -2,7 +2,7 @@ h1 { text-align: center; font-size: 24pt; - margin-top: 10mm; + margin-top: 0; margin-bottom: 2mm; }
Mitglied