From 3bd0e4e361fee972e5409c050022d291fbfe900e Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Wed, 1 Aug 2018 15:36:27 +0000 Subject: [PATCH] Version 5.0.12 --- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 4 ++-- .../BorderPoliceDetailControl.xaml.cs | 11 +++++++++-- ...aritimeHealthDeclarationDetailControl.xaml | 7 ++++++- .../OverViewDetailControl.xaml | 2 +- .../PSC72hDetailControl.xaml | 7 ++++++- .../SecurityDetailControl.xaml | 8 +++++++- .../WasteDetailControl.xaml | 7 ++++++- ENI-2/ENI2/ENI2/ENI2.csproj | 2 +- .../EditControls/CopyDeclarationDialog.xaml | 7 ++++++- .../ENI2/EditControls/EditCREWDialog.xaml | 8 +++++++- .../EditControls/EditInfectedAreaDialog.xaml | 7 ++++++- .../EditLast10PortFacilitiesDialog.xaml | 14 ++++++++++++-- .../ENI2/ENI2/EditControls/EditPasDialog.xaml | 7 ++++++- .../EditPortOfCallLast30DaysDialog.xaml | 7 ++++++- .../EditSanitaryMeasureDialog.xaml | 7 ++++++- .../EditShip2ShipActivitiesDialog.xaml | 14 ++++++++++++-- .../ENI2/EditControls/NewWithIdDialog.xaml | 8 ++++++-- .../ENI2/ENI2/EditControls/VisitIdDialog.xaml | 7 ++++++- Stundensheet.xlsx | Bin 38300 -> 38481 bytes nsw/Source/bsmd.database/DBManager.cs | 14 +++++++------- nsw/Source/bsmd.database/SEC.cs | 5 +++++ .../bsmd.database/ValidationAttribute.cs | 1 + 22 files changed, 124 insertions(+), 30 deletions(-) diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index cd5c4178..5abb4a01 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -265,7 +265,7 @@ namespace ENI2 if(existingCore.IsTransit && (existingMessage.MessageNotificationClass == Message.NotificationClass.TRANSIT) && - (existingMessage.InternalStatus == Message.BSMDStatus.SENT)) + (existingMessage.InternalStatus == Message.BSMDStatus.CONFIRMED)) { skipCopyTransit = true; continue; @@ -273,7 +273,7 @@ namespace ENI2 if(!existingCore.IsTransit && (existingMessage.MessageNotificationClass == Message.NotificationClass.VISIT) && - (existingMessage.InternalStatus == Message.BSMDStatus.SENT)) + (existingMessage.InternalStatus == Message.BSMDStatus.CONFIRMED)) { skipCopyVisit = true; continue; diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs index f5a238b3..1d684669 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml.cs @@ -241,13 +241,20 @@ namespace ENI2.DetailViewControls foreach (LastTenPortFacilitiesCalled l10fc in _sec.LastTenPortFacilitesCalled) { //if (l10fc.PortFacilityDateOfDeparture.HasValue && - //((DateTime.Now - l10fc.PortFacilityDateOfDeparture.Value).TotalDays < 31)) + //((DateTime.Now - l10fc.PortFacilityDateOfDeparture.Value).TotalDays < 31)) //{ + DateTime? eta = null; + if (l10fc.PortFacilityDateOfArrival.HasValue) + { + eta = new DateTime(l10fc.PortFacilityDateOfArrival.Value.Year, l10fc.PortFacilityDateOfArrival.Value.Month, + l10fc.PortFacilityDateOfArrival.Value.Day, 11, 11, 11).ToUniversalTime(); + } + PortOfItinerary poi = new PortOfItinerary { Identifier = PortOfItinerary.GetNewIdentifier(this._bpol.PortOfItineraries), BPOL = this._bpol, - PortOfItineraryETA = l10fc.PortFacilityDateOfArrival, + PortOfItineraryETA = eta, PortOfItineraryLocode = l10fc.PortFacilityPortLoCode, PortOfItineraryName = l10fc.PortFacilityPortName }; diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml index cfd06d26..78a86317 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml @@ -80,7 +80,12 @@ - + + + + + + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index ccb12adc..e7508088 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -75,7 +75,7 @@