From 83a82c17c670ea9caf112e389bd096e17602f49a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 24 Aug 2023 17:50:01 +0200 Subject: [PATCH] Small fixes in DeliveryAdminWindow --- Elwig/Documents/DeliveryNote.cshtml | 2 +- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index 039db4d..c9d3d92 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -59,7 +59,7 @@ } } - @(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")) @if (part.Comment != null) { Anmerkung: @part.Comment diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index a11b4d1..2018261 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -471,6 +471,9 @@ namespace Elwig.Windows { LesewagenInput.IsChecked = p?.IsLesewagen ?? false; HandPickedInput.IsChecked = p?.IsHandPicked; + ScaleId = p?.ScaleId; + WeighingId = p?.WeighingId; + FinishInputFilling(); }