Config: Add option to specify weighing mode
All checks were successful
Test / Run tests (push) Successful in 2m8s

This commit is contained in:
2025-09-15 21:16:36 +02:00
parent a9b5317e79
commit d7012ebfa1
4 changed files with 26 additions and 18 deletions

View File

@@ -291,7 +291,7 @@ namespace Elwig.Windows {
DateInput.IsReadOnly = true;
TimeInput.IsReadOnly = true;
BranchInput.IsEnabled = false;
GerebeltGewogenInput.IsEnabled = !App.Client.HasNetWeighing(ViewModel.Branch);
GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode != WeighingMode.Net;
OnSecondPassed(null, null);
}
@@ -306,7 +306,7 @@ namespace Elwig.Windows {
}
private void InitialDefaultInputs() {
if (App.Client.HasNetWeighing(ViewModel.Branch)) {
if (App.Config.WeighingMode == WeighingMode.Net) {
GerebeltGewogenInput.IsEnabled = false;
SetDefaultValue(GerebeltGewogenInput, true);
} else {
@@ -315,7 +315,7 @@ namespace Elwig.Windows {
UnsetDefaultValue(GerebeltGewogenInput);
}
if (App.Client.HasBoxWeighing(ViewModel.Branch)) {
if (App.Config.WeighingMode == WeighingMode.Box) {
LesewagenInput.IsEnabled = false;
SetDefaultValue(LesewagenInput, false);
} else {
@@ -323,7 +323,7 @@ namespace Elwig.Windows {
UnsetDefaultValue(LesewagenInput);
}
if (!App.Client.HasNetWeighing(ViewModel.Branch)) {
if (App.Config.WeighingMode != WeighingMode.Net) {
HandPickedInput.IsThreeState = false;
UnsetDefaultValue(HandPickedInput);
} else {
@@ -349,9 +349,9 @@ namespace Elwig.Windows {
ClearOriginalValues();
ClearDefaultValues();
ViewModel.IsNetWeight = App.Client.HasNetWeighing(ViewModel.Branch);
ViewModel.IsNetWeight = App.Config.WeighingMode == WeighingMode.Net;
ViewModel.IsLesewagen = false;
ViewModel.IsHandPicked = !App.Client.HasNetWeighing(ViewModel.Branch) ? true : null;
ViewModel.IsHandPicked = App.Config.WeighingMode != WeighingMode.Net ? true : null;
ViewModel.IsGebunden = null;
InitialDefaultInputs();
@@ -1144,7 +1144,7 @@ namespace Elwig.Windows {
DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
GerebeltGewogenInput.IsEnabled = App.Client.HasNetWeighing(ViewModel.Branch) || Menu_Settings_EnableFreeEditing.IsChecked;
GerebeltGewogenInput.IsEnabled = App.Config.WeighingMode == WeighingMode.Net || Menu_Settings_EnableFreeEditing.IsChecked;
}
private void DisableWeighingButtons() {
@@ -1395,17 +1395,17 @@ namespace Elwig.Windows {
}
private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
}
if (!ViewModel.IsReceipt || App.Client.HasNetWeighing(ViewModel.Branch)) {
if (!ViewModel.IsReceipt || App.Config.WeighingMode == WeighingMode.Net) {
GerebeltGewogenInput.IsChecked ??= false;
}
CheckBox_Changed(sender, evt);
}
private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
if ((IsEditing || IsCreating) && !App.Client.HasNetWeighing(ViewModel.Branch)) {
if ((IsEditing || IsCreating) && App.Config.WeighingMode != WeighingMode.Net) {
GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
}
CheckBox_Changed(sender, evt);