diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml index 20bf4a2..17b7b6b 100644 --- a/Elwig/Documents/DeliveryConfirmation.cshtml +++ b/Elwig/Documents/DeliveryConfirmation.cshtml @@ -11,13 +11,14 @@ <col style="width: 25mm;"/> <col style="width: 5mm;"/> <col style="width: 24mm;"/> + <col style="width: 16mm;"/> <col style="width: 17mm;"/> - <col style="width: 19mm;"/> <col style="width: 10mm;"/> <col style="width: 10mm;"/> <col style="width: 15mm;"/> <col style="width: 12mm;"/> <col style="width: 14mm;"/> + <col style="width: 3mm;"/> <col style="width: 14mm;"/> </colgroup> <thead> @@ -30,6 +31,14 @@ <th colspan="2">Gradation</th> <th colspan="2">Flächenbindung</th> <th>Gewicht</th> + <th rowspan="3" style="padding: 0;"> + <svg width="10" height="40" xmlns="http://www.w3.org/2000/svg"> + <text x="-40" y="5" transform="rotate(270)" font-size="8pt" font-style="italic" font-family="Times New Roman" + style="text-anchor: start; alignment-baseline: middle;"> + bto./nto. + </text> + </svg> + </th> <th>Davon<br/>abzuwerten</th> </tr> <tr> @@ -72,8 +81,10 @@ } @if (i == p.Buckets.Length - 1) { <td class="number">@($"{p.Weight:N0}")</td> + <td class="small">@(p.IsNetWeight ? "n" : "b")</td> } else { <td></td> + <td></td> } @if (first) { <td rowspan="@rows" class="number"></td> diff --git a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs index 0be2155..d5bba40 100644 --- a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs +++ b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs @@ -78,6 +78,7 @@ namespace Elwig.Models.Dtos { public (double Oe, double Kmw) Gradation; public string[] Modifiers; public int Weight; + public bool IsNetWeight; public (string Name, int Value)[] Buckets; public DeliveryConfirmationDeliveryRow(DeliveryPart p) { @@ -93,6 +94,7 @@ namespace Elwig.Models.Dtos { .Select(m => m.Name) .ToArray(); Weight = p.Weight; + IsNetWeight = p.IsNetWeight; Buckets = p.Buckets .Where(b => b.Value > 0) .OrderByDescending(b => b.BktNr)