From 5f6f61e54e7fb7da48542d5dc51d9b6925bbe9a4 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 1 Aug 2017 15:12:51 +0000 Subject: [PATCH] 3.6.10: Kleinigkeiten und ein paar Modifikationen beim Versand NEU: SystemError --- ENI-2/ENI2/ENI2/App.xaml.cs | 1 + ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs | 11 +- ENI-2/ENI2/ENI2/DetailBaseControl.cs | 15 +- .../OverViewDetailControl.xaml | 4 +- .../OverViewDetailControl.xaml.cs | 49 +- .../PortCallDetailControl.xaml.cs | 8 + ENI-2/ENI2/ENI2/ENI2.csproj | 3 +- .../ENI2/EditControls/EditLADGDialog.xaml | 8 +- .../ENI2/EditControls/EditLADGDialog.xaml.cs | 67 +- ENI-2/ENI2/ENI2/LocalizedLookup.cs | 19 + .../ENI2/Properties/Resources.Designer.cs | 55 + ENI-2/ENI2/ENI2/Properties/Resources.resx | 18 + ENI-2/ENI2/ENI2/Resources/mail_delete.png | Bin 0 -> 1632 bytes ENI-2/ENI2/ENI2/Util/GlobalStructures.cs | 3 - Stundensheet.xlsx | Bin 32001 -> 32433 bytes nsw/Source/SQL/SystemError.sql | 15 + .../SendNSWMessageService/NSWSendService.cs | 10 +- nsw/Source/bsmd.ExcelReadService/Util.cs | 50 +- nsw/Source/bsmd.database/LADG.cs | 8 +- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/SystemError.cs | 194 ++ nsw/Source/bsmd.database/bsmd.database.csproj | 1 + nsw/Source/bsmd.email/BSMDMail.cs | 10 +- nsw/Source/bsmd.email/bsmd.email.csproj | 1 + nsw/Source/bsmd.hisnord/NSWResponse.cs | 175 +- nsw/Source/bsmd.hisnord/Request.cs | 2359 +++++++++-------- nsw/Source/bsmd.hisnord/Response.cs | 115 +- nsw/Source/bsmd.hisnord/SystemError.cs | 64 - nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj | 3 +- nsw/Source/misc/db.sqlite | Bin 12062720 -> 12062720 bytes 31 files changed, 1871 insertions(+), 1399 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/Resources/mail_delete.png create mode 100644 nsw/Source/SQL/SystemError.sql create mode 100644 nsw/Source/bsmd.database/SystemError.cs delete mode 100644 nsw/Source/bsmd.hisnord/SystemError.cs diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs index 26a25a8d..2da2e53a 100644 --- a/ENI-2/ENI2/ENI2/App.xaml.cs +++ b/ENI-2/ENI2/ENI2/App.xaml.cs @@ -69,6 +69,7 @@ namespace ENI2 STAT.VesselTypeDict = LocalizedLookup.getVesselTypes(); STAT.TransportModeDict = LocalizedLookup.getTransportModes(); HAZ.PackageTypes = LocalizedLookup.getPackageTypes(); + LADG.LACodes = LocalizedLookup.getLACodes(); // Connect to locking service (if enabled) diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs index 8b432708..77272fdd 100644 --- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs +++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs @@ -84,8 +84,12 @@ namespace ENI2.Controls { ComboBox cmb = sender as ComboBox; if (cmb == null) return; + if (cmb.ItemsSource == null) return; + CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource); + bool ignoreSelect = ((e.Key == System.Windows.Input.Key.Back) || (e.Key == System.Windows.Input.Key.Delete)); + itemsViewOriginal.Filter = ((o) => { bool result = false; @@ -98,7 +102,10 @@ namespace ENI2.Controls if(o is System.Collections.Generic.KeyValuePair) if(((System.Collections.Generic.KeyValuePair)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase)) result = true; - if(o is string) + if(o is System.Collections.Generic.KeyValuePair) + if (((System.Collections.Generic.KeyValuePair)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase)) + result = true; + if (o is string) if (((string)o).Contains(cmb.Text, StringComparison.OrdinalIgnoreCase)) result = true; } //System.Diagnostics.Trace.WriteLine(string.Format("{0} - {1} - {2}", o, cmb.Text, result)); @@ -108,7 +115,7 @@ namespace ENI2.Controls //System.Diagnostics.Trace.WriteLine("---"); itemsViewOriginal.Refresh(); - if (itemsViewOriginal.Count == 1) + if (!ignoreSelect && (itemsViewOriginal.Count == 1)) { // Treffer: Select? cmb.SelectedItem = itemsViewOriginal.GetItemAt(0); diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs index 6b526bd6..8f01d457 100644 --- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs +++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs @@ -215,12 +215,17 @@ namespace ENI2 #region combobox content filtering + protected void ComboBox_KeyUp(object sender, System.Windows.Input.KeyEventArgs e) { + ComboBox cmb = sender as ComboBox; if (cmb == null) return; - CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource); + bool ignoreSelect = ((e.Key == System.Windows.Input.Key.Back) || (e.Key == System.Windows.Input.Key.Delete)); + + CollectionView itemsViewOriginal = (CollectionView)CollectionViewSource.GetDefaultView(cmb.ItemsSource); + System.Diagnostics.Trace.WriteLine(cmb.Text); itemsViewOriginal.Filter = ((o) => { bool result = false; @@ -236,13 +241,13 @@ namespace ENI2 { if (((System.Collections.Generic.KeyValuePair)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase)) result = true; - } + } return result; }); - - itemsViewOriginal.Refresh(); - if(itemsViewOriginal.Count == 1) + itemsViewOriginal.Refresh(); + + if (!ignoreSelect && (itemsViewOriginal.Count == 1)) { // Treffer: Select? cmb.SelectedItem = itemsViewOriginal.GetItemAt(0); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index 2f36900f..cd28019a 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -80,7 +80,7 @@ -