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

[#30] WineQualityStatistics: Add number of deliveries

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-28 13:18:32 +01:00
parent d011c69812
commit 82ea5920f2
3 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Elwig/Documents/WineQualityStatistics.cshtml
View File

@ -27,14 +27,16 @@
<td class="container">
<div class="row">
<span class="units">[°Oe]</span>
<span class="units">[#]</span>
<span class="units">[kg]</span>
</div>
@foreach (var qualId in qualIds) {
<h4>@(Model.QualityLevels.GetValueOrDefault(qualId, qualId))</h4>
@foreach (var (oe, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(int, int)>())) {
@foreach (var (oe, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(int, int, int)>())) {
<div class="row">
<span class="oe">@oe</span>
<span class="weight">@($"{weight:N0}")</span>
<span class="number">@($"{num:N0}")</span>
<span class="number">@($"{weight:N0}")</span>
</div>
}
}
@ -43,13 +45,15 @@
</tr>
<tr>
@foreach (var qualIds in Model.QualIds) {
var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(int, int)>()));
var weight = quals.Sum(q => q.Sum(kv => kv.Item2));
var oe = quals.Sum(q => q.Sum(kv => (double)kv.Item1 * kv.Item2)) / weight;
var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(int Oe, int Num, int Weight)>()));
var weight = quals.Sum(q => q.Sum(kv => kv.Weight));
var num = quals.Sum(q => q.Sum(kv => kv.Num));
var oe = quals.Sum(q => q.Sum(kv => (double)kv.Oe * kv.Weight)) / weight;
<td class="container bold">
<div class="row">
<span class="oe">@(weight == 0 ? "" : $"{oe:N0}")</span>
<span class="weight">@($"{weight:N0}")</span>
<span class="oe">@(weight == 0 ? "-" : $"{oe:N0}")</span>
<span class="number">@($"{num:N0}")</span>
<span class="number">@($"{weight:N0}")</span>
</div>
</td>
}
@ -59,12 +63,14 @@
<tr>
@{
var totalWeight = sec.Data.Values.Sum(q => q.Sum(kv => kv.Weight));
var totalNum = sec.Data.Values.Sum(q => q.Sum(kv => kv.Num));
var totalOe = sec.Data.Values.Sum(q => q.Sum(kv => (double)kv.Oe * kv.Weight)) / totalWeight;
}
<td colspan="4" class="container bold footer @(sec.Type == "R" ? "red" : sec.Type == "W" ? "green" : "")">
<div class="row" style="width: 24%; margin-left: 76%;">
<span class="oe">@(totalWeight == 0 ? "" : $"{totalOe:N0}")</span>
<span class="weight">@($"{totalWeight:N0}")</span>
<span class="oe">@(totalWeight == 0 ? "-" : $"{totalOe:N0}")</span>
<span class="number">@($"{totalNum:N0}")</span>
<span class="number">@($"{totalWeight:N0}")</span>
</div>
</td>
</tr>

5
Elwig/Documents/WineQualityStatistics.css
View File

@ -88,6 +88,9 @@ table .footer.green {
text-align: center;
}
.weight {
.number {
text-align: right;
}
.row span:first-child { flex-basis: 7.5mm; }
.row span:last-child { flex-basis: 15mm; }