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

ClientParameters: Add WG Weinland and Baden

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-02-21 11:16:52 +01:00
parent 3f2b5b684c
commit 583d5b4e3e
3 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Elwig/Helpers/ClientParameters.cs
View File

@ -7,20 +7,20 @@ using System.Threading.Tasks;
namespace Elwig.Helpers { namespace Elwig.Helpers {
public class ClientParameters { public class ClientParameters {
public enum Type { Matzen, Winzerkeller }; public enum Type { Matzen, Winzerkeller, Weinland, Baden };
public bool IsMatzen => Client == Type.Matzen; public bool IsMatzen => Client == Type.Matzen;
public bool IsWinzerkeller => Client == Type.Winzerkeller; public bool IsWinzerkeller => Client == Type.Winzerkeller;
public bool IsWolkersdorf => Client == Type.Winzerkeller && App.ZwstId == "W"; public bool IsWeinland => Client == Type.Weinland;
public bool IsHaugsdorf => Client == Type.Winzerkeller && App.ZwstId == "H"; public bool IsBaden => Client == Type.Baden;
public bool IsSitzendorf => Client == Type.Winzerkeller && App.ZwstId == "S"; public bool IsWolkersdorf => IsWinzerkeller && App.ZwstId == "W";
public bool IsHaugsdorf => IsWinzerkeller && App.ZwstId == "H";
public bool IsSitzendorf => IsWinzerkeller && App.ZwstId == "S";
public bool IsGrInzersdorf => IsWeinland;
public bool HasRebler(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W"); public bool HasNetWeighing(string? zwstId) => IsMatzen || (IsWinzerkeller && zwstId == "W");
public bool HasRebler(Branch? b) => HasRebler(b?.ZwstId); public bool HasNetWeighing(Branch? b) => HasNetWeighing(b?.ZwstId);
public bool HasRebler() => HasRebler(App.ZwstId); public bool HasNetWeighing() => HasNetWeighing(App.ZwstId);
public bool HasKisten(string? zwstId) => IsWinzerkeller && (zwstId == "H" || zwstId == "S");
public bool HasKisten(Branch? b) => HasKisten(b?.ZwstId);
public bool HasKisten() => HasKisten(App.ZwstId);
public string NameToken; public string NameToken;
public string NameShort; public string NameShort;
@ -36,8 +36,8 @@ namespace Elwig.Helpers {
public PostalDest PostalDest { public PostalDest PostalDest {
set { set {
Plz = value.AtPlz.Plz; Plz = value.AtPlz!.Plz;
Ort = value.AtPlz.Ort.Name; Ort = value.AtPlz!.Ort.Name;
} }
} }
public int Plz; public int Plz;
@ -72,8 +72,14 @@ namespace Elwig.Helpers {
NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX"); NameSuffix = parameters.GetValueOrDefault("CLIENT_NAME_SUFFIX");
NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException(); NameType = parameters["CLIENT_NAME_TYPE"] ?? throw new KeyNotFoundException();
switch (Name) { switch (Name) {
case "Winzergenossenschaft für Matzen und Umgebung": Client = Type.Matzen; break; case "Winzergenossenschaft für Matzen und Umgebung":
case "Winzerkeller im Weinviertel": Client = Type.Winzerkeller; break; Client = Type.Matzen; break;
case "Winzerkeller im Weinviertel":
Client = Type.Winzerkeller; break;
case "Winzergenossenschaft Weinland":
Client = Type.Weinland; break;
case "Winzergenossenschaft Baden - Bad Vöslau":
Client = Type.Baden; break;
}; };
Plz = int.Parse(parameters["CLIENT_PLZ"] ?? ""); Plz = int.Parse(parameters["CLIENT_PLZ"] ?? "");
@ -115,7 +121,7 @@ namespace Elwig.Helpers {
case 2: deliveryNoteStats = "SHORT"; break; case 2: deliveryNoteStats = "SHORT"; break;
case 3: deliveryNoteStats = "FULL"; break; case 3: deliveryNoteStats = "FULL"; break;
} }
return new (string, string?)[] { return [
("CLIENT_NAME_TOKEN", NameToken), ("CLIENT_NAME_TOKEN", NameToken),
("CLIENT_NAME_SHORT", NameShort), ("CLIENT_NAME_SHORT", NameShort),
("CLIENT_NAME", Name), ("CLIENT_NAME", Name),
@ -137,7 +143,7 @@ namespace Elwig.Helpers {
("TEXT_DELIVERYNOTE", TextDeliveryNote), ("TEXT_DELIVERYNOTE", TextDeliveryNote),
("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation), ("TEXT_DELIVERYCONFIRMATION", TextDeliveryConfirmation),
("TEXT_CREDITNOTE", TextCreditNote), ("TEXT_CREDITNOTE", TextCreditNote),
}; ];
} }
public async Task UpdateValues() { public async Task UpdateValues() {

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

@ -218,7 +218,7 @@ namespace Elwig.Windows {
} }
private void InitialDefaultInputs() { private void InitialDefaultInputs() {
if (App.Client.HasRebler(BranchInput.SelectedValue as Branch)) { if (App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch)) {
GerebeltGewogenInput.IsEnabled = false; GerebeltGewogenInput.IsEnabled = false;
SetDefaultValue(GerebeltGewogenInput, true); SetDefaultValue(GerebeltGewogenInput, true);
} else { } else {
@ -226,7 +226,7 @@ namespace Elwig.Windows {
UnsetDefaultValue(GerebeltGewogenInput); UnsetDefaultValue(GerebeltGewogenInput);
} }
if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) { if (!App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch)) {
LesewagenInput.IsEnabled = false; LesewagenInput.IsEnabled = false;
SetDefaultValue(LesewagenInput, false); SetDefaultValue(LesewagenInput, false);
HandPickedInput.IsThreeState = false; HandPickedInput.IsThreeState = false;
@ -256,9 +256,9 @@ namespace Elwig.Windows {
ClearOriginalValues(); ClearOriginalValues();
ClearDefaultValues(); ClearDefaultValues();
GerebeltGewogenInput.IsChecked = App.Client.HasRebler(BranchInput.SelectedValue as Branch); GerebeltGewogenInput.IsChecked = App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch);
LesewagenInput.IsChecked = false; LesewagenInput.IsChecked = false;
HandPickedInput.IsChecked = App.Client.HasKisten(BranchInput.SelectedValue as Branch) ? true : null; HandPickedInput.IsChecked = !App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch) ? true : null;
GebundenInput.IsChecked = null; GebundenInput.IsChecked = null;
InitialDefaultInputs(); InitialDefaultInputs();
@ -1731,14 +1731,14 @@ namespace Elwig.Windows {
} }
private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) { private void GerebeltGewogenInput_Changed(object sender, RoutedEventArgs evt) {
if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) { if (!App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch)) {
HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked; HandPickedInput.IsChecked = !GerebeltGewogenInput.IsChecked;
} }
CheckBox_Changed(sender, evt); CheckBox_Changed(sender, evt);
} }
private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) { private void HandPickedInput_Changed(object sender, RoutedEventArgs evt) {
if (App.Client.HasKisten(BranchInput.SelectedValue as Branch)) { if (!App.Client.HasNetWeighing(BranchInput.SelectedValue as Branch)) {
GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked; GerebeltGewogenInput.IsChecked = !HandPickedInput.IsChecked;
} }
CheckBox_Changed(sender, evt); CheckBox_Changed(sender, evt);

1
Elwig/Windows/MainWindow.xaml.cs
View File

@ -9,6 +9,7 @@ namespace Elwig.Windows {
InitializeComponent(); InitializeComponent();
var v = Assembly.GetExecutingAssembly().GetName().Version; var v = Assembly.GetExecutingAssembly().GetName().Version;
VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}"; VersionField.Text = "Version: " + (v == null ? "?" : $"{v.Major}.{v.Minor}.{v.Build}") + $" – {App.BranchName}";
if (App.Client.Client == null) VersionField.Text += " (Unbekannt)";
if (!App.Config.Debug) { if (!App.Config.Debug) {
TestWindowButton.Visibility = Visibility.Hidden; TestWindowButton.Visibility = Visibility.Hidden;
//QueryWindowButton.Visibility = Visibility.Hidden; //QueryWindowButton.Visibility = Visibility.Hidden;