winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

[#40] DeliveryConfirmation: Add column indication gross/net weight

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-08 15:18:47 +01:00
parent ccd4a58007
commit e1201bc6b8
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Elwig/Documents/DeliveryConfirmation.cshtml
View File

@ -11,13 +11,14 @@
<col style="width: 25mm;"/> <col style="width: 25mm;"/>
<col style="width: 5mm;"/> <col style="width: 5mm;"/>
<col style="width: 24mm;"/> <col style="width: 24mm;"/>
<col style="width: 16mm;"/>
<col style="width: 17mm;"/> <col style="width: 17mm;"/>
<col style="width: 19mm;"/>
<col style="width: 10mm;"/> <col style="width: 10mm;"/>
<col style="width: 10mm;"/> <col style="width: 10mm;"/>
<col style="width: 15mm;"/> <col style="width: 15mm;"/>
<col style="width: 12mm;"/> <col style="width: 12mm;"/>
<col style="width: 14mm;"/> <col style="width: 14mm;"/>
<col style="width: 3mm;"/>
<col style="width: 14mm;"/> <col style="width: 14mm;"/>
</colgroup> </colgroup>
<thead> <thead>
@ -30,6 +31,14 @@
<th colspan="2">Gradation</th> <th colspan="2">Gradation</th>
<th colspan="2">Flächenbindung</th> <th colspan="2">Flächenbindung</th>
<th>Gewicht</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> <th>Davon<br/>abzuwerten</th>
</tr> </tr>
<tr> <tr>
@ -72,8 +81,10 @@
} }
@if (i == p.Buckets.Length - 1) { @if (i == p.Buckets.Length - 1) {
<td class="number">@($"{p.Weight:N0}")</td> <td class="number">@($"{p.Weight:N0}")</td>
<td class="small">@(p.IsNetWeight ? "n" : "b")</td>
} else { } else {
<td></td> <td></td>
<td></td>
} }
@if (first) { @if (first) {
<td rowspan="@rows" class="number"></td> <td rowspan="@rows" class="number"></td>

2
Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs
View File

@ -78,6 +78,7 @@ namespace Elwig.Models.Dtos {
public (double Oe, double Kmw) Gradation; public (double Oe, double Kmw) Gradation;
public string[] Modifiers; public string[] Modifiers;
public int Weight; public int Weight;
public bool IsNetWeight;
public (string Name, int Value)[] Buckets; public (string Name, int Value)[] Buckets;
public DeliveryConfirmationDeliveryRow(DeliveryPart p) { public DeliveryConfirmationDeliveryRow(DeliveryPart p) {
@ -93,6 +94,7 @@ namespace Elwig.Models.Dtos {
.Select(m => m.Name) .Select(m => m.Name)
.ToArray(); .ToArray();
Weight = p.Weight; Weight = p.Weight;
IsNetWeight = p.IsNetWeight;
Buckets = p.Buckets Buckets = p.Buckets
.Where(b => b.Value > 0) .Where(b => b.Value > 0)
.OrderByDescending(b => b.BktNr) .OrderByDescending(b => b.BktNr)