From 7506fb74b73c6c9896ab444e331caafce465bffa Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 10 Nov 2015 06:58:46 +0000
Subject: [PATCH] Korrekturen, Version 2.4.6

---
 Stundensheet.xlsx                             | Bin 18339 -> 18512 bytes
 nsw/Source/SQL/Update_2.0_To_2.4.sql          |  10 +++
 .../SendNSWMessageService/NSWSendService.cs   |   5 ++
 nsw/Source/bsmd.database/HAZ.cs               |  59 +++++++++++++++---
 .../LastTenPortFacilitiesCalled.cs            |   8 +--
 nsw/Source/bsmd.database/MDH.cs               |  20 +++---
 nsw/Source/bsmd.database/Message.cs           |   5 ++
 nsw/Source/bsmd.database/MessageCore.cs       |  13 ++--
 .../Properties/AssemblyProductInfo.cs         |   2 +-
 .../Properties/AssemblyProjectInfo.cs         |   2 +-
 ...vitiesDuringLastTenPortFacilitiesCalled.cs |  13 ++--
 nsw/Source/bsmd.dbh/Request.cs                |   2 +
 nsw/Source/bsmd.herberg.FormService/Util.cs   |  22 +++++--
 13 files changed, 123 insertions(+), 38 deletions(-)
 create mode 100644 nsw/Source/SQL/Update_2.0_To_2.4.sql

diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 74e3b04a2575c0241139ee744e217410549f4c11..e886a0aaac0bb6ce5dce1f62d048633d83d33c13 100644
GIT binary patch
delta 9158
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

delta 8961
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
Z|7^<>OFB>xgC$COr$~!<EB#OGe*l<t@i_nh

diff --git a/nsw/Source/SQL/Update_2.0_To_2.4.sql b/nsw/Source/SQL/Update_2.0_To_2.4.sql
new file mode 100644
index 00000000..ae1ec365
--- /dev/null
+++ b/nsw/Source/SQL/Update_2.0_To_2.4.sql
@@ -0,0 +1,10 @@
+PRINT N'Updating MessageCore..';
+
+ALTER TABLE [dbo].[MessageCore] ADD [DefaultReportingPartyId] UNIQUEIDENTIFIER NULL;
+GO
+
+ALTER TABLE [dbo].[HAZA] ADD [TransmissionType] NVARCHAR (50) NULL;
+GO
+
+ALTER TABLE [dbo].[HAZD] ADD [TransmissionType] NVARCHAR (50) NULL;
+GO
diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs
index 5c138aaf..7babdc59 100644
--- a/nsw/Source/SendNSWMessageService/NSWSendService.cs
+++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs
@@ -110,6 +110,8 @@ namespace SendNSWMessageService
                                         _log.Debug("Visit/Transit not found, SENDING VISIT/TRANSIT message");
                                         if (message.HIS == Message.NSWProvider.UNDEFINED)
                                             message.HIS = core.InitialHIS;
+                                        if (core.DefaultReportingPartyId.HasValue)
+                                            message.ReportingPartyId = core.DefaultReportingPartyId;
                                         toSendMessageList.Add(message);
                                     }
                                 }
@@ -159,6 +161,7 @@ namespace SendNSWMessageService
                                         if (haz != null)
                                         {
                                             if (haz.NoDPGOnBoardOnArrival ?? false) continue;
+                                            if (haz.TransmissionType != "EU-NOAD") continue;
                                         }
                                     }
                                 }
@@ -181,6 +184,8 @@ namespace SendNSWMessageService
                                 {
                                     if (message.HIS == Message.NSWProvider.UNDEFINED)
                                         message.HIS = core.InitialHIS;
+                                    if (core.DefaultReportingPartyId.HasValue)
+                                        message.ReportingPartyId = core.DefaultReportingPartyId;
 
                                     toSendMessageList.Add(message);
                                 }
diff --git a/nsw/Source/bsmd.database/HAZ.cs b/nsw/Source/bsmd.database/HAZ.cs
index fba16957..65f627bc 100644
--- a/nsw/Source/bsmd.database/HAZ.cs
+++ b/nsw/Source/bsmd.database/HAZ.cs
@@ -22,6 +22,7 @@ namespace bsmd.database
         private List<IGCPosition> igcPositions = new List<IGCPosition>();
         private List<IMSBCPosition> imsbcPositions = new List<IMSBCPosition>();
         private List<MARPOL_Annex_I_Position> marpolPositions = new List<MARPOL_Annex_I_Position>();
+        private bool _isDeparture;
 
         public HAZ()
         {
@@ -66,8 +67,21 @@ namespace bsmd.database
 
         public List<MARPOL_Annex_I_Position> MARPOLPositions { get { return this.marpolPositions; } }
 
+        // selektor HAZA / HAZD
         [ShowReport]
-        public bool IsDeparture { get; set; } // selektor HAZA / HAZD
+        public bool IsDeparture { get { return this._isDeparture; }
+            set
+            {
+                this._isDeparture = value;
+                this.tablename = this._isDeparture ? "[dbo].[HAZD]" : "[dbo].[HAZA]";
+            }        
+        }
+
+        /// <summary>
+        /// No NSW field! Set to determine whether HAZ info should be reported to the NSW
+        /// </summary>
+        [ShowReport]
+        public string TransmissionType { get; set; }
 
         #endregion
 
@@ -86,29 +100,55 @@ namespace bsmd.database
             scmd.Parameters.AddWithNullableValue("@P7", this.DPGClassificationIBC);
             scmd.Parameters.AddWithNullableValue("@P8", this.DPGClassificationIMSBC);
             scmd.Parameters.AddWithNullableValue("@P9", this.DPGClassificationMARPOL_ANNEX_I);
+            scmd.Parameters.AddWithNullableValue("@P10", this.TransmissionType);
 
             if (this.IsNew)
             {
                 this.CreateId();
                 scmd.Parameters.AddWithValue("@ID", this.Id);
-                scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, NoDPGOnBoardOnArrival, DPGManifestOnBoardOnArrival, " +
-                    "INFShipClass, DPGClassificationIMDG, DPGClassificationIGC, DPGClassificationIBC, DPGClassificationIMSBC, " +
-                    "DPGClassificationMARPOL_ANNEX_I) VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9)", this.Tablename);
+                if (IsDeparture)
+                {
+                    scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, NoDPGOnBoardOnDeparture, DPGManifestOnBoardOnDeparture, " +
+                        "INFShipClass, DPGClassificationIMDG, DPGClassificationIGC, DPGClassificationIBC, DPGClassificationIMSBC, " +
+                        "DPGClassificationMARPOL_ANNEX_I, TransmissionType) VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10)", this.Tablename);
+                }
+                else
+                {
+                    scmd.CommandText = string.Format("INSERT INTO {0} (Id, MessageHeaderId, NoDPGOnBoardOnArrival, DPGManifestOnBoardOnArrival, " +
+                        "INFShipClass, DPGClassificationIMDG, DPGClassificationIGC, DPGClassificationIBC, DPGClassificationIMSBC, " +
+                        "DPGClassificationMARPOL_ANNEX_I, TransmissionType) VALUES (@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10)", this.Tablename);
+                }
             }
             else
             {
                 scmd.Parameters.AddWithValue("@ID", this.Id);
-                scmd.CommandText = string.Format("UPDATE {0} SET NODPGOnBoardOnArrival = @P2, DPGManifestOnBoardOnArrival = @P3, " +
-                    "INFShipClass = @P4, DPGClassificationIMDG = @P5, DPGClassificationIGC = @P6, DPGClassificationIBC = @P7, " +
-                    "DPGClassificationIMSBC = @P8, DPGClassificationMARPOL_ANNEX_I = @P9 WHERE Id = @ID", this.Tablename);
+                if (IsDeparture)
+                {
+                    scmd.CommandText = string.Format("UPDATE {0} SET NODPGOnBoardOnDeparture = @P2, DPGManifestOnBoardOnDeparture = @P3, " +
+                        "INFShipClass = @P4, DPGClassificationIMDG = @P5, DPGClassificationIGC = @P6, DPGClassificationIBC = @P7, " +
+                        "DPGClassificationIMSBC = @P8, DPGClassificationMARPOL_ANNEX_I = @P9, TransmissionType = @P10 WHERE Id = @ID", this.Tablename);
+                }
+                else 
+                {
+                    scmd.CommandText = string.Format("UPDATE {0} SET NODPGOnBoardOnArrival = @P2, DPGManifestOnBoardOnArrival = @P3, " +
+                        "INFShipClass = @P4, DPGClassificationIMDG = @P5, DPGClassificationIGC = @P6, DPGClassificationIBC = @P7, " +
+                        "DPGClassificationIMSBC = @P8, DPGClassificationMARPOL_ANNEX_I = @P9, TransmissionType = @P10 WHERE Id = @ID", this.Tablename);
+                }
             }
         }
 
         public override void PrepareLoadCommand(System.Data.IDbCommand cmd, Message.LoadFilter filter, params object[] criteria)
-        {
+        {            
             string query = string.Format("SELECT Id, NoDPGOnBoardOnArrival, DPGManifestOnBoardOnArrival, INFShipClass, " +
                 "DPGClassificationIMDG, DPGClassificationIGC, DPGClassificationIBC, DPGClassificationIMSBC, " +
-                "DPGClassificationMARPOL_ANNEX_I FROM {0} ", this.Tablename);
+                "DPGClassificationMARPOL_ANNEX_I, TransmissionType FROM {0} ", this.Tablename);
+
+            if (this.IsDeparture)
+            {
+                query = string.Format("SELECT Id, NoDPGOnBoardOnDeparture, DPGManifestOnBoardOnDeparture, INFShipClass, " +
+                "DPGClassificationIMDG, DPGClassificationIGC, DPGClassificationIBC, DPGClassificationIMSBC, " +
+                "DPGClassificationMARPOL_ANNEX_I, TransmissionType FROM {0} ", this.Tablename);
+            }
 
             switch (filter)
             {
@@ -142,6 +182,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(6)) haz.DPGClassificationIBC = reader.GetBoolean(6);
                 if (!reader.IsDBNull(7)) haz.DPGClassificationIMSBC = reader.GetBoolean(7);
                 if (!reader.IsDBNull(8)) haz.DPGClassificationMARPOL_ANNEX_I = reader.GetBoolean(8);
+                if (!reader.IsDBNull(9)) haz.TransmissionType = reader.GetString(9);
 
                 result.Add(haz);
             }
diff --git a/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs b/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
index 952d3ff0..dc90688c 100644
--- a/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/LastTenPortFacilitiesCalled.cs
@@ -138,14 +138,14 @@ namespace bsmd.database
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
         {
-            bool locationOK = (!this.PortFacilityPortLoCode.IsNullOrEmpty()) ||
-                (!this.PortFacilityPortName.IsNullOrEmpty() && !this.PortFacilityPortCountry.IsNullOrEmpty());
+            bool locationInsufficient = (this.PortFacilityPortLoCode.IsNullOrEmpty()) &&
+                (this.PortFacilityPortName.IsNullOrEmpty() || this.PortFacilityPortCountry.IsNullOrEmpty());
 
-            if (!locationOK)
+            if (locationInsufficient)
             {
                 string val = string.Format("LoCode:{0} Port:{1} Country:{2}", this.PortFacilityPortLoCode ?? "", this.PortFacilityPortName ?? "",
                     this.PortFacilityPortCountry ?? "");
-                RuleEngine.CreateViolation(ValidationCode.V703, "Either LoCode or Country + Name must be given", val);
+                RuleEngine.CreateViolation(ValidationCode.V703, "Last 10 Port facilities: Either LoCode or Country + Name must be given", val);
             }
         }
 
diff --git a/nsw/Source/bsmd.database/MDH.cs b/nsw/Source/bsmd.database/MDH.cs
index f1a5ebb5..91487882 100644
--- a/nsw/Source/bsmd.database/MDH.cs
+++ b/nsw/Source/bsmd.database/MDH.cs
@@ -261,7 +261,7 @@ namespace bsmd.database
         }
 
         public override void Validate(List<MessageError> errors, List<MessageViolation> violations)
-        {            
+        {
 
             if (this.GetValidationBlock() == ValidationBlock.BLOCK1)
             {
@@ -270,10 +270,10 @@ namespace bsmd.database
             }
             else
             {
-                if((this.NonAccidentalDeathsDuringVoyage ?? false) && ((this.NonAccidentalDeathsDuringVoyageCount ?? 0) == 0))
+                if ((this.NonAccidentalDeathsDuringVoyage ?? false) && ((this.NonAccidentalDeathsDuringVoyageCount ?? 0) == 0))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V761, "NonAccidentalDeathsDuringVoyageCount missing", null));
 
-                if((this.NumberOfIllPersonsHigherThanExpected ?? false) && ((this.NumberOfIllPersons ?? 0) == 0))
+                if ((this.NumberOfIllPersonsHigherThanExpected ?? false) && ((this.NumberOfIllPersons ?? 0) == 0))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V762, "Number of ill persons missing", null));
 
                 if ((this.SanitaryMeasuresApplied ?? false) && (
@@ -293,12 +293,16 @@ namespace bsmd.database
                     (!this.InfectedAreaDate.HasValue || this.InfectedAreaPort.IsNullOrEmpty()))
                     violations.Add(RuleEngine.CreateViolation(ValidationCode.V766, "Infected area date or port missing", null));
 
-            }
+                if (this.portOfCallLast30Days.Count == 0)
+                {
+                    errors.Add(RuleEngine.CreateError(ValidationCode.NOT_NULL, "Port of Call last 30 day list is EMPTY", null));
+                }
 
-            foreach (PortOfCallLast30Days poc30d in this.portOfCallLast30Days)
-            {
-                RuleEngine.ValidateProperties(poc30d, errors);
-                poc30d.Validate(errors, violations);
+                foreach (PortOfCallLast30Days poc30d in this.portOfCallLast30Days)
+                {
+                    RuleEngine.ValidateProperties(poc30d, errors);
+                    poc30d.Validate(errors, violations);
+                }
             }
         }
 
diff --git a/nsw/Source/bsmd.database/Message.cs b/nsw/Source/bsmd.database/Message.cs
index 43c3de3b..36ed8ea1 100644
--- a/nsw/Source/bsmd.database/Message.cs
+++ b/nsw/Source/bsmd.database/Message.cs
@@ -212,6 +212,11 @@ namespace bsmd.database
         /// </summary>
         public List<MessageViolation> ViolationList { get { return this.violationList; } }
 
+        /// <summary>
+        /// Property to overwrite reporting party in certain circumstances (other melder meldet)
+        /// </summary>
+        public Guid? ReportingPartyId { get { return this.reportingPartyId; } set { this.reportingPartyId = value; } }
+
         #endregion        
 
         #region IDatabaseEntity implementation
diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs
index 8086eaa1..c5cc3fe0 100644
--- a/nsw/Source/bsmd.database/MessageCore.cs
+++ b/nsw/Source/bsmd.database/MessageCore.cs
@@ -99,6 +99,8 @@ namespace bsmd.database
 
         public string SietasSheetVersion { get; set; }
 
+        public Guid? DefaultReportingPartyId { get; set; }
+
         #endregion        
 
         #region DatabaseEntity implementation
@@ -142,6 +144,7 @@ namespace bsmd.database
             scmd.Parameters.AddWithValue("@P22", this.ReportStatus);
             scmd.Parameters.AddWithNullableValue("@P23", this.SietasSheetVersion);
             scmd.Parameters.AddWithValue("@P24", this.Incoming ? 1 : 0);
+            scmd.Parameters.AddWithNullableValue("@P25", this.DefaultReportingPartyId);
 
             if (this.IsNew)
             {
@@ -150,9 +153,9 @@ namespace bsmd.database
                 string query = string.Format("INSERT INTO {0} (Id, VisitId, TransitId, IMO, ENI, PoC, Portname, ETA, CustomerId, " +
                     "Previous, Next, IsTransit, Wetris_zz_56_datensatz_id, BSMDStatus, InitialHIS, HerbergFormGuid, " +
                     "HerbergFormTemplateGuid, HerbergReportType, HerbergEmailcontactReportingVessel, HerbergEmail24HrsContact, " +
-                    "ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming) VALUES " +
+                    "ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming, DefaultReportingPartyId) VALUES " +
                     "(@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17, " +
-                    "@P18, @P19, @P20, @P21, @P22, @P23, @P24)", 
+                    "@P18, @P19, @P20, @P21, @P22, @P23, @P24, @P25)", 
                     this.Tablename);
                 scmd.CommandText = query;
             }
@@ -164,7 +167,7 @@ namespace bsmd.database
                     "Wetris_zz_56_datensatz_id = @P12, BSMDStatus = @P13, InitialHIS = @P14, HerbergFormGuid = @P15, " +
                     "HerbergFormTemplateGuid = @P16, HerbergReportType = @P17, HerbergEmailContactReportingVessel = @P18, " +
                     "HerbergEmail24HrsContact = @P19, ETAKielCanal = @P20, HerbergRevDate = @P21, ReportStatus = @P22, " +
-                    "SietasSheetVersion = @P23, Incoming = @P24 WHERE Id = @ID", this.Tablename);
+                    "SietasSheetVersion = @P23, Incoming = @P24, DefaultReportingPartyId = @P25 WHERE Id = @ID", this.Tablename);
                 scmd.CommandText = query;
             }
         }        
@@ -174,7 +177,8 @@ namespace bsmd.database
             string query = string.Format("SELECT Id, VisitId, TransitId, IMO, ENI, PoC, Portname, " +
                 "ETA, CustomerId, Previous, Next, IsTransit, Wetris_zz_56_datensatz_id, BSMDStatus, InitialHIS, " +
                 "HerbergFormGuid, HerbergFormTemplateGuid, HerbergReportType, HerbergEmailContactReportingVessel, " +
-                "HerbergEmail24HrsContact, ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming FROM {0} ",  
+                "HerbergEmail24HrsContact, ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming, " +
+                "DefaultReportingPartyId FROM {0} ",  
                 this.Tablename);
 
             switch (filter)
@@ -256,6 +260,7 @@ namespace bsmd.database
                 if (!reader.IsDBNull(22)) core.ReportStatus = (ReportStatusEnum) Enum.ToObject(typeof(ReportStatusEnum), reader.GetByte(22));
                 if (!reader.IsDBNull(23)) core.SietasSheetVersion = reader.GetString(23);
                 if (!reader.IsDBNull(24)) core.Incoming = reader.GetBoolean(24);
+                if (!reader.IsDBNull(25)) core.DefaultReportingPartyId = reader.GetGuid(25);
 
                 result.Add(core);
             }
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index d684ec1b..b9ea5645 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("Informatikbüro Daniel Schick")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("2.4.3")]
+[assembly: AssemblyInformationalVersion("2.4.6")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2015 Informatikbüro Daniel Schick. All rights reserved.")]
 [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 1ce61e7d..d4b62414 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -4,6 +4,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.4.3.*")]
+[assembly: AssemblyVersion("2.4.6.*")]
 // wenn das nicht auskommentiert wird erhalten wir eine Warnung
 // [assembly: AssemblyFileVersion("1.0.0.*")]
diff --git a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
index 331b970b..2e601226 100644
--- a/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
+++ b/nsw/Source/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
@@ -139,14 +139,13 @@ namespace bsmd.database
         {
 
             // check violation 701
+            bool locationInsufficient = (this.ShipToShipActivityLocationLoCode.IsNullOrEmpty()) &&
+                (!this.ShipToShipActivityLocationCoordinatesLatitude.HasValue || !this.ShipToShipActivityLocationCoordinatesLongitude.HasValue);
 
-            bool locationOK = !this.ShipToShipActivityLocationName.IsNullOrEmpty() ||
-                !this.ShipToShipActivityLocationLoCode.IsNullOrEmpty() ||
-                (this.ShipToShipActivityLocationCoordinatesLatitude.HasValue &&
-                this.ShipToShipActivityLocationCoordinatesLongitude.HasValue);
-
-            if (!locationOK)
-                violations.Add(RuleEngine.CreateViolation(ValidationCode.V701, "Either LoCode, Name or Coordinates must be given", null));
+            if (locationInsufficient)
+            {
+                violations.Add(RuleEngine.CreateViolation(ValidationCode.V701, "Ship To Ship: Either LoCode or Coordinates must be given", null));
+            }                          
         }
 
         #endregion
diff --git a/nsw/Source/bsmd.dbh/Request.cs b/nsw/Source/bsmd.dbh/Request.cs
index 2b8cb6b3..5677ee84 100644
--- a/nsw/Source/bsmd.dbh/Request.cs
+++ b/nsw/Source/bsmd.dbh/Request.cs
@@ -570,6 +570,8 @@ namespace bsmd.dbh
                         rootInfo.ConstructionCharacteristicsOfShip = info.ConstructionCharacteristicsOfShip;
                         if (info.FumigatedBulkCargo.HasValue)
                             rootInfo.FumigatedBulkCargo = (info.FumigatedBulkCargo.Value == 0) ? RootINFOFumigatedBulkCargo.Y : RootINFOFumigatedBulkCargo.N;
+                        else
+                            rootInfo.FumigatedBulkCargo = RootINFOFumigatedBulkCargo.N;
                         rootInfo.DeadWeightSummer_TNESpecified = info.DeplacementSummerDraught_TNE.HasValue;
                         if (info.DeplacementSummerDraught_TNE.HasValue)
                             rootInfo.DeadWeightSummer_TNE = (float) info.DeplacementSummerDraught_TNE.Value;
diff --git a/nsw/Source/bsmd.herberg.FormService/Util.cs b/nsw/Source/bsmd.herberg.FormService/Util.cs
index 2e739d4d..d9b1381d 100644
--- a/nsw/Source/bsmd.herberg.FormService/Util.cs
+++ b/nsw/Source/bsmd.herberg.FormService/Util.cs
@@ -32,6 +32,7 @@ namespace bsmd.herberg.FormService
                 if (repDict[key].Name.Equals("BSMD"))
                 {
                     bsmdParty = repDict[key];
+                    
                     break;
                 }
             }
@@ -152,7 +153,10 @@ namespace bsmd.herberg.FormService
 
                 List<DatabaseEntity> saveMessages = new List<DatabaseEntity>(); // 1:n messages
 
-                foreach (string groupMessageType in groupedVals.Keys)
+                List<string> groupedValsKeyList = new List<string>(groupedVals.Keys);
+                groupedValsKeyList.Sort(); // "AGENT" now at the beginning!
+
+                foreach (string groupMessageType in groupedValsKeyList)
                 {
                     string messageType = groupMessageType;
 
@@ -803,14 +807,19 @@ namespace bsmd.herberg.FormService
                                             info.SpecialRequirementsOfShipAtBerth = aMessageCore.Customer.Name;
                                         else
                                         {
-                                            if((aMessageCore.Customer != null) && (aMessageCore.Customer.Name != null))
+                                            if((aMessageCore.Customer != null) && (aMessageCore.Customer.Name != null) && !info.SpecialRequirementsOfShipAtBerth.Contains("- Agent: "))
                                                 info.SpecialRequirementsOfShipAtBerth = string.Format("{0} - Agent: {1}", info.SpecialRequirementsOfShipAtBerth, aMessageCore.Customer.Name);
                                         }
                                         if (vDict.ContainsKey("ConstructionCharacteristicsOfShip")) info.ConstructionCharacteristicsOfShip = vDict["ConstructionCharacteristicsOfShip"];
                                         if (vDict.ContainsKey("FumigatedBulkCargo") && !vDict["FumigatedBulkCargo"].IsNullOrEmpty())
+                                        {
                                             info.FumigatedBulkCargo = (byte)Enum.Parse(typeof(Enums.FumigatedBulkCargo), vDict["FumigatedBulkCargo"]);
+                                            _log.DebugFormat("FumigatedBulkCargo {0} parsed to {1}", vDict["FumigatedBulkCargo"], info.FumigatedBulkCargo);
+                                        }
                                         else
-                                            info.FumigatedBulkCargo = (byte) Enums.FumigatedBulkCargo.N;
+                                        {
+                                            info.FumigatedBulkCargo = (byte)Enums.FumigatedBulkCargo.N;
+                                        }
                                     }
                                     catch(Exception ex)
                                     {
@@ -1135,6 +1144,8 @@ namespace bsmd.herberg.FormService
                                                 if (poc.PortFacilityGISISCode.IsNullOrEmpty())
                                                 {
                                                     poc.PortFacilityGISISCode = "0000";
+                                                    if (poc.PortFacilitySecurityMattersToReport.IsNullOrEmpty()) poc.PortFacilitySecurityMattersToReport = string.Format("Remark: GISIS-Code not reported");
+                                                    else poc.PortFacilitySecurityMattersToReport = string.Format("{0} - Remark: GISIS-Code not reported", poc.PortFacilitySecurityMattersToReport);
                                                 }
                                                 else { 
                                                     Regex rgx = new Regex("[0-9]{4}");
@@ -1142,6 +1153,8 @@ namespace bsmd.herberg.FormService
                                                     {
                                                         _log.WarnFormat("PortFacilityGISISCode invalid: {0}, replacing with 0000", poc.PortFacilityGISISCode);
                                                         poc.PortFacilityGISISCode = "0000";
+                                                        if (poc.PortFacilitySecurityMattersToReport.IsNullOrEmpty()) poc.PortFacilitySecurityMattersToReport = string.Format("Remark: Reported GISIS-Code: {0}", sDict["PortFacilityGISISCode"] ?? "");
+                                                        else poc.PortFacilitySecurityMattersToReport = string.Format("{0} - Remark: Reported GISIS-Code: {1}", poc.PortFacilitySecurityMattersToReport, sDict["PortFacilityGISISCode"] ?? "");
                                                     }
                                                 }
 
@@ -1347,7 +1360,8 @@ namespace bsmd.herberg.FormService
                                 if (haz != null)
                                 {
                                     try
-                                    {                                        
+                                    {
+                                        if (vDict.ContainsKey("TransmissionType")) haz.TransmissionType = vDict["TransmissionType"];
                                         if (vDict.ContainsKey("NoDPGOnBoard")) haz.NoDPGOnBoardOnArrival = vDict["NoDPGOnBoard"].Equals("Y");
                                         if (vDict.ContainsKey("DPGManifestOnBoard")) haz.DPGManifestOnBoardOnArrival = vDict["DPGManifestOnBoard"].Equals("Y");
                                         if (vDict.ContainsKey("INFShipClass")) haz.INFShipClass = (byte)Enum.Parse(typeof(Enums.INFShipClass), vDict["INFShipClass"], true);