diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml
index 2ae1c4f..83b32a0 100644
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -90,7 +90,8 @@
}
}
|
- @Raw(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
+ @Raw(part.ManualWeighing ? "Handwiegung" : $"Waage: {part.ScaleId ?? "?"}, ID: {part.WeighingId ?? "?"}")
+ (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", Begründung:" : "") @part.WeighingReason
|
@if (part.Comment != null) {
| Anmerkung: @part.Comment |
@@ -153,7 +154,7 @@
@Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
@foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
- if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1)) {
+ if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
@name |
@Raw(FormatRow(obligation, right, sum))
diff --git a/Elwig/Models/DeliveryPart.cs b/Elwig/Models/DeliveryPart.cs
index 2de5e6c..759ec31 100644
--- a/Elwig/Models/DeliveryPart.cs
+++ b/Elwig/Models/DeliveryPart.cs
@@ -87,6 +87,9 @@ namespace Elwig.Models {
[Column("weighing_id")]
public string? WeighingId { get; set; }
+ [Column("weighing_reason")]
+ public string? WeighingReason { get; set; }
+
[Column("comment")]
public string? Comment { get; set; }
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index 4c7adc6..c50adf1 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -530,6 +530,7 @@ namespace Elwig.Windows {
ScaleId = p?.ScaleId;
WeighingId = p?.WeighingId;
+ ManualWeighingReason = p?.WeighingReason;
FinishInputFilling();
}
@@ -591,8 +592,7 @@ namespace Elwig.Windows {
p.ManualWeighing = ManualWeighingInput.IsChecked ?? false;
p.ScaleId = ScaleId;
p.WeighingId = WeighingId;
- if (ManualWeighingReason != null)
- p.Comment = (p.Comment != null ? $"{p.Comment} / " : "") + $"Begründung Handwiegung: {ManualWeighingReason}";
+ p.WeighingReason = ManualWeighingReason;
EntityEntry? dEntry = null;
EntityEntry? pEntry = null;