From 551ecb3332214052377d16a5905a27eb73697601 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 16 Aug 2017 16:57:23 +0000 Subject: [PATCH] CREW/PAS Import und viele kleine Fehlerkorrekturen! --- ENI-2/ENI2/ENI2/App.config | 8 +- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 33 +++-- .../BorderPoliceDetailControl.xaml | 14 +- .../BorderPoliceDetailControl.xaml.cs | 139 ++++++++++++++++++ ...aritimeHealthDeclarationDetailControl.xaml | 21 +-- ...timeHealthDeclarationDetailControl.xaml.cs | 92 +++++++++++- .../OverViewDetailControl.xaml | 7 + ENI-2/ENI2/ENI2/ENI2.csproj | 47 +++--- .../ENI2/EditControls/NewWithIdDialog.xaml | 61 ++++++++ .../ENI2/EditControls/NewWithIdDialog.xaml.cs | 81 ++++++++++ ENI-2/ENI2/ENI2/MainWindow.xaml | 4 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 62 +++++++- .../ENI2/Properties/Resources.Designer.cs | 73 +++++++++ ENI-2/ENI2/ENI2/Properties/Resources.de.resx | 3 + ENI-2/ENI2/ENI2/Properties/Resources.resx | 24 +++ ENI-2/ENI2/ENI2/Resources/check.png | Bin 0 -> 1076 bytes ENI-2/ENI2/ENI2/Util/GlobalStructures.cs | 46 ++++++ ENI-2/ENI2/ENI2/packages.config | 5 +- Stundensheet.xlsx | Bin 32731 -> 32797 bytes nsw/Source/bsmd.database/BPOL.cs | 1 + nsw/Source/bsmd.database/DatabaseEntity.cs | 4 +- nsw/Source/bsmd.database/Message.cs | 3 +- nsw/Source/bsmd.database/Util.cs | 2 +- nsw/Source/bsmd.database/XtraSendLogic.cs | 7 +- nsw/Source/bsmd.hisnord/Request.cs | 12 +- nsw/Source/bsmd.hisnord/Response.cs | 2 + nsw/Source/bsmd.hisnord/his-nord.cs | 31 +++- nsw/Source/bsmd.hisnord/transmitter.cs | 2 +- 28 files changed, 713 insertions(+), 71 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml create mode 100644 ENI-2/ENI2/ENI2/EditControls/NewWithIdDialog.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/Resources/check.png diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 2b0bf49c..b657c69b 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/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index cece9971..f90124e4 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -164,12 +164,7 @@ namespace ENI2 { foreach (Message message in currentControl.ControlMessages) { - if (message.IsDirty) - { - DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message); - message.SaveElements(); - message.IsDirty = false; - } + this.SaveMessage(message); } this.buttonSave.Visibility = Visibility.Hidden; @@ -178,8 +173,19 @@ namespace ENI2 // ggf. hat sich die Ticketnr geändert.. DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(currentControl.Core); } - } - + } + } + } + + private void SaveMessage(Message message) + { + if (message.IsDirty) + { + if ((message.Status == Message.MessageStatus.ACCEPTED) && (message.InternalStatus == Message.BSMDStatus.CONFIRMED)) + message.InternalStatus = Message.BSMDStatus.UPDATED; + DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message); + message.SaveElements(); + message.IsDirty = false; } } @@ -191,15 +197,10 @@ namespace ENI2 { foreach(Message message in this._messages) { - if (message.IsDirty) - { - DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(message); - message.SaveElements(); - message.IsDirty = false; - this.buttonSaveAll.Visibility = Visibility.Hidden; - this.buttonSave.Visibility = Visibility.Hidden; - } + this.SaveMessage(message); } + this.buttonSaveAll.Visibility = Visibility.Hidden; + this.buttonSave.Visibility = Visibility.Hidden; } } diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index a805d004..624b428e 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -48,7 +48,12 @@ - + + + +