TareCorrectionDialog: Allow actual tare to be null

This commit is contained in:
2026-09-16 17:23:12 +02:00
parent 15e191d74e
commit 0e9121c462
5 changed files with 19 additions and 17 deletions
+3 -3
View File
@@ -37,7 +37,7 @@ namespace Elwig.Services {
vm.GradationKmwString = "";
vm.Weight = null;
vm.ActualTare = 0;
vm.ActualTare = null;
vm.TargetTare = null;
vm.Tare = null;
vm.IsManualWeighing = false;
@@ -58,9 +58,9 @@ namespace Elwig.Services {
vm.WineOrigin = ControlUtils.GetItemFromSourceWithPk(vm.WineOriginSource, p.HkId) as WineOrigin;
vm.Weight = p.Weight;
vm.ActualTare = p.WeighingInfo.Tare ?? 0;
vm.ActualTare = p.WeighingInfo.Tare;
vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
vm.Tare = vm.TargetTare ?? (vm.ActualTare is int t && t != 0 ? t : null);
vm.IsManualWeighing = p.IsManualWeighing;
vm.IsNetWeight = p.IsNetWeight;