From ba716184638a8b5d98c4f4332bf744a3c6af3ecf Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 24 Aug 2023 21:35:45 +0200 Subject: [PATCH] Simplify client check in code --- Elwig/App.xaml.cs | 2 +- Elwig/Helpers/ClientParameters.cs | 3 +++ Elwig/Windows/DeliveryAdminWindow.xaml.cs | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs index 0d02224..3371549 100644 --- a/Elwig/App.xaml.cs +++ b/Elwig/App.xaml.cs @@ -29,7 +29,7 @@ namespace Elwig { public static string? BranchFaxNr { get; private set; } public static string? BranchMobileNr { get; private set; } public static IList Scales { get; private set; } - public static ClientParameters Client { get; private set; } + public static ClientParameters Client { get; private set; } public static bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady; public static Dispatcher MainDispatcher { get; private set; } diff --git a/Elwig/Helpers/ClientParameters.cs b/Elwig/Helpers/ClientParameters.cs index 8a1d005..3e4d369 100644 --- a/Elwig/Helpers/ClientParameters.cs +++ b/Elwig/Helpers/ClientParameters.cs @@ -7,6 +7,9 @@ namespace Elwig.Helpers { public enum Type { Matzen, GWK }; + public bool IsMatzen => Client == Type.Matzen; + public bool IsGWK => Client == Type.GWK; + public string NameToken; public string NameShort; public string NameShortened; diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index 751b4b3..dc28635 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -79,7 +79,7 @@ namespace Elwig.Windows { WeighingDButton.Visibility = Visibility.Hidden; } - if (App.Client.Client == ClientParameters.Type.Matzen) { + if (App.Client.IsMatzen) { SetDefaultValue(GerebeltGewogenInput, true); } } @@ -133,7 +133,7 @@ namespace Elwig.Windows { private void InitialInputs() { HandPickedInput.IsChecked = null; SetDefaultValue(HandPickedInput, null); - if (App.Client.Client == ClientParameters.Type.Matzen) { + if (App.Client.IsMatzen) { GerebeltGewogenInput.IsChecked = true; GerebeltGewogenInput.IsEnabled = false; } else { @@ -1109,7 +1109,7 @@ namespace Elwig.Windows { } private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) { - if ((IsEditing || IsCreating) && App.Client.Client == ClientParameters.Type.Matzen) { + if ((IsEditing || IsCreating) && App.Client.IsMatzen) { var mod = ModifiersInput.SelectedItems.Cast(); var kl = mod.Where(m => m.Name.StartsWith("Klasse ")); if (kl.Count() > 1) { @@ -1119,7 +1119,7 @@ namespace Elwig.Windows { } private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) { - if ((IsEditing || IsCreating) && App.Client.Client == ClientParameters.Type.Matzen) { + if ((IsEditing || IsCreating) && App.Client.IsMatzen) { var mod = ModifiersInput.SelectedItems.Cast(); var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0]; if (LesewagenInput.IsChecked == true) kl++; else kl--;