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

Database: Change bins once again...

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-10-15 22:46:19 +02:00
parent 4db147e582
commit 3b4340b5e8
10 changed files with 115 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Elwig/Documents/DeliveryConfirmation.cshtml
View File

@ -44,7 +44,7 @@
var lastSortId = "";
}
@foreach (var p in Model.Deliveries) {
var bins = p.Bins.Select((b, n) => (b, n + 1)).Where(b => b.Item1 > 0).ToArray();
var bins = p.Bins.Where(b => b.Value > 0).OrderByDescending(b => b.BinNr).ToArray();
var rowsBins = bins.Length;
var mods = p.Modifiers.Select(m => m.Name).ToArray();
var rowsMod = mods.Length + 1;
@ -67,17 +67,9 @@
<td colspan="3"></td>
}
@if (i < bins.Length) {
var (b, n) = bins[i];
string name = "";
switch (n) {
case 1: name = $"geb. {p.SortId}{string.Join("", p.Attributes.Order().Select(a => a.AttrId).Take(2))}"; break;
case 2: name = $"geb. {p.SortId}{p.Attributes.Select(a => a.AttrId).Order().FirstOrDefault()}"; break;
case 3: name = $"geb. {p.SortId}{p.Attributes.Select(a => a.AttrId).Order().Skip(1).FirstOrDefault()}"; break;
case 4: name = $"geb. {p.SortId}"; break;
case 5: name = "ungeb."; break;
}
<td class="geb">@name:</td>
<td class="weight">@($"{b:N0}")</td>
var bin = bins[i];
<td class="geb">@(bin.Discr == "_" ? "ungeb." : $"geb. {p.SortId}{bin.Discr}"):</td>
<td class="weight">@($"{bin.Value:N0}")</td>
} else {
<td colspan="2"></td>
}
@ -97,4 +89,6 @@
</tr>
</tbody>
</table>
<!-- TODO add Gesamtlieferung tabelle -->
<!-- TODO add Freitext -->
</main>