Merge branch 'release/eni_7.14'

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>7.13.0.%2a</ApplicationVersion>
+    <ApplicationVersion>7.14.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml

@@ -52,7 +52,7 @@
             </DatePicker.BlackoutDates>
         </DatePicker>
         <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="textBoxGisisCode" Grid.Row="6" Grid.Column="1" Margin="2" MaxLength="4" VerticalContentAlignment="Center" PreviewTextInput="textBoxGisisCode_PreviewTextInput" PreviewKeyDown="textBoxGisisCode_PreviewKeyDown"/>
         <TextBox Name="textBoxGisisDescription" Grid.Row="7" Grid.Column="1" Margin="2" IsEnabled="False"/>
         <enictrl:LocodeControl x:Name="locodeGISIS" Grid.Row="8" Grid.Column="1" />
         <TextBox Name="textBoxSecurityMatters" Grid.Row="9" Grid.Column="1" Margin="2" MaxLength="255" />

ENI2/EditControls/EditLast10PortFacilitiesDialog.xaml.cs

@@ -34,7 +34,7 @@ namespace ENI2.EditControls
             this.comboBoxShipSecurityLevel.ItemsSource = GlobalStructures.ShipSecurityLevels;
 
             if (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.HasValue)
-                this.comboBoxShipSecurityLevel.SelectedIndex = (this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value - 1);
+                this.comboBoxShipSecurityLevel.SelectedIndex = this.LastTenPortFacilitiesCalled.PortFacilityShipSecurityLevel.Value - 1;
             else
                 this.comboBoxShipSecurityLevel.SelectedIndex = -1;
 
@@ -48,23 +48,33 @@ namespace ENI2.EditControls
         public void CopyValuesToEntity()
         {
             this.LastTenPortFacilitiesCalled.PortFacilityPortLoCode = this.locodePort.LocodeValue;
-            this.LastTenPortFacilitiesCalled.PortFacilityPortName = this.textBoxPortName.Text;
+            this.LastTenPortFacilitiesCalled.PortFacilityPortName = this.textBoxPortName.Text.Trim();
-            this.LastTenPortFacilitiesCalled.PortFacilityPortCountry = this.textBoxPortCountry.Text;
+            this.LastTenPortFacilitiesCalled.PortFacilityPortCountry = this.textBoxPortCountry.Text.Trim();
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfArrival = this.datePickerATA.SelectedDate;
             this.LastTenPortFacilitiesCalled.PortFacilityDateOfDeparture = this.datePickerATD.SelectedDate;
-            this.LastTenPortFacilitiesCalled.PortFacilityGISISCode = this.textBoxGisisCode.Text;
+            this.LastTenPortFacilitiesCalled.PortFacilityGISISCode = this.textBoxGisisCode.Text.Trim();
 
             if (this.comboBoxShipSecurityLevel.SelectedIndex == -1)
                 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;
+            this.LastTenPortFacilitiesCalled.PortFacilitySecurityMattersToReport = this.textBoxSecurityMatters.Text.Trim();
         }
 
         private void EditLast10PortFacilitiesDialog_OKClicked()
         {
             this.CopyValuesToEntity();
         }
+
+        private void textBoxGisisCode_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e)
+        {
+            e.Handled = !e.Text.IsDigitsOnly();
+        }
+
+        private void textBoxGisisCode_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if(e.Key == System.Windows.Input.Key.Space) e.Handled = true;
+        }
     }
 }

bsmd.database/AGNT_Template.cs

@@ -147,9 +147,9 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (obj is AGNT_Template)
+            if (obj is AGNT_Template template)
             {
-                return AgentTitle.CompareTo(((AGNT_Template)obj).AgentTitle);
+                return AgentTitle.CompareTo(template.AgentTitle);
             }
             return 0;
         }

bsmd.database/BKRA.cs

@@ -152,6 +152,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((BRKA)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((BRKA)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((BRKA)obj).Identifier);
         }
 

bsmd.database/BRKD.cs

@@ -151,6 +151,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((BRKD)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((BRKD)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((BRKD)obj).Identifier);
         }
 

bsmd.database/CallPurpose.cs

@@ -136,6 +136,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((CallPurpose)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((CallPurpose)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((CallPurpose)obj).Identifier);
         }
 

bsmd.database/DatabaseEntity.cs

@@ -153,10 +153,7 @@ namespace bsmd.database
         /// <param name="errors"></param>
         /// <param name="violations"></param>
         public virtual void Validate(List<MessageError> errors, List<MessageViolation> violations)
-        {
+        { }
-            errors = new List<MessageError>();
-            violations = new List<MessageViolation>();
-        }
 
         /// <summary>
         /// Diese Methode sollte eigentlich nie einen Effekt haben und dient nur dazu, dass keine Situation

bsmd.database/IBCPosition.cs

@@ -317,6 +317,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((IBCPosition)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((IBCPosition)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((IBCPosition)obj).Identifier);
         }
 

bsmd.database/IGCPosition.cs

@@ -217,6 +217,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((IGCPosition)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((IGCPosition)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((IGCPosition)obj).Identifier);
         }
 

bsmd.database/IMDGPosition.cs

@@ -630,6 +630,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((IMDGPosition)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((IMDGPosition)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((IMDGPosition)obj).Identifier);
         }
 

bsmd.database/IMSBCPosition.cs

@@ -265,6 +265,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((IMSBCPosition)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((IMSBCPosition)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((IMSBCPosition)obj).Identifier);
         }
 

bsmd.database/IMessageParagraph.cs

@@ -32,8 +32,8 @@ namespace bsmd.database
     /// </summary>
     public class MessageParagraph : IMessageParagraph
     {
-        private List<IMessageParagraph> childParagraphs = new List<IMessageParagraph>();
+        private readonly List<IMessageParagraph> childParagraphs = new List<IMessageParagraph>();
-        private List<KeyValuePair<string, string>> messageText = new List<KeyValuePair<string, string>>();
+        private readonly List<KeyValuePair<string, string>> messageText = new List<KeyValuePair<string, string>>();
 
         public List<IMessageParagraph> ChildParagraphs
         {

bsmd.database/InfectedArea.cs

@@ -125,6 +125,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((InfectedArea)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((InfectedArea)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((InfectedArea)obj).Identifier);
         }
 

bsmd.database/LADG.cs

@@ -256,6 +256,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((LADG)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((LADG)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((LADG)obj).Identifier);
         }
 

bsmd.database/LastTenPortFacilitiesCalled.cs

@@ -180,10 +180,10 @@ namespace bsmd.database
         #region Validate
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
-        {            
+        {
 
             if (this.PortFacilityPortLoCode.IsNullOrEmpty())
-            {            
+            {
                 errors.Add(RuleEngine.CreateError(ValidationCode.NOT_NULL, "PortFacilityPortLocode", null, this.Title, this.Identifier, this.SEC.Tablename));
             }
 
@@ -193,6 +193,11 @@ namespace bsmd.database
                     errors.Add(RuleEngine.CreateError(ValidationCode.LOCODE, null, this.PortFacilityPortLoCode, this.Title, this.Identifier, this.SEC.Tablename));
             }
 
+            if(!this.PortFacilityGISISCode.IsNullOrEmpty() && !this.PortFacilityGISISCode.IsDigitsOnly())
+            {
+                errors.Add(RuleEngine.CreateError(ValidationCode.INVALID_NUMBER_CHARS, "GISIS Code", this.PortFacilityGISISCode, this.Title, this.Identifier, this.SEC.Tablename));
+            }
+
         }
 
         #endregion
@@ -204,6 +209,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((LastTenPortFacilitiesCalled)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((LastTenPortFacilitiesCalled)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((LastTenPortFacilitiesCalled)obj).Identifier);
         }
 

bsmd.database/MARPOL_Annex_I_Position.cs

@@ -230,6 +230,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((MARPOL_Annex_I_Position)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((MARPOL_Annex_I_Position)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((MARPOL_Annex_I_Position)obj).Identifier);
         }
 

bsmd.database/PortOfCallLast30Days.cs

@@ -303,6 +303,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((PortOfCallLast30Days)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((PortOfCallLast30Days)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((PortOfCallLast30Days)obj).Identifier);
         }
 

bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs

@@ -123,6 +123,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier);
         }
 

bsmd.database/PortOfItinerary.cs

@@ -132,6 +132,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((PortOfItinerary)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((PortOfItinerary)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((PortOfItinerary)obj).Identifier);
         }
 

bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.13.0")]
+[assembly: AssemblyInformationalVersion("7.14.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2023 schick Informatik")]
 [assembly: AssemblyTrademark("")]

bsmd.database/Properties/AssemblyProjectInfo.cs

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

bsmd.database/SERV.cs

@@ -134,6 +134,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((SERV)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((SERV)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((SERV)obj).Identifier);
         }
 

bsmd.database/STO.cs

@@ -150,6 +150,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((STO)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((STO)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((STO)obj).Identifier);
         }
 

bsmd.database/SanitaryMeasuresDetail.cs

@@ -144,6 +144,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((SanitaryMeasuresDetail)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((SanitaryMeasuresDetail)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((SanitaryMeasuresDetail)obj).Identifier);
         }
 

bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs

@@ -237,6 +237,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier);
         }
 

bsmd.database/StowawaysJoiningLocation.cs

@@ -118,6 +118,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((StowawaysJoiningLocation)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((StowawaysJoiningLocation)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((StowawaysJoiningLocation)obj).Identifier);
         }
 

bsmd.database/SubsidiaryRisks.cs

@@ -111,6 +111,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((SubsidiaryRisks)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((SubsidiaryRisks)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((SubsidiaryRisks)obj).Identifier);
         }
 

bsmd.database/TOWA.cs

@@ -274,6 +274,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((TOWA)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((TOWA)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((TOWA)obj).Identifier);
 
             #endregion

bsmd.database/TOWD.cs

@@ -257,6 +257,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((TOWD)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((TOWD)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((TOWD)obj).Identifier);
         }
 

bsmd.database/WasteDisposalServiceProvider.cs

@@ -113,6 +113,8 @@ namespace bsmd.database
             if (this.Identifier == null) return 1;
             if ((obj is null) || (((WasteDisposalServiceProvider)obj).Identifier == null))
                 return 1;
+            if (Int32.TryParse(((WasteDisposalServiceProvider)obj).Identifier, out int i1) && Int32.TryParse(this.Identifier, out int i2))
+                return i2.CompareTo(i1);
             return this.Identifier.CompareTo(((WasteDisposalServiceProvider)obj).Identifier);
         }