diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml index 67a0671..f32a170 100644 --- a/Elwig/Documents/DeliveryConfirmation.cshtml +++ b/Elwig/Documents/DeliveryConfirmation.cshtml @@ -100,6 +100,12 @@ + + Davon abgewertet: + @($"{Model.Data.Rows.Where(p => p.IsDepreciated).Sum(p => p.Weight):N0}") + + + @Raw(BusinessDocument.PrintSortenaufteilung(Model.MemberStats)) diff --git a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs index cccd279..20b9705 100644 --- a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs +++ b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs @@ -75,6 +75,7 @@ namespace Elwig.Models.Dtos { public string? Attribute; public string? Cultivation; public string QualityLevel; + public bool IsDepreciated; public (double Oe, double Kmw) Gradation; public string[] Modifiers; public int Weight; @@ -89,17 +90,15 @@ namespace Elwig.Models.Dtos { Attribute = p.Attribute?.Name; Cultivation = p.Cultivation?.Name; QualityLevel = p.Quality.Name; + IsDepreciated = p.QualId == "WEI"; Gradation = (p.Oe, p.Kmw); - Modifiers = p.Modifiers - .Select(m => m.Name) - .ToArray(); + Modifiers = [.. p.Modifiers.Select(m => m.Name)]; Weight = p.Weight; IsNetWeight = p.IsNetWeight; - Buckets = p.Buckets + Buckets = [.. p.Buckets .Where(b => b.Value > 0) .OrderByDescending(b => b.BktNr) - .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value)) - .ToArray(); + .Select(b => (b.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{b.Discr}", b.Value))]; } } }