From 14569ad7bc754e9d9712e70c7d92f35b05f30766 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 22 Jul 2024 08:51:20 +0200 Subject: [PATCH] Reset values button on times and times terminal dialog boxes to completely undo entries. Also fixed bug where clear context menu was disabled and wouldn't disappear --- src/BreCalClient/BreCalClient.csproj | 2 ++ src/BreCalClient/EditTimesControl.xaml | 3 +++ src/BreCalClient/EditTimesControl.xaml.cs | 17 ++++++++++++++++ .../EditTimesTerminalControl.xaml | 5 ++++- .../EditTimesTerminalControl.xaml.cs | 18 ++++++++++++++++- .../Resources/Resources.Designer.cs | 19 ++++++++++++++++++ src/BreCalClient/Resources/Resources.de.resx | 3 +++ src/BreCalClient/Resources/Resources.resx | 6 ++++++ src/BreCalClient/Resources/nav_undo_red.png | Bin 0 -> 1643 bytes 9 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/BreCalClient/Resources/nav_undo_red.png diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj index 0d25c00..9ffba81 100644 --- a/src/BreCalClient/BreCalClient.csproj +++ b/src/BreCalClient/BreCalClient.csproj @@ -39,6 +39,7 @@ + @@ -96,6 +97,7 @@ + diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml index fdfa2fd..ad03ed9 100644 --- a/src/BreCalClient/EditTimesControl.xaml +++ b/src/BreCalClient/EditTimesControl.xaml @@ -155,6 +155,9 @@ diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs index 710e81f..dfd841d 100644 --- a/src/BreCalClient/EditTimesControl.xaml.cs +++ b/src/BreCalClient/EditTimesControl.xaml.cs @@ -65,6 +65,22 @@ namespace BreCalClient SetLockButton(newValue); } + private void buttonClearAll_Click(object sender, RoutedEventArgs e) + { + if (System.Windows.MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) + { + this.datePickerETABerth.Value = null; + this.datePickerETABerth_End.Value = null; + this.datePickerETDBerth.Value = null; + this.datePickerETDBerth_End.Value = null; + this.datePickerATA.Value = null; + this.datePickerATD.Value = null; + this.datePickerLockTime.Value = null; + this.datePickerZoneEntry.Value = null; + this.textBoxRemarks.Text = null; + } + } + #endregion #region private methods @@ -183,6 +199,7 @@ namespace BreCalClient this.datePickerETDBerth.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting); this.datePickerETDBerth_End.IsEnabled = (ShipcallModel.Shipcall?.Type == ShipcallType.Departure || ShipcallModel.Shipcall?.Type == ShipcallType.Shifting); this.textBoxRemarks.IsReadOnly = false; + this.buttonClearAll.IsEnabled = true; switch (pType) { diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml index 86008cd..6875bca 100644 --- a/src/BreCalClient/EditTimesTerminalControl.xaml +++ b/src/BreCalClient/EditTimesTerminalControl.xaml @@ -115,8 +115,11 @@ - diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs index 92f8111..6071ba9 100644 --- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs +++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs @@ -76,6 +76,21 @@ namespace BreCalClient this.comboBoxPierside.SelectedIndex = -1; } + private void buttonClearAll_Click(object sender, RoutedEventArgs e) + { + if (MessageBox.Show(BreCalClient.Resources.Resources.textClearAll, BreCalClient.Resources.Resources.textConfirmation, MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes) + { + this.datePickerOperationStart.Value = null; + this.datePickerOperationStart_End.Value = null; + this.datePickerOperationEnd.Value = null; + this.datePickerOperationEnd_End.Value = null; + this.comboBoxBerth.SelectedIndex = -1; + this.comboBoxPierside.SelectedIndex = -1; + this.textBoxRemarks.Text = null; + this.textBoxBerthRemarks.Text = null; + } + } + #endregion #region private methods @@ -151,8 +166,9 @@ namespace BreCalClient this.comboBoxPierside.IsEnabled = ShipcallModel.Shipcall?.Type == ShipcallType.Arrival; this.textBoxBerthRemarks.IsReadOnly = ShipcallModel.Shipcall?.Type != ShipcallType.Arrival; this.textBoxRemarks.IsReadOnly = false; + this.buttonClearAll.IsEnabled = true; - } + } #endregion diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs index 679e66a..492ef15 100644 --- a/src/BreCalClient/Resources/Resources.Designer.cs +++ b/src/BreCalClient/Resources/Resources.Designer.cs @@ -278,6 +278,16 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized resource of type System.Byte[]. + /// + public static byte[] nav_undo_red { + get { + object obj = ResourceManager.GetObject("nav_undo_red", resourceCulture); + return ((byte[])(obj)); + } + } + /// /// Looks up a localized string similar to Shifting. /// @@ -469,6 +479,15 @@ namespace BreCalClient.Resources { } } + /// + /// Looks up a localized string similar to Clear all entries?. + /// + public static string textClearAll { + get { + return ResourceManager.GetString("textClearAll", resourceCulture); + } + } + /// /// Looks up a localized string similar to Clear assignment. /// diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx index 1d95aef..a681ad9 100644 --- a/src/BreCalClient/Resources/Resources.de.resx +++ b/src/BreCalClient/Resources/Resources.de.resx @@ -505,4 +505,7 @@ Verhol. Nr. + + Alle Eintragungen zurücksetzen? + \ No newline at end of file diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx index a6d08f6..1cf2a78 100644 --- a/src/BreCalClient/Resources/Resources.resx +++ b/src/BreCalClient/Resources/Resources.resx @@ -178,6 +178,9 @@ nav_refresh_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + nav_undo_red.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Shifting @@ -241,6 +244,9 @@ Change password + + Clear all entries? + Clear assignment diff --git a/src/BreCalClient/Resources/nav_undo_red.png b/src/BreCalClient/Resources/nav_undo_red.png new file mode 100644 index 0000000000000000000000000000000000000000..692f6db977de0fa43e45a8206efdb556a65f2f6e GIT binary patch literal 1643 zcmV-x29)`UP)nSDW)DoeC3siG~4;1X*r7#FNDDb-JYswO5)i?K?zQK=v%Hnk#^RBf!r zCW0~grDM?8fD0;ML@BNX5do1pYFKB%VU~A$&I6m;q()zIX6}3Up5NKulkl1=r*M0^ z+2U9^!WosBn2?Zcvs!F`1pk2F-|2qZ5_kXv&9&dAfz4M3E{GSh9a9yg= zDz8+Fqot)Hf9+baW%X*YWz{NCux_0wJys^pRo4jD*4;xj(G6Ilql?EUBp3o0FCt!%bp_pH0?GttQOKA= z=}|d?;V5(?q|YJ-1`ti+J97r(5)%wjj_6|DKu%#n`s69^XEs$nD9G%hd!Bcy0C8X;5aqO-DKoiG7{p!5StQ4o0c4DPBbbd;APL=9lN z-vryjMUt7=s?F}mlnH9@XoqBXKqUo1aEX*P51vBlNoBjkdEp}(792Xy-?0?t-t73pmV7*I*J0L>o(nt)kQ5c(_4?)Tt z8DxS|nq<0{$N;x)``NP)IU;nJy=TzG zf*sHZBm~1{w4QRIe0es0Te<{S3-Zx>?;bjiAJ_FHP7$%RzJ3h82-wts-v`x5;e@D= ziW!0qh4>%=c?!7(5*guiaXN06?18VY4x`NmNCpM|dv|fCp#cusHd(CzMPu~zBSJbn zq-uXp&wx2)iZw{BY2bo(byMhuf6Y17fukdZCsh~VG#Qb&Xd%?F2LJVIu&OlKstSqc z!ybhYITG@CVIDaW{kQK9s9l|%_svT`p58~fwvZTAnL0y$Gsq9sL^B4U2*P;?Dh4RJ)$DZ)28c_D=5b@$q;1-uE#;e z733wiY=|UG5~SE9E;t!8#Kh=p;q$>nPPEhO#?#kRAqV>Wmu@%Q6qf8y5FGGRgABDE z(+yS|iS?g@ zJLk-WoqL$lbavSi1UVX$3WYq>|J9+|M1mo`+v3d@YT-C)1RBaPy=l9<;QeqeJSH<9 zHr=l(KY6lVkAGoyc53X%QFS?M));*2ze18M5H!*>7*xH(c)DeyGUO%n0fwZSXy&N7 zsn}Xz5W&CP=%BTIZwdAvJ{;AN*ku*;sf68T zhr?!p-E5_QJDek8;f#rcmD9!T6?lQL`zcy!L|B&@%wpy%--Gkz<;BfSjYazo{Q~Qr zJ#dek0N>+I%4>*vlzN`R)?@=Bks*&YuLmIlceS?R>3fqfqPQ5W+uYb##H|1QWX_(K zk(;@AaqwX2F;QPpA+CS3NnBfzE$TAnh&zijbm28W<2^pZXIW?Vym`5A^j%I#OG`~n zOS`ZjD@)t4YnQ0FTrIAiJ1=gWJ}s`3@S30T9-rZ}tb@0`l9Q9uCr+MRG-=YL8!1z# z`UoUgKA<%}<2^p}I>z4{5FiqWnSJg6001j=MObu0Z*X~XX=iA307GwZd2(rIXmlW{ pATls8I4v?TF)<)XPD4*pQy@oeVn`5