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

DeliveryAdminWindow: Show CorrectTareButton also for unloading type box
Test / Run tests (push) Successful in 2m11s
Details

Browse Source
This commit is contained in:
lorenz.stechauner
2026-09-14 16:40:16 +02:00
parent 6441fa4f50
commit 6436762e8d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Elwig/Services/DeliveryService.cs
+1 -1
View File
@@ -60,7 +60,7 @@ namespace Elwig.Services {
vm.Weight = p.Weight; vm.Weight = p.Weight;
vm.ActualTare = p.WeighingInfo.Tare ?? 0; vm.ActualTare = p.WeighingInfo.Tare ?? 0;
vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection; vm.TargetTare = vm.ActualTare + p.WeighingInfo.TareCorrection;
vm.Tare = vm.ActualTare != 0 ? vm.TargetTare ?? vm.ActualTare : null; vm.Tare = vm.TargetTare ?? (vm.ActualTare != 0 ? vm.ActualTare : null);
vm.IsManualWeighing = p.IsManualWeighing; vm.IsManualWeighing = p.IsManualWeighing;
vm.IsNetWeight = p.IsNetWeight; vm.IsNetWeight = p.IsNetWeight;
Elwig/Windows/DeliveryAdminWindow.xaml.cs
+3 -1
View File
@@ -614,7 +614,7 @@ namespace Elwig.Windows {
ClearOriginalValues(); ClearOriginalValues();
ClearDefaultValues(); ClearDefaultValues();
ViewModel.FillInputs(p); ViewModel.FillInputs(p);
CorrectTareButton.Visibility = !ViewModel.IsReceipt && p.WeighingInfo.Tare != null && p.WeighingInfo.Tare != 0 ? Visibility.Visible : Visibility.Hidden; CorrectTareButton.Visibility = !ViewModel.IsReceipt && (ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox) ? Visibility.Visible : Visibility.Hidden;
FinishInputFilling(); FinishInputFilling();
} }
@@ -1409,6 +1409,8 @@ namespace Elwig.Windows {
private void UnloadingInput_Checked(object sender, RoutedEventArgs evt) { private void UnloadingInput_Checked(object sender, RoutedEventArgs evt) {
if (!IsEditing && !IsCreating) return; if (!IsEditing && !IsCreating) return;
if (!ViewModel.IsReceipt)
CorrectTareButton.Visibility = ViewModel.ActualTare != 0 || ViewModel.IsUnloadingBox ? Visibility.Visible : Visibility.Hidden;
var mod = ViewModel.Modifiers.ToList(); var mod = ViewModel.Modifiers.ToList();
var source = ViewModel.ModifiersSource.ToList(); var source = ViewModel.ModifiersSource.ToList();
if (App.Client.IsMatzen) { if (App.Client.IsMatzen) {