From c836b45920f1426d91b7781ccf33896ed0f6045c Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Fri, 22 Dec 2023 19:48:13 +0100 Subject: [PATCH] Documents: Add .bold for tables --- Elwig/Documents/BusinessDocument.cs | 2 +- Elwig/Documents/DeliveryConfirmation.cshtml | 2 +- Elwig/Documents/DeliveryJournal.cshtml | 2 +- Elwig/Documents/DeliveryNote.cshtml | 2 +- Elwig/Documents/Document.Table.css | 6 +++++- Elwig/Documents/MemberDataSheet.cshtml | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Elwig/Documents/BusinessDocument.cs b/Elwig/Documents/BusinessDocument.cs index 4da50ed..5e38075 100644 --- a/Elwig/Documents/BusinessDocument.cs +++ b/Elwig/Documents/BusinessDocument.cs @@ -74,7 +74,7 @@ namespace Elwig.Documents { ); var totalDict = buckets.GroupBy(b => b.Key[2..]).ToDictionary(g => g.Key, g => g.Sum(a => a.Value.DeliveryStrict)); var totals = attributes.Select(a => totalDict.TryGetValue(a, out int value) ? value : 0); - tbl += "" + string.Join("", totals.Select(v => $"{v:N0}")) + + tbl += "" + string.Join("", totals.Select(v => $"{v:N0}")) + $"{totalDict.Values.Sum():N0}"; return "" + tbl + "
"; diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml index bdc724e..37e7e1b 100644 --- a/Elwig/Documents/DeliveryConfirmation.cshtml +++ b/Elwig/Documents/DeliveryConfirmation.cshtml @@ -83,7 +83,7 @@ lastVariant = p.Variant; } } - + Gesamt: @($"{Model.Data.Rows.Sum(p => p.Weight):N0}") diff --git a/Elwig/Documents/DeliveryJournal.cshtml b/Elwig/Documents/DeliveryJournal.cshtml index cf4f5d8..ceda2c0 100644 --- a/Elwig/Documents/DeliveryJournal.cshtml +++ b/Elwig/Documents/DeliveryJournal.cshtml @@ -51,7 +51,7 @@ @($"{p.Weight:N0}") } - + @{ var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries); var oe = Elwig.Helpers.Utils.KmwToOe(kmw); diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index b87bd73..65ff3d2 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -63,7 +63,7 @@ } } @if (Model.Delivery.Parts.Count() > 1) { - + Gesamt: @($"{Model.Delivery.Oe:N0}") @($"{Model.Delivery.Kmw:N1}") diff --git a/Elwig/Documents/Document.Table.css b/Elwig/Documents/Document.Table.css index 623f733..a4f39fa 100644 --- a/Elwig/Documents/Document.Table.css +++ b/Elwig/Documents/Document.Table.css @@ -117,7 +117,7 @@ main table.number thead tr:first-child th:first-child { text-align: left; } -main table tr.sum td { +main table tr.bold td { font-weight: bold; } @@ -145,3 +145,7 @@ main table th.narrow { main table .lborder {border-left: 0.5pt solid black;} main table .rborder {border-right: 0.5pt solid black;} + +main table .fleft { + float: left; +} diff --git a/Elwig/Documents/MemberDataSheet.cshtml b/Elwig/Documents/MemberDataSheet.cshtml index 24d11ba..a404486 100644 --- a/Elwig/Documents/MemberDataSheet.cshtml +++ b/Elwig/Documents/MemberDataSheet.cshtml @@ -202,7 +202,7 @@ lastContract = contractType.AreaComType.DisplayName; } } - + Gesamt: @($"{Model.Member.ActiveAreaCommitments.Select(a => a.Area).Sum():N0}")