winzer/elwig
2
1
Fork 0
Code Issues 11 Pull Requests Actions Releases 52 Activity

DeliveryAdminWindow: Make GerebeltGewogenInput required in Matzen
All checks were successful
Test / Run tests (push) Successful in 1m49s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-09-15 11:28:57 +02:00
parent f02598760f
commit a9b5317e79
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Elwig/Windows/AdministrationWindow.cs
View File

@@ -13,8 +13,8 @@ using System.Windows.Input;
namespace Elwig.Windows { namespace Elwig.Windows {
public abstract class AdministrationWindow : ContextWindow { public abstract class AdministrationWindow : ContextWindow {
protected Control[] ExemptInputs { private get; set; } protected Control[] ExemptInputs { get; set; }
protected Control[] RequiredInputs { private get; set; } protected Control[] RequiredInputs { get; set; }
private bool _isEditing; private bool _isEditing;
private bool _isCreating; private bool _isCreating;
@@ -166,8 +166,10 @@ namespace Elwig.Windows {
Valid[input] = false; Valid[input] = false;
} else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) { } else if (input is ComboBox cb && cb.SelectedItem == null && cb.ItemsSource != null && cb.ItemsSource.Cast<object>().Any()) {
ControlUtils.SetInputInvalid(input); ControlUtils.SetInputInvalid(input);
Valid[input] = false;
} else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) { } else if (input is ListBox lb && lb.SelectedItem == null && lb.ItemsSource != null && lb.ItemsSource.Cast<object>().Any()) {
ControlUtils.SetInputInvalid(input); ControlUtils.SetInputInvalid(input);
Valid[input] = false;
} else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) { } else if (input is CheckBox ckb && ((ckb.IsThreeState && ckb.IsChecked == null) || (!ckb.IsThreeState && ckb.IsChecked != true))) {
ControlUtils.SetInputInvalid(input); ControlUtils.SetInputInvalid(input);
Valid[input] = false; Valid[input] = false;

6
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@@ -89,6 +89,9 @@ namespace Elwig.Windows {
foreach (var s in App.EventScales) { foreach (var s in App.EventScales) {
s.WeighingEvent += Scale_Weighing; s.WeighingEvent += Scale_Weighing;
} }
if (App.Client.IsMatzen) {
RequiredInputs = [.. RequiredInputs, ModifiersInput];
}
} else { } else {
WeighingManualButton.Visibility = Visibility.Hidden; WeighingManualButton.Visibility = Visibility.Hidden;
WeighingAButton.Visibility = Visibility.Hidden; WeighingAButton.Visibility = Visibility.Hidden;
@@ -278,6 +281,7 @@ namespace Elwig.Windows {
DateInput.IsReadOnly = false; DateInput.IsReadOnly = false;
TimeInput.IsReadOnly = false; TimeInput.IsReadOnly = false;
BranchInput.IsEnabled = true; BranchInput.IsEnabled = true;
GerebeltGewogenInput.IsEnabled = true;
if (IsCreating) ViewModel.Time = ""; if (IsCreating) ViewModel.Time = "";
OnSecondPassed(null, null); OnSecondPassed(null, null);
} }
@@ -287,6 +291,7 @@ namespace Elwig.Windows {
DateInput.IsReadOnly = true; DateInput.IsReadOnly = true;
TimeInput.IsReadOnly = true; TimeInput.IsReadOnly = true;
BranchInput.IsEnabled = false; BranchInput.IsEnabled = false;
GerebeltGewogenInput.IsEnabled = !App.Client.HasNetWeighing(ViewModel.Branch);
OnSecondPassed(null, null); OnSecondPassed(null, null);
} }
@@ -1139,6 +1144,7 @@ namespace Elwig.Windows {
DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked; DateInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked; TimeInput.IsReadOnly = !Menu_Settings_EnableFreeEditing.IsChecked;
BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked; BranchInput.IsEnabled = Menu_Settings_EnableFreeEditing.IsChecked;
GerebeltGewogenInput.IsEnabled = App.Client.HasNetWeighing(ViewModel.Branch) || Menu_Settings_EnableFreeEditing.IsChecked;
} }
private void DisableWeighingButtons() { private void DisableWeighingButtons() {