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

Simplify client check in code

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-08-24 21:35:45 +02:00
parent 6261217e7c
commit ba71618463
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/App.xaml.cs
View File

@ -29,7 +29,7 @@ namespace Elwig {
public static string? BranchFaxNr { get; private set; } public static string? BranchFaxNr { get; private set; }
public static string? BranchMobileNr { get; private set; } public static string? BranchMobileNr { get; private set; }
public static IList<IScale> Scales { get; private set; } public static IList<IScale> 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 bool IsPrintingReady => Documents.Html.IsReady && Documents.Pdf.IsReady;
public static Dispatcher MainDispatcher { get; private set; } public static Dispatcher MainDispatcher { get; private set; }

3
Elwig/Helpers/ClientParameters.cs
View File

@ -7,6 +7,9 @@ namespace Elwig.Helpers {
public enum Type { Matzen, GWK }; public enum Type { Matzen, GWK };
public bool IsMatzen => Client == Type.Matzen;
public bool IsGWK => Client == Type.GWK;
public string NameToken; public string NameToken;
public string NameShort; public string NameShort;
public string NameShortened; public string NameShortened;

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

@ -79,7 +79,7 @@ namespace Elwig.Windows {
WeighingDButton.Visibility = Visibility.Hidden; WeighingDButton.Visibility = Visibility.Hidden;
} }
if (App.Client.Client == ClientParameters.Type.Matzen) { if (App.Client.IsMatzen) {
SetDefaultValue(GerebeltGewogenInput, true); SetDefaultValue(GerebeltGewogenInput, true);
} }
} }
@ -133,7 +133,7 @@ namespace Elwig.Windows {
private void InitialInputs() { private void InitialInputs() {
HandPickedInput.IsChecked = null; HandPickedInput.IsChecked = null;
SetDefaultValue(HandPickedInput, null); SetDefaultValue(HandPickedInput, null);
if (App.Client.Client == ClientParameters.Type.Matzen) { if (App.Client.IsMatzen) {
GerebeltGewogenInput.IsChecked = true; GerebeltGewogenInput.IsChecked = true;
GerebeltGewogenInput.IsEnabled = false; GerebeltGewogenInput.IsEnabled = false;
} else { } else {
@ -1109,7 +1109,7 @@ namespace Elwig.Windows {
} }
private void ModifiersInput_SelectionChanged(object sender, ItemSelectionChangedEventArgs evt) { 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<Modifier>(); var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
var kl = mod.Where(m => m.Name.StartsWith("Klasse ")); var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
if (kl.Count() > 1) { if (kl.Count() > 1) {
@ -1119,7 +1119,7 @@ namespace Elwig.Windows {
} }
private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) { 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<Modifier>(); var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0]; var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
if (LesewagenInput.IsChecked == true) kl++; else kl--; if (LesewagenInput.IsChecked == true) kl++; else kl--;