diff --git a/Elwig/Documents/BusinessDocument.cs b/Elwig/Documents/BusinessDocument.cs index 4016729..c31bf06 100644 --- a/Elwig/Documents/BusinessDocument.cs +++ b/Elwig/Documents/BusinessDocument.cs @@ -36,7 +36,7 @@ namespace Elwig.Documents { protected Cell NewAsideCell(Paragraph text, int colspan = 1, bool isName = false) { var cell = NewCell(text, colspan: colspan).SetPaddingsMM(0.25f, 0.5f, 0.25f, isName ? 1 : 0); - if (colspan > 1) { + if (colspan == 26) { cell.SetTextAlignment(TextAlignment.CENTER).SetFont(BF) .SetBackgroundColor(new DeviceRgb(0xe0, 0xe0, 0xe0)) .SetBorderTop(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness)) @@ -62,14 +62,15 @@ namespace Elwig.Documents { base.BeforeRenderBody(doc, pdf); var uid = new KernedParagraph(Member.UstIdNr ?? "-", 10); if (!Member.IsBuchführend) uid.Add(Normal(" ")).Add(Italic("(pauschaliert)")); - Aside = new Table(ColsMM(22.5, 42.5)) - .SetFont(NF).SetFontSize(10) + Aside = new Table(ColsMM(2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5)) + .SetWidth(UnitValue.CreatePointValue(65 * PtInMM)).SetFixedLayout() .SetBorderCollapse(BorderCollapsePropertyValue.COLLAPSE) + .SetFont(NF).SetFontSize(10) .SetBorder(new SolidBorder(new DeviceRgb(0x80, 0x80, 0x80), BorderThickness)) - .AddCell(NewAsideCell("Mitglied", 2)) - .AddCell(NewAsideCell("Mitglieds-Nr.:", isName: true)).AddCell(NewAsideCell($"{Member.MgNr}")) - .AddCell(NewAsideCell("Betriebs-Nr.:", isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "")) - .AddCell(NewAsideCell("UID:", isName: true)).AddCell(NewAsideCell(uid)); + .AddCell(NewAsideCell("Mitglied", 26)) + .AddCell(NewAsideCell("Mitglieds-Nr.:", 9, isName: true)).AddCell(NewAsideCell($"{Member.MgNr}", 17)) + .AddCell(NewAsideCell("Betriebs-Nr.:", 9, isName: true)).AddCell(NewAsideCell(Member.LfbisNr ?? "", 17)) + .AddCell(NewAsideCell("UID:", 9, isName: true)).AddCell(NewAsideCell(uid, 17)); } protected void RenderAddress(Canvas canvas, Rectangle pageSize) { diff --git a/Elwig/Documents/CreditNote.cs b/Elwig/Documents/CreditNote.cs index e987e41..f1abcea 100644 --- a/Elwig/Documents/CreditNote.cs +++ b/Elwig/Documents/CreditNote.cs @@ -125,10 +125,10 @@ namespace Elwig.Documents { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { base.BeforeRenderBody(doc, pdf); - Aside?.AddCell(NewAsideCell("Gutschrift", 2)) - .AddCell(NewAsideCell("TG-Nr.:", isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-")) - .AddCell(NewAsideCell("Datum:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}")) - .AddCell(NewAsideCell("Überw. am:", isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.TransferDate:dd.MM.yyyy}")); + Aside?.AddCell(NewAsideCell("Gutschrift", 26)) + .AddCell(NewAsideCell("Tr.-Gutschr.-Nr.:", 12, isName: true)).AddCell(NewAsideCell(Payment?.Credit != null ? $"{Payment.Credit.Year}/{Payment.Credit.TgNr:000}" : "-", 14)) + .AddCell(NewAsideCell("Datum:", 12, isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.Date:dd.MM.yyyy}", 14)) + .AddCell(NewAsideCell("Überwiesen am:", 12, isName: true)).AddCell(NewAsideCell($"{Payment?.Variant.TransferDate:dd.MM.yyyy}", 14)); } protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { diff --git a/Elwig/Documents/DeliveryConfirmation.cs b/Elwig/Documents/DeliveryConfirmation.cs index 5eda941..89d4cb1 100644 --- a/Elwig/Documents/DeliveryConfirmation.cs +++ b/Elwig/Documents/DeliveryConfirmation.cs @@ -55,10 +55,10 @@ namespace Elwig.Documents { base.BeforeRenderBody(doc, pdf); var firstDay = Data.Rows.MinBy(r => r.Date)?.Date; var lastDay = Data.Rows.MaxBy(r => r.Date)?.Date; - Aside?.AddCell(NewAsideCell("Saison", 2)) - .AddCell(NewAsideCell("Lieferungen:", isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})")) - .AddCell(NewAsideCell("Zeitraum:", isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)")) - .AddCell(NewAsideCell("Menge:", isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg")); + Aside?.AddCell(NewAsideCell("Saison", 26)) + .AddCell(NewAsideCell("Lieferungen:", 9, isName: true)).AddCell(NewAsideCell($"{Data.Rows.DistinctBy(r => r.LsNr).Count():N0} (Teil-Lfrg.: {Data.RowNum:N0})", 17)) + .AddCell(NewAsideCell("Zeitraum:", 9, isName: true)).AddCell(NewAsideCell(firstDay == null || lastDay == null ? "-" : firstDay == lastDay ? $"{firstDay:dd.MM.} (1 Tag)" : $"{firstDay:dd.MM.}\u2013{lastDay:dd.MM.} ({lastDay?.DayNumber - firstDay?.DayNumber + 1:N0} Tage)", 17)) + .AddCell(NewAsideCell("Menge:", 9, isName: true)).AddCell(NewAsideCell($"{MemberStats.Sum(s => s.Weight):N0} kg", 17)); } protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) { diff --git a/Elwig/Documents/DeliveryNote.cs b/Elwig/Documents/DeliveryNote.cs index 9a81b40..d6157c8 100644 --- a/Elwig/Documents/DeliveryNote.cs +++ b/Elwig/Documents/DeliveryNote.cs @@ -72,10 +72,10 @@ namespace Elwig.Documents { protected override void BeforeRenderBody(iText.Layout.Document doc, PdfDocument pdf) { base.BeforeRenderBody(doc, pdf); - Aside?.AddCell(NewAsideCell("Lieferung", 2)) - .AddCell(NewAsideCell("LS-Nr.:", isName: true)).AddCell(NewAsideCell(Delivery.LsNr)) - .AddCell(NewAsideCell("Datum/Zeit:", isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}")) - .AddCell(NewAsideCell("Zweigstelle:", isName: true)).AddCell(NewAsideCell(Delivery.Branch.Name)); + Aside?.AddCell(NewAsideCell("Lieferung", 26)) + .AddCell(NewAsideCell("Lieferschein-Nr.:", 12, isName: true)).AddCell(NewAsideCell(Delivery.LsNr, 14)) + .AddCell(NewAsideCell("Datum/Zeit:", 12, isName: true)).AddCell(NewAsideCell($"{Delivery.Date:dd.MM.yyyy} / {Delivery.Time:HH:mm}", 14)) + .AddCell(NewAsideCell("Zweigstelle:", 12, isName: true)).AddCell(NewAsideCell(Delivery.Branch.Name, 14)); } protected override void RenderBody(iText.Layout.Document doc, PdfDocument pdf) {