From f8a9ad6be6b03f61f77d2aa8bec43d27176d2cf2 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Thu, 31 Aug 2017 16:52:23 +0000 Subject: [PATCH] =?UTF-8?q?3.6.15:=20SystemError=20richtig=20verarbeiten,?= =?UTF-8?q?=20Drop-Downs=20endg=C3=BCltig=20besser=20gel=C3=B6st.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI-2/ENI2/ENI2/App.config | 8 +-- ENI-2/ENI2/ENI2/DetailBaseControl.cs | 13 ++++- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 8 +++ .../ArrivalNotificationDetailControl.xaml | 12 ++--- .../BorderPoliceDetailControl.xaml | 2 +- .../DangerousGoodsDetailControl.xaml.cs | 5 ++ .../DepartureNotificationDetailControl.xaml | 12 ++--- ...aritimeHealthDeclarationDetailControl.xaml | 8 +-- .../OverViewDetailControl.xaml | 28 ++++++++--- .../OverViewDetailControl.xaml.cs | 19 +++++++- .../PSC72hDetailControl.xaml | 8 +-- .../PortCallDetailControl.xaml | 30 ++++++------ .../PortNotificationDetailControl.xaml | 12 ++--- .../SecurityDetailControl.xaml | 28 +++++------ .../SecurityDetailControl.xaml.cs | 8 +-- .../ShipDataDetailControl.xaml | 34 ++++++------- .../ShipDataDetailControl.xaml.cs | 6 +-- ENI-2/ENI2/ENI2/ENI2.csproj | 12 ++++- .../ENI2/ENI2/EditControls/EditBKRDialog.xaml | 4 +- .../ENI2/EditControls/EditCREWDialog.xaml | 6 +-- .../ENI2/EditControls/EditCREWDialog.xaml.cs | 4 +- .../ENI2/ENI2/EditControls/EditIBCDialog.xaml | 8 +-- .../ENI2/EditControls/EditIBCDialog.xaml.cs | 6 +-- .../ENI2/ENI2/EditControls/EditIGCDialog.xaml | 2 +- .../ENI2/EditControls/EditIMDGDialog.xaml | 26 +++++----- .../ENI2/EditControls/EditIMDGDialog.xaml.cs | 4 +- .../ENI2/EditControls/EditIMSBCDialog.xaml | 2 +- .../ENI2/EditControls/EditLADGDialog.xaml | 12 ++--- .../ENI2/EditControls/EditLADGDialog.xaml.cs | 11 ++--- .../EditLast10PortFacilitiesDialog.xaml | 6 +-- .../EditLast10PortFacilitiesDialog.xaml.cs | 11 ++++- .../ENI2/EditControls/EditMarpolDialog.xaml | 12 ++--- .../EditControls/EditMarpolDialog.xaml.cs | 2 +- .../ENI2/ENI2/EditControls/EditPasDialog.xaml | 6 +-- .../ENI2/EditControls/EditPasDialog.xaml.cs | 6 +-- .../EditPortOfItineraryDialog.xaml | 2 +- .../ENI2/EditControls/EditSERVDialog.xaml | 2 +- .../EditSanitaryMeasureDialog.xaml | 4 +- .../EditShip2ShipActivitiesDialog.xaml | 6 +-- .../ENI2/ENI2/EditControls/EditTOWDialog.xaml | 10 ++-- .../ENI2/EditControls/EditTOWDialog.xaml.cs | 2 +- .../ENI2/EditControls/EditWasteDialog.xaml | 10 ++-- .../ENI2/EditControls/NewWithIdDialog.xaml | 7 +-- .../ENI2/EditControls/SystemErrorDialog.xaml | 27 ++++++++++ .../EditControls/SystemErrorDialog.xaml.cs | 32 ++++++++++++ .../ENI2/ENI2/EditControls/VisitIdDialog.xaml | 4 +- .../ENI2/Properties/Resources.Designer.cs | 46 ++++++++++++++++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 15 ++++++ ENI-2/ENI2/ENI2/Resources/hand_red_card.png | Bin 0 -> 1392 bytes Stundensheet.xlsx | Bin 32922 -> 33056 bytes nsw/Source/bsmd.database/DBManager.cs | 20 ++++++++ .../bsmd.database/MARPOL_Annex_I_Position.cs | 1 + nsw/Source/bsmd.database/Message.cs | 11 +++++ .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/SystemError.cs | 36 ++++++++------ nsw/Source/bsmd.hisnord/Request.cs | 1 + nsw/Source/bsmd.hisnord/Response.cs | 8 +-- 58 files changed, 429 insertions(+), 200 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml create mode 100644 ENI-2/ENI2/ENI2/EditControls/SystemErrorDialog.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/Resources/hand_red_card.png diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 26bd10f2..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/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs index 758180b4..94467804 100644 --- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs +++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs @@ -65,6 +65,12 @@ namespace ENI2 /// public event Action NotificationClassChanged; + /// + /// Eine Maske soll neu erzeugt werden weil sich dort "indirekt" etwas geändert hat durch eine Änderung in einer anderen Maske. + /// (Beispiel Copy HAZA nach HAZD Elemente) + /// + public event Action ResetControlCache; + #endregion #region Properties @@ -124,7 +130,12 @@ namespace ENI2 protected virtual void OnRequestReload() { this.RequestReload?.Invoke(); - } + } + + protected virtual void OnControlCacheReset(string messageGroupName) + { + this.ResetControlCache?.Invoke(messageGroupName); + } #region event handling for control content changes (signal dirty etc) diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index b38d5b4c..9547472f 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -127,6 +127,7 @@ namespace ENI2 detailControl.RequestReload += DetailControl_RequestReload; detailControl.NotificationClassChanged += DetailControl_NotificationClassChanged; + detailControl.ResetControlCache += DetailControl_ResetControlCache; detailControl.Initialize(); detailControl.IsEnabled = !this.LockedByOtherUser; @@ -160,6 +161,13 @@ namespace ENI2 } } + private void DetailControl_ResetControlCache(string messageGroupName) + { + if (messageGroupName.IsNullOrEmpty()) return; + if (controlCache.ContainsKey(messageGroupName)) + controlCache.Remove(messageGroupName); + } + private void buttonSave_Click(object sender, RoutedEventArgs e) { MessageBoxResult result = MessageBox.Show(Properties.Resources.textQuestionSavePage, Properties.Resources.textConfirmation, diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml index 59a2342a..ded673a4 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml @@ -27,7 +27,7 @@