From 0b08679de033f47c1432428039a1b651f90c8fc8 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 24 Jul 2017 15:18:06 +0000 Subject: [PATCH] Version ENI-2 3.6.9.0, Korrekturen an den Detailmasken --- ENI-2/ENI2/ENI2/App.config | 8 +- ENI-2/ENI2/ENI2/App.xaml.cs | 1 + ENI-2/ENI2/ENI2/DetailBaseControl.cs | 11 ++- .../DangerousGoodsDetailControl.xaml | 86 ++++++++++++++---- .../DangerousGoodsDetailControl.xaml.cs | 12 ++- ENI-2/ENI2/ENI2/ENI2.csproj | 5 +- .../ENI2/ENI2/EditControls/EditIBCDialog.xaml | 6 +- .../ENI2/EditControls/EditIBCDialog.xaml.cs | 9 +- .../ENI2/EditControls/EditIMDGDialog.xaml | 4 +- .../ENI2/EditControls/EditIMDGDialog.xaml.cs | 9 +- .../ENI2/EditControls/EditMarpolDialog.xaml | 2 +- .../EditControls/EditMarpolDialog.xaml.cs | 3 +- .../EditPortOfCallLast30DaysDialog.xaml.cs | 8 ++ .../ENI2/ENI2/EditControls/EditTOWDialog.xaml | 8 +- ENI-2/ENI2/ENI2/LocalizedLookup.cs | 18 ++++ ENI-2/ENI2/ENI2/Util/GlobalStructures.cs | 23 +---- .../ENI2/ENI2/Util/InverseBooleanConverter.cs | 52 +++++++++++ Stundensheet.xlsx | Bin 31805 -> 31873 bytes nsw/Source/bsmd.database/HAZ.cs | 5 + nsw/Source/bsmd.database/IBCPosition.cs | 65 +++++++++++++ .../bsmd.database/MARPOL_Annex_I_Position.cs | 10 ++ .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/misc/db.sqlite | Bin 12062720 -> 12062720 bytes 24 files changed, 277 insertions(+), 72 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/Util/InverseBooleanConverter.cs diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 0a568992..f39c4f5a 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -26,12 +26,12 @@ 1000 - - http://heupferd/bsmd.LockingService/LockingService.svc + http://192.168.2.4/LockingService/LockingService.svc + - - Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs index 56433f4b..26a25a8d 100644 --- a/ENI-2/ENI2/ENI2/App.xaml.cs +++ b/ENI-2/ENI2/ENI2/App.xaml.cs @@ -68,6 +68,7 @@ namespace ENI2 CREW.NationalityDict = LocalizedLookup.getNationalities(); STAT.VesselTypeDict = LocalizedLookup.getVesselTypes(); STAT.TransportModeDict = LocalizedLookup.getTransportModes(); + HAZ.PackageTypes = LocalizedLookup.getPackageTypes(); // Connect to locking service (if enabled) diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs index f70ff10c..c63bf226 100644 --- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs +++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs @@ -228,15 +228,18 @@ namespace ENI2 { result = true; } - else if(o is string) + else 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)); + else if (o is System.Collections.Generic.KeyValuePair) + { + if (((System.Collections.Generic.KeyValuePair)o).Value.StartsWith(cmb.Text, StringComparison.OrdinalIgnoreCase)) + result = true; + } return result; }); - - //System.Diagnostics.Trace.WriteLine("---"); + itemsViewOriginal.Refresh(); } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml index 9437e8f6..198e2fc3 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/DangerousGoodsDetailControl.xaml @@ -5,8 +5,9 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:ENI2.DetailViewControls" - xmlns:p="clr-namespace:ENI2.Properties" + xmlns:p="clr-namespace:ENI2.Properties" xmlns:enictrl="clr-namespace:ENI2.Controls" + xmlns:util="clr-namespace:ENI2.Util" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="1024"> @@ -29,7 +30,7 @@