From 470110ef5bb3ddca49ba233741c3f159accbb40e Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 17 Sep 2024 08:47:43 +0200 Subject: [PATCH] Ensure both or none of the tidal window times are set when leaving the agency dialogs --- src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs | 6 ++++++ src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs | 6 ++++++ src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs | 6 ++++++ src/BreCalClient/Resources/Resources.Designer.cs | 9 +++++++++ src/BreCalClient/Resources/Resources.de.resx | 3 +++ src/BreCalClient/Resources/Resources.resx | 3 +++ 6 files changed, 33 insertions(+) diff --git a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs index b1eba3b..e259adf 100644 --- a/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs +++ b/src/BreCalClient/EditTimesAgencyIncomingControl.xaml.cs @@ -133,6 +133,12 @@ namespace BreCalClient return false; } + if((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue)) + { + message = BreCalClient.Resources.Resources.textTidalBothValues; + return false; + } + return true; } diff --git a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs index 7258006..615236a 100644 --- a/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs +++ b/src/BreCalClient/EditTimesAgencyOutgoingControl.xaml.cs @@ -143,6 +143,12 @@ namespace BreCalClient return false; } + if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue)) + { + message = BreCalClient.Resources.Resources.textTidalBothValues; + return false; + } + return true; } diff --git a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs index e8398ce..aa34817 100644 --- a/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs +++ b/src/BreCalClient/EditTimesAgencyShiftingControl.xaml.cs @@ -151,6 +151,12 @@ namespace BreCalClient return false; } + if ((this.datePickerTidalWindowFrom.Value.HasValue && !this.datePickerTidalWindowTo.Value.HasValue) || (!this.datePickerTidalWindowFrom.Value.HasValue && this.datePickerTidalWindowTo.Value.HasValue)) + { + message = BreCalClient.Resources.Resources.textTidalBothValues; + return false; + } + return true; } diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index aeada56..2cc1e8c 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -1208,6 +1208,15 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized string similar to For a tidal window both values must be set. + /// + public static string textTidalBothValues { + get { + return ResourceManager.GetString("textTidalBothValues", resourceCulture); + } + } + /// /// Looks up a localized string similar to Tidal window. /// diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx index 18947eb..cdd4e08 100644 --- a/src/BreCalClient/Resources/Resources.de.resx +++ b/src/BreCalClient/Resources/Resources.de.resx @@ -541,4 +541,7 @@ Zeit Reviereintritt liegt in der Vergangenheit + + Für das Tidenfenster müssen beide Zeiten angegeben werden + \ No newline at end of file diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index 14cf0f9..28af8fe 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -487,6 +487,9 @@ Terminal + + For a tidal window both values must be set + Tidal window