diff --git a/Elwig/Documents/WineQualityStatistics.cs b/Elwig/Documents/WineQualityStatistics.cs
index cf18723..9481622 100644
--- a/Elwig/Documents/WineQualityStatistics.cs
+++ b/Elwig/Documents/WineQualityStatistics.cs
@@ -17,6 +17,7 @@ namespace Elwig.Documents {
public string Filter;
public WineQualityStatisticsData Data;
+ public bool UseOe => Data.UseOe;
public WineQualityStatistics(string filter, WineQualityStatisticsData data) : base($"{Name} {filter}") {
Filter = filter;
diff --git a/Elwig/Documents/WineQualityStatistics.cshtml b/Elwig/Documents/WineQualityStatistics.cshtml
index 5cb1fb2..8eb0db9 100644
--- a/Elwig/Documents/WineQualityStatistics.cshtml
+++ b/Elwig/Documents/WineQualityStatistics.cshtml
@@ -26,15 +26,15 @@
@foreach (var qualIds in Model.QualIds) {
- [°Oe]
+ [@(Model.UseOe ? "°Oe" : "°KMW")]
[#]
[kg]
@foreach (var qualId in qualIds) {
@(Model.QualityLevels.GetValueOrDefault(qualId, qualId))
- @foreach (var (oe, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(int, int, int)>())) {
+ @foreach (var (grad, num, weight) in sec.Data.GetValueOrDefault(qualId, Array.Empty<(double, int, int)>())) {
- @oe
+ @(Model.UseOe ? $"{grad:N0}" : $"{grad:N1}")
@($"{num:N0}")
@($"{weight:N0}")
@@ -45,13 +45,13 @@
|
@foreach (var qualIds in Model.QualIds) {
- var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(int Oe, int Num, int Weight)>()));
+ var quals = qualIds.Select(q => sec.Data.GetValueOrDefault(q, Array.Empty<(double Grad, 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;
+ var grad = quals.Sum(q => q.Sum(kv => kv.Grad * kv.Weight)) / weight;
- @(weight == 0 ? "-" : $"{oe:N0}")
+ @(weight == 0 ? "-" : Model.UseOe ? $"{grad:N0}" : $"{grad:N1}")
@($"{num:N0}")
@($"{weight:N0}")
@@ -64,11 +64,11 @@
@{
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;
+ var totalGrad = sec.Data.Values.Sum(q => q.Sum(kv => kv.Grad * kv.Weight)) / totalWeight;
}
|