diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 7fa3111c..2b9c1bf2 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,7 +36,7 @@ 5.4.0.0 true publish.html - 3 + 5 7.12.0.%2a false true diff --git a/bsmd.LockingService/bsmd.LockingService.csproj.user b/bsmd.LockingService/bsmd.LockingService.csproj.user index afa33dd1..3517ad61 100644 --- a/bsmd.LockingService/bsmd.LockingService.csproj.user +++ b/bsmd.LockingService/bsmd.LockingService.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/bsmd.database/BKRA.cs b/bsmd.database/BKRA.cs index 6bbddbc4..a1c605a7 100644 --- a/bsmd.database/BKRA.cs +++ b/bsmd.database/BKRA.cs @@ -145,7 +145,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((BRKA)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((BRKA)obj).Identifier); } diff --git a/bsmd.database/BRKD.cs b/bsmd.database/BRKD.cs index 5581cee1..b4f243c3 100644 --- a/bsmd.database/BRKD.cs +++ b/bsmd.database/BRKD.cs @@ -144,7 +144,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((BRKD)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((BRKD)obj).Identifier); } diff --git a/bsmd.database/CallPurpose.cs b/bsmd.database/CallPurpose.cs index 32318505..a39cf382 100644 --- a/bsmd.database/CallPurpose.cs +++ b/bsmd.database/CallPurpose.cs @@ -133,7 +133,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((CallPurpose)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((CallPurpose)obj).Identifier); } diff --git a/bsmd.database/IBCPosition.cs b/bsmd.database/IBCPosition.cs index b34f9d1b..7e948d2a 100644 --- a/bsmd.database/IBCPosition.cs +++ b/bsmd.database/IBCPosition.cs @@ -314,7 +314,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((IBCPosition)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((IBCPosition)obj).Identifier); } diff --git a/bsmd.database/IGCPosition.cs b/bsmd.database/IGCPosition.cs index 93fe4a0c..71c09170 100644 --- a/bsmd.database/IGCPosition.cs +++ b/bsmd.database/IGCPosition.cs @@ -214,7 +214,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((IGCPosition)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((IGCPosition)obj).Identifier); } diff --git a/bsmd.database/IMDGPosition.cs b/bsmd.database/IMDGPosition.cs index 84099c60..054b2919 100644 --- a/bsmd.database/IMDGPosition.cs +++ b/bsmd.database/IMDGPosition.cs @@ -627,7 +627,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((IMDGPosition)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((IMDGPosition)obj).Identifier); } diff --git a/bsmd.database/IMSBCPosition.cs b/bsmd.database/IMSBCPosition.cs index 7299a138..e341fff2 100644 --- a/bsmd.database/IMSBCPosition.cs +++ b/bsmd.database/IMSBCPosition.cs @@ -262,7 +262,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((IMSBCPosition)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((IMSBCPosition)obj).Identifier); } diff --git a/bsmd.database/InfectedArea.cs b/bsmd.database/InfectedArea.cs index d7e7acf0..5b2ebc7b 100644 --- a/bsmd.database/InfectedArea.cs +++ b/bsmd.database/InfectedArea.cs @@ -122,7 +122,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((InfectedArea)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((InfectedArea)obj).Identifier); } diff --git a/bsmd.database/LADG.cs b/bsmd.database/LADG.cs index 3f867e8e..e7f380e7 100644 --- a/bsmd.database/LADG.cs +++ b/bsmd.database/LADG.cs @@ -242,7 +242,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((LADG)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((LADG)obj).Identifier); } diff --git a/bsmd.database/LastTenPortFacilitiesCalled.cs b/bsmd.database/LastTenPortFacilitiesCalled.cs index 6a2f592f..f990afff 100644 --- a/bsmd.database/LastTenPortFacilitiesCalled.cs +++ b/bsmd.database/LastTenPortFacilitiesCalled.cs @@ -201,7 +201,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((LastTenPortFacilitiesCalled)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((LastTenPortFacilitiesCalled)obj).Identifier); } diff --git a/bsmd.database/MARPOL_Annex_I_Position.cs b/bsmd.database/MARPOL_Annex_I_Position.cs index 89e1b816..9aa2adc5 100644 --- a/bsmd.database/MARPOL_Annex_I_Position.cs +++ b/bsmd.database/MARPOL_Annex_I_Position.cs @@ -227,7 +227,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((MARPOL_Annex_I_Position)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((MARPOL_Annex_I_Position)obj).Identifier); } diff --git a/bsmd.database/PortOfCallLast30Days.cs b/bsmd.database/PortOfCallLast30Days.cs index 7794f073..82cdefaa 100644 --- a/bsmd.database/PortOfCallLast30Days.cs +++ b/bsmd.database/PortOfCallLast30Days.cs @@ -300,7 +300,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((PortOfCallLast30Days)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((PortOfCallLast30Days)obj).Identifier); } diff --git a/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs b/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs index a2f93602..151e48f5 100644 --- a/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs +++ b/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs @@ -120,7 +120,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier); } diff --git a/bsmd.database/PortOfItinerary.cs b/bsmd.database/PortOfItinerary.cs index 700b0327..b48a6fa3 100644 --- a/bsmd.database/PortOfItinerary.cs +++ b/bsmd.database/PortOfItinerary.cs @@ -129,7 +129,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((PortOfItinerary)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((PortOfItinerary)obj).Identifier); } diff --git a/bsmd.database/SERV.cs b/bsmd.database/SERV.cs index 29013545..18fd9e19 100644 --- a/bsmd.database/SERV.cs +++ b/bsmd.database/SERV.cs @@ -131,7 +131,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((SERV)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((SERV)obj).Identifier); } diff --git a/bsmd.database/STO.cs b/bsmd.database/STO.cs index 01748a1f..2a058ca3 100644 --- a/bsmd.database/STO.cs +++ b/bsmd.database/STO.cs @@ -147,7 +147,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((STO)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((STO)obj).Identifier); } diff --git a/bsmd.database/SanitaryMeasuresDetail.cs b/bsmd.database/SanitaryMeasuresDetail.cs index 630ece8e..6f47c496 100644 --- a/bsmd.database/SanitaryMeasuresDetail.cs +++ b/bsmd.database/SanitaryMeasuresDetail.cs @@ -141,7 +141,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((SanitaryMeasuresDetail)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((SanitaryMeasuresDetail)obj).Identifier); } diff --git a/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs b/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs index 11a711ab..9e3f1492 100644 --- a/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs +++ b/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs @@ -234,7 +234,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier); } diff --git a/bsmd.database/StowawaysJoiningLocation.cs b/bsmd.database/StowawaysJoiningLocation.cs index 0bb71eb6..a04ae3c1 100644 --- a/bsmd.database/StowawaysJoiningLocation.cs +++ b/bsmd.database/StowawaysJoiningLocation.cs @@ -115,7 +115,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((StowawaysJoiningLocation)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((StowawaysJoiningLocation)obj).Identifier); } diff --git a/bsmd.database/SubsidiaryRisks.cs b/bsmd.database/SubsidiaryRisks.cs index 803ad144..6076814b 100644 --- a/bsmd.database/SubsidiaryRisks.cs +++ b/bsmd.database/SubsidiaryRisks.cs @@ -108,7 +108,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((SubsidiaryRisks)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((SubsidiaryRisks)obj).Identifier); } diff --git a/bsmd.database/TOWA.cs b/bsmd.database/TOWA.cs index 8f599a6f..f590117d 100644 --- a/bsmd.database/TOWA.cs +++ b/bsmd.database/TOWA.cs @@ -25,7 +25,7 @@ namespace bsmd.database #region Properties [ShowReport] - [Validation(ValidationCode.NOT_NULL)] + [Validation(ValidationCode.NOT_NULL)] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalName { get; set; } @@ -36,42 +36,42 @@ namespace bsmd.database [ENI2Validation] public string TowageOnArrivalFlag { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorCompanyName { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorStreetNameAndNumber { get; set; } - [ShowReport] + [ShowReport] [MaxLength(24)] [ENI2Validation] public string TowageOnArrivalOperatorPostalCode { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorCity { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorCountry { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorPhone { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorFax { get; set; } - [ShowReport] + [ShowReport] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalOperatorEmail { get; set; } @@ -92,7 +92,7 @@ namespace bsmd.database public double? TowageOnArrivalBeam_MTR { get; set; } [ShowReport] - [Validation(ValidationCode.NOT_NULL)] + [Validation(ValidationCode.NOT_NULL)] [MaxLength(100)] [ENI2Validation] public string TowageOnArrivalPurposeOfCall { get; set; } @@ -102,7 +102,7 @@ namespace bsmd.database [ENI2Validation] public double? TowageOnArrivalDraught_DMT { get; set; } - [ShowReport] + [ShowReport] [MaxLength(255)] [ENI2Validation] public string TowageOnArrivalRemarks { get; set; } @@ -216,7 +216,7 @@ namespace bsmd.database if (!reader.IsDBNull(9)) towa.TowageOnArrivalOperatorFax = reader.GetString(9); if (!reader.IsDBNull(10)) towa.TowageOnArrivalOperatorEmail = reader.GetString(10); if (!reader.IsDBNull(11)) towa.TowageOnArrivalGrossTonnage = reader.GetInt32(11); - if (!reader.IsDBNull(12)) towa.TowageOnArrivalLengthOverall_MTR = (float) reader.GetDouble(12); + if (!reader.IsDBNull(12)) towa.TowageOnArrivalLengthOverall_MTR = (float)reader.GetDouble(12); if (!reader.IsDBNull(13)) towa.TowageOnArrivalBeam_MTR = (float)reader.GetDouble(13); if (!reader.IsDBNull(14)) towa.TowageOnArrivalPurposeOfCall = reader.GetString(14); if (!reader.IsDBNull(15)) towa.TowageOnArrivalDraught_DMT = (float)reader.GetDouble(15); @@ -271,13 +271,14 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((TOWA)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((TOWA)obj).Identifier); + + #endregion + } - - #endregion - } } diff --git a/bsmd.database/TOWD.cs b/bsmd.database/TOWD.cs index 033d3f70..94d8682d 100644 --- a/bsmd.database/TOWD.cs +++ b/bsmd.database/TOWD.cs @@ -254,7 +254,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((TOWD)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((TOWD)obj).Identifier); } diff --git a/bsmd.database/TreatmentFacilityProvider.cs b/bsmd.database/TreatmentFacilityProvider.cs index ad8cde1c..3a72b4a3 100644 --- a/bsmd.database/TreatmentFacilityProvider.cs +++ b/bsmd.database/TreatmentFacilityProvider.cs @@ -104,7 +104,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((TreatmentFacilityProvider)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((TreatmentFacilityProvider)obj).Identifier); } diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs index d386ee0f..878a8a19 100644 --- a/bsmd.database/WAS_RCPT.cs +++ b/bsmd.database/WAS_RCPT.cs @@ -421,7 +421,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((WAS_RCPT)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((WAS_RCPT)obj).Identifier); } diff --git a/bsmd.database/Waste.cs b/bsmd.database/Waste.cs index 0f5cb68a..eb9fcc5d 100644 --- a/bsmd.database/Waste.cs +++ b/bsmd.database/Waste.cs @@ -279,7 +279,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((Waste)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((Waste)obj).Identifier); } diff --git a/bsmd.database/WasteDisposalServiceProvider.cs b/bsmd.database/WasteDisposalServiceProvider.cs index adb1f9ff..b23c4a41 100644 --- a/bsmd.database/WasteDisposalServiceProvider.cs +++ b/bsmd.database/WasteDisposalServiceProvider.cs @@ -110,7 +110,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((WasteDisposalServiceProvider)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((WasteDisposalServiceProvider)obj).Identifier); } diff --git a/bsmd.database/WasteReceived.cs b/bsmd.database/WasteReceived.cs index 9c7d4197..66245887 100644 --- a/bsmd.database/WasteReceived.cs +++ b/bsmd.database/WasteReceived.cs @@ -146,7 +146,8 @@ namespace bsmd.database public int CompareTo(object obj) { - if (obj is null) + if (this.Identifier == null) return 1; + if ((obj is null) || (((WasteReceived)obj).Identifier == null)) return 1; return this.Identifier.CompareTo(((WasteReceived)obj).Identifier); }