diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index 938833b8..ccb12adc 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -114,7 +114,19 @@ - + + + + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs index 5b7cfbb8..983a3dd2 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs @@ -660,26 +660,36 @@ namespace ENI2.DetailViewControls private void buttonCreatePDF_Click(object sender, RoutedEventArgs e) { - bool aMessageToReportPDFFound = false; + bool cannotCreateReport = false; - for(int i = 0; i < this.dataGridMessages.SelectedItems.Count; i++) + for (int i = 0; i < this.dataGridMessages.SelectedItems.Count; i++) { Message selectedMessage = this.dataGridMessages.SelectedItems[i] as Message; - if ((selectedMessage.InternalStatus != Message.BSMDStatus.SENT) && (selectedMessage.InternalStatus != Message.BSMDStatus.TOSEND)) + if ((selectedMessage.InternalStatus == Message.BSMDStatus.SENT) || (selectedMessage.InternalStatus == Message.BSMDStatus.TOSEND)) { - aMessageToReportPDFFound = true; - selectedMessage.InternalStatus = Message.BSMDStatus.REPORT; - selectedMessage.ReportingPartyId = App.UserId; // wichtig damit der Richtige(!) die Mail mit dem PDF bekommt - DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage); + cannotCreateReport = true; + break; } } - if (aMessageToReportPDFFound) + if (cannotCreateReport) { - this.Core.ReportStatus = MessageCore.ReportStatusEnum.SINGLE; - DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); - this.dataGridMessages.Items.Refresh(); + MessageBox.Show("Cannot create report: some messages still in status TOSEND / SENT", Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Exclamation); + return; } + + for (int i = 0; i < this.dataGridMessages.SelectedItems.Count; i++) + { + Message selectedMessage = this.dataGridMessages.SelectedItems[i] as Message; + selectedMessage.InternalStatus = Message.BSMDStatus.REPORT; + selectedMessage.ReportingPartyId = App.UserId; // wichtig damit der Richtige(!) die Mail mit dem PDF bekommt + DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage); + } + + + this.Core.ReportStatus = MessageCore.ReportStatusEnum.SINGLE; + DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); + this.dataGridMessages.Items.Refresh(); } private void buttonSystemErrors_Click(object sender, RoutedEventArgs e) diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml index 006ee3cf..062d2ff6 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml @@ -115,13 +115,25 @@ - - - - - + + + + + - + + + + + + + + + + + + + diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml index 908db99b..dc6db395 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml @@ -14,7 +14,7 @@ - + @@ -26,6 +26,7 @@ + @@ -48,6 +49,7 @@ diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index 7b3065dc..299e01be 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -36,7 +36,7 @@ true publish.html 0 - 3.9.11.%2a + 5.0.0.%2a false true true diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml index bb2b5ff4..7f605dbb 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml +++ b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml @@ -7,7 +7,7 @@ xmlns:enictrl="clr-namespace:ENI2.Controls" xmlns:p="clr-namespace:ENI2.Properties" mc:Ignorable="d" - Title="{x:Static p:Resources.textPortFacility}" Height="400" Width="400" WindowStyle="SingleBorderWindow" Background="AliceBlue"> + Title="{x:Static p:Resources.textPortFacility}" Height="430" Width="400" WindowStyle="SingleBorderWindow" Background="AliceBlue"> @@ -18,6 +18,7 @@ + @@ -32,7 +33,8 @@ diff --git a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs index 4219e4f0..8b93f53e 100644 --- a/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs @@ -40,7 +40,7 @@ namespace ENI2.EditControls this.textBoxGisisCode.Text = this.LastTenPortFacilitiesCalled.PortFacilityGISISCode; this.textBoxSecurityMatters.Text = this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport; - + this.locodeGISIS.LocodeValue = this.LastTenPortFacilitiesCalled.PortFacilityGISISCodeLocode; this.AddVisible = true; this.OKClicked += EditLast10PortFacilitiesDialog_OKClicked; } @@ -58,7 +58,7 @@ namespace ENI2.EditControls this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = null; else this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel = (byte?) (this.comboBoxShipSecurityLevel.SelectedIndex + 1); - + this.LastTenPortFacilitiesCalled.PortFacilityGISISCodeLocode = this.locodeGISIS.LocodeValue; this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport = this.textBoxSecurityMatters.Text; } diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs index c6bbf6df..059c6417 100644 --- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs +++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs @@ -2076,7 +2076,16 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Gross quantity. + /// Looks up a localized string similar to LOCODE to GISIS code of port facility in port (ISPS). + /// + public static string textGISISCodeLocode { + get { + return ResourceManager.GetString("textGISISCodeLocode", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Gross mass. /// public static string textGrossQuantity { get { @@ -2346,7 +2355,7 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Inmarsat call number. + /// Looks up a localized string similar to Inmarsat call number(s). /// public static string textInmarsatCallNumber { get { @@ -2579,6 +2588,15 @@ namespace ENI2.Properties { } } + /// + /// Looks up a localized string similar to (1 per row, 5 numbers max). + /// + public static string textLimitCallNumbers { + get { + return ResourceManager.GetString("textLimitCallNumbers", resourceCulture); + } + } + /// /// Looks up a localized string similar to Limited quantity. /// @@ -2868,7 +2886,7 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Net quantity. + /// Looks up a localized string similar to Net mass. /// public static string textNetQuantity { get { @@ -3444,7 +3462,7 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Quantity. + /// Looks up a localized string similar to Mass. /// public static string textQuantity { get { @@ -4110,7 +4128,7 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Nature of cargo. + /// Looks up a localized string similar to Type of cargo. /// public static string textTankerNatureOfCargo { get { @@ -4488,7 +4506,7 @@ namespace ENI2.Properties { } /// - /// Looks up a localized string similar to Amount of waste of this type that has been discharged at the last port of disposal. + /// Looks up a localized string similar to Amount of waste of this type that has been discharged at the last port. /// public static string textWasteAmountDischargedLastPort { get { diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx index b36794e9..4e868a88 100644 --- a/ENI-2/ENI2/ENI2/Properties/Resources.resx +++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx @@ -719,7 +719,7 @@ Condition of cargo and ballast tanks - Nature of cargo + Type of cargo Volume of cargo (t) @@ -869,7 +869,7 @@ Valid exemption - Amount of waste of this type that has been discharged at the last port of disposal + Amount of waste of this type that has been discharged at the last port Amount to be disposed @@ -905,7 +905,7 @@ Country - Inmarsat call number + Inmarsat call number(s) ISM company @@ -1223,7 +1223,7 @@ General cargo - Gross quantity + Gross mass IBC items @@ -1265,7 +1265,7 @@ Net explosive mass - Net quantity + Net mass Number of packages @@ -1292,7 +1292,7 @@ Proper shipping name - Quantity + Mass Radionuclide name @@ -1618,4 +1618,10 @@ Reset password for user {0}? + + LOCODE to GISIS code of port facility in port (ISPS) + + + (1 per row, 5 numbers max) + \ No newline at end of file diff --git a/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs b/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs index 2ec9438e..73e01eff 100644 --- a/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs +++ b/ENI-2/ENI2/ENI2/Util/GlobalStructures.cs @@ -56,7 +56,8 @@ namespace ENI2.Util {20, "Cargo tank cleaning" }, {21, "Means of transport customs clearance" }, {22, "De-gassing" }, - {23, "Waste disposal" } + {23, "Waste disposal" }, + {98, "Pass through" } }; private static Dictionary _edifact8025WithKey = null; @@ -83,7 +84,7 @@ namespace ENI2.Util public static string[] packingGroups = { - "NONE", + // "NONE", // TODO! Ist das wirklich der erwünschte Effekt? "I", "II", "III" diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 7d88b37c..461cdc56 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs index d012d6d4..bccb9477 100644 --- a/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs +++ b/nsw/Source/bsmd.ReportGenerator/BSMDDocument.cs @@ -1110,6 +1110,17 @@ namespace bsmd.ReportGenerator if (LocalizedLookup.getVesselTypes().ContainsKey(value)) result = string.Format("{0} - {1}", value, LocalizedLookup.getVesselTypes()[value]); break; + case "INF-Ship-Class": + { + switch(value) + { + case "0": result = "INF1"; break; + case "1": result = "INF2"; break; + case "2": result = "INF3"; break; + default: break; + } + } + break; default: break; } diff --git a/nsw/Source/bsmd.database/AGNT.cs b/nsw/Source/bsmd.database/AGNT.cs index 8fc2dfc1..72610807 100644 --- a/nsw/Source/bsmd.database/AGNT.cs +++ b/nsw/Source/bsmd.database/AGNT.cs @@ -34,66 +34,66 @@ namespace bsmd.database [ShowReport] [Validation2(ValidationCode.NOT_NULL)] [LookupName("AGNT.AgentCompanyName")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] [Validation(ValidationCode.NOT_NULL)] public string AgentCompanyName { get; set; } [ShowReport] [LookupName("AGNT.AgentStreetAndNumber")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentStreetAndNumber { get; set; } [ShowReport] [LookupName("AGNT.AgentPostalCode")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentPostalCode { get; set; } [ShowReport] [LookupName("AGNT.AgentCity")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentCity { get; set; } [ShowReport] [LookupName("AGNT.AgentCountry")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentCountry { get; set; } [ShowReport] [LookupName("AGNT.AgentLastName")] [Validation2(ValidationCode.NOT_NULL)] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] [Validation(ValidationCode.NOT_NULL)] public string AgentLastName { get; set; } [ShowReport] [LookupName("AGNT.AgentFirstName")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentFirstName { get; set; } [ShowReport] [Validation2(ValidationCode.NOT_NULL)] [LookupName("AGNT.AgentPhone")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] [Validation(ValidationCode.NOT_NULL)] public string AgentPhone { get; set; } [ShowReport] [LookupName("AGNT.AgentFax")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentFax { get; set; } [ShowReport] [LookupName("AGNT.AgentEMail")] - [MaxLength(100)] + [MaxLength(99)] [ENI2Validation] public string AgentEMail { get; set; } diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 428e3bf0..47820759 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("3.9.11")] +[assembly: AssemblyInformationalVersion("5.0.0")] [assembly: AssemblyCopyright("Copyright © 2014-2018 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index 72a722fe..9480caca 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.9.11.*")] +[assembly: AssemblyVersion("5.0.0.*")] diff --git a/nsw/Source/bsmd.database/RuleEngine.cs b/nsw/Source/bsmd.database/RuleEngine.cs index f1a51966..814e6d3b 100644 --- a/nsw/Source/bsmd.database/RuleEngine.cs +++ b/nsw/Source/bsmd.database/RuleEngine.cs @@ -368,6 +368,20 @@ namespace bsmd.database if (!rgx.IsMatch(value)) errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename)); break; } + case ValidationCode.INVALID_NUMBER_CHARS: + { + string[] elems = value.Split('\n'); + char[] invalidChars = { '\'', '[', '^', ',', '_', '&', ']' }; + for(int i=0;i 50) || (elems[i].IndexOfAny(invalidChars) >= 0)) + { + errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename)); + break; + } + } + break; + } default: break; } diff --git a/nsw/Source/bsmd.database/STAT.cs b/nsw/Source/bsmd.database/STAT.cs index b522d5d1..76caa065 100644 --- a/nsw/Source/bsmd.database/STAT.cs +++ b/nsw/Source/bsmd.database/STAT.cs @@ -77,6 +77,7 @@ namespace bsmd.database [LookupName("STAT.InmarsatCallNumber")] [MaxLength(100)] [ENI2Validation] + [Validation(ValidationCode.INVALID_NUMBER_CHARS)] public string InmarsatCallNumber { get; set; } /// diff --git a/nsw/Source/bsmd.database/ValidationAttribute.cs b/nsw/Source/bsmd.database/ValidationAttribute.cs index 1ad4e3c3..32e61b65 100644 --- a/nsw/Source/bsmd.database/ValidationAttribute.cs +++ b/nsw/Source/bsmd.database/ValidationAttribute.cs @@ -46,6 +46,7 @@ namespace bsmd.database PORTAREA, TRUNCATE = 28, MMSI = 29, + INVALID_NUMBER_CHARS = 30, E121 = 121, E122 = 122, E123 = 123, diff --git a/nsw/Source/bsmd.hisnord/Request.cs b/nsw/Source/bsmd.hisnord/Request.cs index 6e876dfd..9250c58f 100644 --- a/nsw/Source/bsmd.hisnord/Request.cs +++ b/nsw/Source/bsmd.hisnord/Request.cs @@ -194,8 +194,19 @@ namespace bsmd.hisnord hn_stat.Flag = stat.Flag; if (stat.GrossTonnage.HasValue) hn_stat.GrossTonnage = stat.GrossTonnage.Value.ToString(); - if(!stat.InmarsatCallNumber.IsNullOrEmpty()) - hn_stat.InmarsatCallNumber = stat.InmarsatCallNumber; + if (!stat.InmarsatCallNumber.IsNullOrEmpty()) + { + hn_stat.InmarsatCallNumbers = new vesseltypeInmarsatCallNumbers(); + List callNumbers = new List(); + foreach(string aNumber in stat.InmarsatCallNumber.Split('\n')) + { + if ((aNumber.Length > 0) && (aNumber.Length <= 50)) + callNumbers.Add(aNumber); + } + // es können durch die Validierung nicht mehr als 5 sein, sonst müsste man hier abschneiden + hn_stat.InmarsatCallNumbers.InmarsatCallNumber = callNumbers.ToArray(); + } + if (!stat.ISMCompanyName.IsNullOrEmpty() || ((stat.GrossTonnage ?? 0) > 500)) // Vio. 821 { hn_stat.ISMCompany = new ismcompany(); @@ -777,7 +788,7 @@ namespace bsmd.hisnord hn_pre72.TankerDetails = new tankerdetails(); if (pre72h.ConditionCargoBallastTanks.HasValue) hn_pre72.TankerDetails.ConditionCargoBallastTanks = (cargoconditiontype)pre72h.ConditionCargoBallastTanks.Value; - hn_pre72.TankerDetails.NatureOfCargo = pre72h.NatureOfCargo; + hn_pre72.TankerDetails.TypeOfCargo = pre72h.NatureOfCargo; if (pre72h.TankerHullConfiguration.HasValue) hn_pre72.TankerDetails.TankerHullConfiguration = (hullconfigtype)pre72h.TankerHullConfiguration.Value; if (pre72h.VolumeOfCargo.HasValue) @@ -962,7 +973,12 @@ namespace bsmd.hisnord hn_lastactivity.ShipToShipActivityType = edifact8025.ToString(); */ if (s2s.ShipToShipActivityTypeCode.HasValue) - hn_lastactivity.ShipToShipActivityType = s2s.ShipToShipActivityTypeCode.Value.ToString(); + { + if (s2s.ShipToShipActivityTypeCode.Value == 98) + hn_lastactivity.ShipToShipActivityType = lastactivityShipToShipActivityType.Item98; + else + hn_lastactivity.ShipToShipActivityType = (lastactivityShipToShipActivityType)(s2s.ShipToShipActivityTypeCode.Value - 1); + } if(!s2s.ShipToShipActivitySecurityMattersToReport.IsNullOrEmpty()) hn_lastactivity.ShipToShipActivitySecurityMattersToReportOf = s2s.ShipToShipActivitySecurityMattersToReport; diff --git a/nsw/Source/bsmd.hisnord/his-nord.cs b/nsw/Source/bsmd.hisnord/his-nord.cs index c89a0013..df708c25 100644 --- a/nsw/Source/bsmd.hisnord/his-nord.cs +++ b/nsw/Source/bsmd.hisnord/his-nord.cs @@ -2276,7 +2276,7 @@ public partial class lastactivity { private System.DateTime shipToShipActivityDateToField; - private string shipToShipActivityTypeField; + private lastactivityShipToShipActivityType shipToShipActivityTypeField; private string shipToShipActivitySecurityMattersToReportOfField; @@ -2314,8 +2314,8 @@ public partial class lastactivity { } /// - [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType="integer")] - public string ShipToShipActivityType { + [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] + public lastactivityShipToShipActivityType ShipToShipActivityType { get { return this.shipToShipActivityTypeField; } @@ -2336,6 +2336,109 @@ public partial class lastactivity { } } +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] +public enum lastactivityShipToShipActivityType { + + /// + [System.Xml.Serialization.XmlEnumAttribute("1")] + Item1, + + /// + [System.Xml.Serialization.XmlEnumAttribute("2")] + Item2, + + /// + [System.Xml.Serialization.XmlEnumAttribute("3")] + Item3, + + /// + [System.Xml.Serialization.XmlEnumAttribute("4")] + Item4, + + /// + [System.Xml.Serialization.XmlEnumAttribute("5")] + Item5, + + /// + [System.Xml.Serialization.XmlEnumAttribute("6")] + Item6, + + /// + [System.Xml.Serialization.XmlEnumAttribute("7")] + Item7, + + /// + [System.Xml.Serialization.XmlEnumAttribute("8")] + Item8, + + /// + [System.Xml.Serialization.XmlEnumAttribute("9")] + Item9, + + /// + [System.Xml.Serialization.XmlEnumAttribute("10")] + Item10, + + /// + [System.Xml.Serialization.XmlEnumAttribute("11")] + Item11, + + /// + [System.Xml.Serialization.XmlEnumAttribute("12")] + Item12, + + /// + [System.Xml.Serialization.XmlEnumAttribute("13")] + Item13, + + /// + [System.Xml.Serialization.XmlEnumAttribute("14")] + Item14, + + /// + [System.Xml.Serialization.XmlEnumAttribute("15")] + Item15, + + /// + [System.Xml.Serialization.XmlEnumAttribute("16")] + Item16, + + /// + [System.Xml.Serialization.XmlEnumAttribute("17")] + Item17, + + /// + [System.Xml.Serialization.XmlEnumAttribute("18")] + Item18, + + /// + [System.Xml.Serialization.XmlEnumAttribute("19")] + Item19, + + /// + [System.Xml.Serialization.XmlEnumAttribute("20")] + Item20, + + /// + [System.Xml.Serialization.XmlEnumAttribute("21")] + Item21, + + /// + [System.Xml.Serialization.XmlEnumAttribute("22")] + Item22, + + /// + [System.Xml.Serialization.XmlEnumAttribute("23")] + Item23, + + /// + [System.Xml.Serialization.XmlEnumAttribute("98")] + Item98, +} + /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()] @@ -2359,6 +2462,8 @@ public partial class last10port { private string portFacilityGISISCodeField; + private string portFacilityGISISCodeLoCodeField; + /// [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] public string PortFacilityPortName { @@ -2446,6 +2551,17 @@ public partial class last10port { this.portFacilityGISISCodeField = value; } } + + /// + [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] + public string PortFacilityGISISCodeLoCode { + get { + return this.portFacilityGISISCodeLoCodeField; + } + set { + this.portFacilityGISISCodeLoCodeField = value; + } + } } /// @@ -2742,7 +2858,7 @@ public partial class tankerdetails { private cargoconditiontype conditionCargoBallastTanksField; - private string natureOfCargoField; + private string typeOfCargoField; private float volumeOfCargo_TNEField; @@ -2772,12 +2888,12 @@ public partial class tankerdetails { /// [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string NatureOfCargo { + public string TypeOfCargo { get { - return this.natureOfCargoField; + return this.typeOfCargoField; } set { - this.natureOfCargoField = value; + this.typeOfCargoField = value; } } @@ -4128,9 +4244,6 @@ public enum packinggrouptype { /// III, - - /// - NONE, } /// @@ -5158,7 +5271,7 @@ public partial class vesseltype { private string portOfRegistryField; - private string inmarsatCallNumberField; + private vesseltypeInmarsatCallNumbers inmarsatCallNumbersField; private string transportModeField; @@ -5256,12 +5369,12 @@ public partial class vesseltype { /// [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] - public string InmarsatCallNumber { + public vesseltypeInmarsatCallNumbers InmarsatCallNumbers { get { - return this.inmarsatCallNumberField; + return this.inmarsatCallNumbersField; } set { - this.inmarsatCallNumberField = value; + this.inmarsatCallNumbersField = value; } } @@ -5299,6 +5412,28 @@ public partial class vesseltype { } } +/// +[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] +[System.SerializableAttribute()] +[System.Diagnostics.DebuggerStepThroughAttribute()] +[System.ComponentModel.DesignerCategoryAttribute("code")] +[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)] +public partial class vesseltypeInmarsatCallNumbers { + + private string[] inmarsatCallNumberField; + + /// + [System.Xml.Serialization.XmlElementAttribute("InmarsatCallNumber", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)] + public string[] InmarsatCallNumber { + get { + return this.inmarsatCallNumberField; + } + set { + this.inmarsatCallNumberField = value; + } + } +} + /// [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")] [System.SerializableAttribute()]