5.0.0 Testversion

ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml

@@ -114,7 +114,19 @@
                 <!-- Data Grid -->
                 <DataGrid Grid.Row="9" Grid.ColumnSpan="6" Margin="0,8,0,0" x:Name="dataGridMessages" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" CanUserAddRows="False"
                   SelectionMode="Extended" AutoGenerateColumns="False" MouseDoubleClick="dataGrid_MouseDoubleClick" PreviewKeyDown="dataGrid_PreviewKeyDown">
-                    <DataGrid.Columns>
+                        <DataGrid.RowStyle>
+                            <Style TargetType="DataGridRow">
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding InternalStatus}" Value="SUSPENDED">
+                                        <Setter Property="Background" Value="LightSalmon"></Setter>
+                                    </DataTrigger>
+                                    <Trigger Property="IsMouseOver" Value="True">
+                                        <Setter Property="Background" Value="LightYellow" />
+                                    </Trigger>
+                                </Style.Triggers>
+                            </Style>
+                        </DataGrid.RowStyle>
+                        <DataGrid.Columns>
                         <DataGridTemplateColumn Header=" " Width="SizeToCells" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>

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;
+                    cannotCreateReport = true;
-                    selectedMessage.InternalStatus = Message.BSMDStatus.REPORT;
+                    break;
-                    selectedMessage.ReportingPartyId = App.UserId; // wichtig damit der Richtige(!) die Mail mit dem PDF bekommt
-                    DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(selectedMessage);
                 }
             }
 
-            if (aMessageToReportPDFFound)
+            if (cannotCreateReport)
             {
-                this.Core.ReportStatus = MessageCore.ReportStatusEnum.SINGLE;
+                MessageBox.Show("Cannot create report: some messages still in status TOSEND / SENT", Properties.Resources.textCaptionError, MessageBoxButton.OK, MessageBoxImage.Exclamation);
-                DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core);
+                return;
-                this.dataGridMessages.Items.Refresh();
             }
+
+            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)

ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml

@@ -115,13 +115,25 @@
                                 <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCode}" FontSize="10"/>
                             </DataTemplate>
                         </DataGridTemplateColumn.HeaderTemplate>
-                        <DataGridTemplateColumn.CellTemplate>
+                            <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
+                                <DataTemplate>
-                                <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCode}" />
+                                    <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCode}" />
-                            </DataTemplate>
+                                </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-                    <DataGridTextColumn Header="{x:Static p:Resources.textShipSecLevel}" Binding="{Binding PortFacilityShipSecurityLevel, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
+                        <DataGridTemplateColumn IsReadOnly="True" Width="0.1*">
+                            <DataGridTemplateColumn.HeaderTemplate>
+                                <DataTemplate>
+                                    <TextBlock TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCodeLocode}" FontSize="10"/>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.HeaderTemplate>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <TextBlock TextAlignment="Center" Text="{Binding PortFacilityGISISCodeLocode}" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn Header="{x:Static p:Resources.textShipSecLevel}" Binding="{Binding PortFacilityShipSecurityLevel, Mode=TwoWay}" IsReadOnly="True" Width="0.1*" />
                     <DataGridTextColumn Header="{x:Static p:Resources.textSecurityMatters}" Binding="{Binding PortFacilitySecurityMattersToReport}" IsReadOnly="True" Width="0.2*" />
                 </DataGrid.Columns>
             </enictrl:ENIDataGrid>

ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml

@@ -14,7 +14,7 @@
         <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="210" />
+                <RowDefinition Height="260" />
                 <RowDefinition Height="140" />
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
@@ -26,6 +26,7 @@
                     <RowDefinition Height="28" />
                     <RowDefinition Height="28" />
                     <RowDefinition Height="28" />
+                    <RowDefinition Height="56" />
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="2*" />
@@ -48,6 +49,7 @@
                 <Label HorizontalContentAlignment="Right" Grid.Row="3" Grid.Column="3" Content="{x:Static p:Resources.textPortOfRegistry}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="5" Grid.Column="3" Content="{x:Static p:Resources.textBeamOverAll}" Margin="0,0,10,0" />
                 <Label HorizontalContentAlignment="Right" Grid.Row="6" Grid.Column="3" Content="{x:Static p:Resources.textInmarsatCallNumber}" Margin="0,0,10,0" />
+                <Label HorizontalContentAlignment="Right" Grid.Row="7" Grid.Column="3" Content="{x:Static p:Resources.textLimitCallNumbers}" Margin="0,0,10,0" />
 
                 <TextBox Name="textBoxVesselName" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ShipName}" Margin="2" VerticalContentAlignment="Center"/>
                 <ComboBox Name="comboBoxVesselType" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" SelectedValue="{Binding ShipType}" Margin="2" SelectedValuePath="Key" DisplayMemberPath="Value" IsEditable="True"  StaysOpenOnEdit="True" IsTextSearchEnabled="True" />
@@ -63,7 +65,8 @@
                 <xctk:DoubleUpDown Name="doubleUpDownBeam" Grid.Column="4" Grid.Row="5" Margin="2" Value="{Binding Beam_MTR}" ShowButtonSpinner="False" TextAlignment="Left"  ParsingNumberStyle="Any" FormatString="N2" />
                 <Label Content="m" Grid.Column="5" Grid.Row="5" />
                 <TextBox Name="textBoxMMSI" Grid.Column="1" Grid.Row="6" Margin="2" Text="{Binding MMSINumber}" VerticalContentAlignment="Center" MaxLength="10"/>
-                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" Margin="2" Text="{Binding InmarsatCallNumber}" VerticalContentAlignment="Center" />
+                <TextBox Name="textBoxInmarsatCallNumber" Grid.Column="4" Grid.ColumnSpan="2" Grid.Row="6" Grid.RowSpan="2" Margin="2" Text="{Binding InmarsatCallNumber}" 
+                         VerticalContentAlignment="Top" TextWrapping="Wrap" AcceptsReturn="True" />
 
             </Grid>
                 <GroupBox Name="groupBoxISMCompany" Header="{x:Static p:Resources.textISMCompany}" Grid.Row="1">

ENI-2/ENI2/ENI2/ENI2.csproj

@@ -36,7 +36,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>3.9.11.%2a</ApplicationVersion>
+    <ApplicationVersion>5.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

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">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -18,6 +18,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="56" />
+            <RowDefinition Height="28" />
             <RowDefinition Height="56" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -32,7 +33,8 @@
         <Label Name="labelATD" Grid.Row="4" Grid.Column="0" Content="ATD" />
         <Label Name="labelShipSecurityLevel" Grid.Row="5" Grid.Column="0" Content="{x:Static p:Resources.textShipSecLevel}" />
         <TextBlock Name="labelGISISCode" Grid.Row="6" FontSize="10" TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCode}" />
-        <Label Name="labelSecurityMatters" Grid.Row="8" Grid.Column="0" Content="{x:Static p:Resources.textSecurityMatters}" />
+        <Label Name="labelSecurityMatters" Grid.Row="9" Grid.Column="0" Content="{x:Static p:Resources.textSecurityMatters}" />
+        <TextBlock Name="labelGISISCodeLocode" Grid.Row="8" FontSize="10" TextWrapping="Wrap" Text="{x:Static p:Resources.textGISISCodeLocode}" />
 
         <enictrl:LocodeControl Grid.Row="0" Grid.Column="1" x:Name="locodePort" />
         <TextBox Name="textBoxPortName" Grid.Row="1" Grid.Column="1" Margin="2" MaxLength="100" VerticalContentAlignment="Center"/>
@@ -42,7 +44,8 @@
         <ComboBox Name="comboBoxShipSecurityLevel" Grid.Row="5" Grid.Column="1" Margin="2" />
         <TextBox Name="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
-        <TextBox Name="textBoxSecurityMatters" Grid.Row="8" Grid.Column="1" Margin="2" MaxLength="255" />
+        <enictrl:LocodeControl x:Name="locodeGISIS" Grid.Row="8" Grid.Column="1" />
+        <TextBox Name="textBoxSecurityMatters" Grid.Row="9" Grid.Column="1" Margin="2" MaxLength="255" />
 
     </Grid>
 </enictrl:EditWindowBase>

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;
         }
 

ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs

@@ -2076,7 +2076,16 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   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).
+        /// </summary>
+        public static string textGISISCodeLocode {
+            get {
+                return ResourceManager.GetString("textGISISCodeLocode", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Gross mass.
         /// </summary>
         public static string textGrossQuantity {
             get {
@@ -2346,7 +2355,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Inmarsat call number.
+        ///   Looks up a localized string similar to Inmarsat call number(s).
         /// </summary>
         public static string textInmarsatCallNumber {
             get {
@@ -2579,6 +2588,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (1 per row, 5 numbers max).
+        /// </summary>
+        public static string textLimitCallNumbers {
+            get {
+                return ResourceManager.GetString("textLimitCallNumbers", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Limited quantity.
         /// </summary>
@@ -2868,7 +2886,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Net quantity.
+        ///   Looks up a localized string similar to Net mass.
         /// </summary>
         public static string textNetQuantity {
             get {
@@ -3444,7 +3462,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Quantity.
+        ///   Looks up a localized string similar to Mass.
         /// </summary>
         public static string textQuantity {
             get {
@@ -4110,7 +4128,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Nature of cargo.
+        ///   Looks up a localized string similar to Type of cargo.
         /// </summary>
         public static string textTankerNatureOfCargo {
             get {
@@ -4488,7 +4506,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   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.
         /// </summary>
         public static string textWasteAmountDischargedLastPort {
             get {

ENI-2/ENI2/ENI2/Properties/Resources.resx

@@ -719,7 +719,7 @@
     <value>Condition of cargo and ballast tanks</value>
   </data>
   <data name="textTankerNatureOfCargo" xml:space="preserve">
-    <value>Nature of cargo</value>
+    <value>Type of cargo</value>
   </data>
   <data name="textTankerVolumeOfCargo" xml:space="preserve">
     <value>Volume of cargo (t)</value>
@@ -869,7 +869,7 @@
     <value>Valid exemption</value>
   </data>
   <data name="textWasteAmountDischargedLastPort" xml:space="preserve">
-    <value>Amount of waste of this type that has been discharged at the last port of disposal</value>
+    <value>Amount of waste of this type that has been discharged at the last port</value>
   </data>
   <data name="textWasteAmountToBeDisposed" xml:space="preserve">
     <value>Amount to be disposed</value>
@@ -905,7 +905,7 @@
     <value>Country</value>
   </data>
   <data name="textInmarsatCallNumber" xml:space="preserve">
-    <value>Inmarsat call number</value>
+    <value>Inmarsat call number(s)</value>
   </data>
   <data name="textISMCompany" xml:space="preserve">
     <value>ISM company</value>
@@ -1223,7 +1223,7 @@
     <value>General cargo</value>
   </data>
   <data name="textGrossQuantity" xml:space="preserve">
-    <value>Gross quantity</value>
+    <value>Gross mass</value>
   </data>
   <data name="textIBCItems" xml:space="preserve">
     <value>IBC items</value>
@@ -1265,7 +1265,7 @@
     <value>Net explosive mass</value>
   </data>
   <data name="textNetQuantity" xml:space="preserve">
-    <value>Net quantity</value>
+    <value>Net mass</value>
   </data>
   <data name="textNumberOfPackages" xml:space="preserve">
     <value>Number of packages</value>
@@ -1292,7 +1292,7 @@
     <value>Proper shipping name</value>
   </data>
   <data name="textQuantity" xml:space="preserve">
-    <value>Quantity</value>
+    <value>Mass</value>
   </data>
   <data name="textRadioNuclideName" xml:space="preserve">
     <value>Radionuclide name</value>
@@ -1618,4 +1618,10 @@
   <data name="textConfirmPasswordReset" xml:space="preserve">
     <value>Reset password for user {0}?</value>
   </data>
+  <data name="textGISISCodeLocode" xml:space="preserve">
+    <value>LOCODE to GISIS code of port facility in port (ISPS)</value>
+  </data>
+  <data name="textLimitCallNumbers" xml:space="preserve">
+    <value>(1 per row, 5 numbers max)</value>
+  </data>
 </root>

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<int, string> _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"

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;
             }

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; }
 

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("")]

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.9.11.*")]
+[assembly: AssemblyVersion("5.0.0.*")]
 

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<elems.Length;i++)
+                            {
+                                if((elems[i].Length > 50) || (elems[i].IndexOfAny(invalidChars) >= 0))
+                                {
+                                    errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));
+                                    break;
+                                }
+                            }
+                            break;
+                        }
                     default:
                         break;
                 }

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; }
 
         /// <summary>

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,

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())
+                                if (!stat.InmarsatCallNumber.IsNullOrEmpty())
-                                    hn_stat.InmarsatCallNumber = stat.InmarsatCallNumber;
+                                {
+                                    hn_stat.InmarsatCallNumbers = new vesseltypeInmarsatCallNumbers();
+                                    List<string> callNumbers = new List<string>();
+                                    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;

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 {
     }
     
     /// <remarks/>
-    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, DataType="integer")]
+    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
-    public string ShipToShipActivityType {
+    public lastactivityShipToShipActivityType ShipToShipActivityType {
         get {
             return this.shipToShipActivityTypeField;
         }
@@ -2336,6 +2336,109 @@ public partial class lastactivity {
     }
 }
 
+/// <remarks/>
+[System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
+[System.SerializableAttribute()]
+[System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+public enum lastactivityShipToShipActivityType {
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("1")]
+    Item1,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("2")]
+    Item2,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("3")]
+    Item3,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("4")]
+    Item4,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("5")]
+    Item5,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("6")]
+    Item6,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("7")]
+    Item7,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("8")]
+    Item8,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("9")]
+    Item9,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("10")]
+    Item10,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("11")]
+    Item11,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("12")]
+    Item12,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("13")]
+    Item13,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("14")]
+    Item14,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("15")]
+    Item15,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("16")]
+    Item16,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("17")]
+    Item17,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("18")]
+    Item18,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("19")]
+    Item19,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("20")]
+    Item20,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("21")]
+    Item21,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("22")]
+    Item22,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("23")]
+    Item23,
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlEnumAttribute("98")]
+    Item98,
+}
+
 /// <remarks/>
 [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;
+    
     /// <remarks/>
     [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
     public string PortFacilityPortName {
@@ -2446,6 +2551,17 @@ public partial class last10port {
             this.portFacilityGISISCodeField = value;
         }
     }
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string PortFacilityGISISCodeLoCode {
+        get {
+            return this.portFacilityGISISCodeLoCodeField;
+        }
+        set {
+            this.portFacilityGISISCodeLoCodeField = value;
+        }
+    }
 }
 
 /// <remarks/>
@@ -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 {
     
     /// <remarks/>
     [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 {
     
     /// <remarks/>
     III,
-    
-    /// <remarks/>
-    NONE,
 }
 
 /// <remarks/>
@@ -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 {
     
     /// <remarks/>
     [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 {
     }
 }
 
+/// <remarks/>
+[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;
+    
+    /// <remarks/>
+    [System.Xml.Serialization.XmlElementAttribute("InmarsatCallNumber", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
+    public string[] InmarsatCallNumber {
+        get {
+            return this.inmarsatCallNumberField;
+        }
+        set {
+            this.inmarsatCallNumberField = value;
+        }
+    }
+}
+
 /// <remarks/>
 [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "4.6.1055.0")]
 [System.SerializableAttribute()]