From e0a7f2654e95a1742d4f80e1073205d33a00f5fa Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 10 Aug 2017 14:18:38 +0000 Subject: [PATCH] =?UTF-8?q?3.6.12:=20Korrekturen=20f=C3=BCr=20das=20Versen?= =?UTF-8?q?den,=20neue=20Dialog=20f=C3=BCr=20Error=20/=20Violation=20Meldu?= =?UTF-8?q?ngen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI-2/ENI2/ENI2/App.xaml.cs | 2 + ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 6 + .../BorderPoliceDetailControl.xaml | 4 +- .../OverViewDetailControl.xaml | 35 +++++- .../OverViewDetailControl.xaml.cs | 35 ++++++ ENI-2/ENI2/ENI2/ENI2.csproj | 21 +++- .../ENI2/EditControls/EditLADGDialog.xaml | 4 +- .../ENI2/EditControls/EditLADGDialog.xaml.cs | 17 ++- .../ENI2/EditControls/ErrorListDialog.xaml | 24 ++++ .../ENI2/EditControls/ErrorListDialog.xaml.cs | 32 ++++++ .../EditControls/ViolationListDialog.xaml | 24 ++++ .../EditControls/ViolationListDialog.xaml.cs | 32 ++++++ .../ENI2/EditControls/VisitIdDialog.xaml.cs | 2 + ENI-2/ENI2/ENI2/LocalizedLookup.cs | 47 ++++++++ ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 7 +- .../ENI2/Properties/Resources.Designer.cs | 28 +++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 9 ++ ENI-2/ENI2/ENI2/Resources/error.png | Bin 0 -> 1759 bytes Stundensheet.xlsx | Bin 32433 -> 32568 bytes .../SendNSWMessageService/NSWSendService.cs | 11 +- nsw/Source/bsmd.ExcelReadService/Util.cs | 2 +- nsw/Source/bsmd.database/LADG.cs | 7 +- nsw/Source/bsmd.database/Message.cs | 10 ++ nsw/Source/bsmd.database/MessageCore.cs | 2 +- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/ReportingParty.cs | 1 + nsw/Source/bsmd.database/SystemError.cs | 24 +++- nsw/Source/bsmd.database/Util.cs | 13 ++- nsw/Source/bsmd.hisnord/NSWResponse.cs | 39 +++++-- nsw/Source/bsmd.hisnord/Request.cs | 71 +++++++----- nsw/Source/bsmd.hisnord/Response.cs | 106 +++++++++++------- nsw/Source/bsmd.hisnord/transmitter.cs | 23 ++-- nsw/Source/misc/db.sqlite | Bin 12062720 -> 12066816 bytes 34 files changed, 521 insertions(+), 121 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/EditControls/ErrorListDialog.xaml create mode 100644 ENI-2/ENI2/ENI2/EditControls/ErrorListDialog.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/EditControls/ViolationListDialog.xaml create mode 100644 ENI-2/ENI2/ENI2/EditControls/ViolationListDialog.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/Resources/error.png diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs index 2da2e53a..ead7e9c7 100644 --- a/ENI-2/ENI2/ENI2/App.xaml.cs +++ b/ENI-2/ENI2/ENI2/App.xaml.cs @@ -70,6 +70,8 @@ namespace ENI2 STAT.TransportModeDict = LocalizedLookup.getTransportModes(); HAZ.PackageTypes = LocalizedLookup.getPackageTypes(); LADG.LACodes = LocalizedLookup.getLACodes(); + LADG.CargoCodesNST = LocalizedLookup.getCargoCodesNST(); + LADG.CargoCodesNST3 = LocalizedLookup.getCargoCodesNST3(); // Connect to locking service (if enabled) diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index 39bcf2e3..cece9971 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -172,6 +172,12 @@ namespace ENI2 } } this.buttonSave.Visibility = Visibility.Hidden; + + if(currentControl is OverViewDetailControl) + { + // ggf. hat sich die Ticketnr geändert.. + DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core); + } } } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index 82cd3b72..abcf9a76 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -56,7 +56,7 @@ - + @@ -79,7 +79,7 @@ - + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index cd28019a..c8dfe903 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -73,13 +73,14 @@