From 177835440cb6a392ae5369d06a6da86efec115ef Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 9 Dec 2022 08:02:52 +0100
Subject: [PATCH] =?UTF-8?q?defaults=20f=C3=BCr=20POBA/POBD=20beim=20Excel?=
 =?UTF-8?q?=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ENI2/Excel/ExcelUtil.cs | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 70f27daf..c9d186fd 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -274,7 +274,7 @@ namespace ENI2.Excel
             {
                 POBA poba = pobaMessage.Elements[0] as POBA;
                 bpol.StowawaysOnBoard = (poba.TotalStowawaysOnBoardUponArrival ?? 0) > 0;
-            }            
+            }
 
             bpol.DeleteElements();
 
@@ -331,6 +331,9 @@ namespace ENI2.Excel
             if (((poba.TotalPersonsOnBoardUponArrival ?? 0) == 0) && poba.IsNew)
                 return false;
 
+            if (!poba.TotalPassengersOnBoardUponArrival.HasValue) poba.TotalPassengersOnBoardUponArrival = 0;
+            if (!poba.TotalStowawaysOnBoardUponArrival.HasValue) poba.TotalStowawaysOnBoardUponArrival = 0;
+
             return true;
         }
 
@@ -339,7 +342,7 @@ namespace ENI2.Excel
         #region POBD
 
         private static bool ScanPOBD(Message pobdMessage, ExcelReader reader)
-        {            
+        {
             if(pobdMessage.Elements.Count == 0)
             {
                 POBD newPobd = new POBD();
@@ -352,6 +355,9 @@ namespace ENI2.Excel
             if (((pobd.TotalPersonsOnBoardUponDeparture ?? 0) == 0) && pobd.IsNew)
                 return false;
 
+            if (!pobd.TotalPassengersOnBoardUponDeparture.HasValue) pobd.TotalPassengersOnBoardUponDeparture = 0;
+            if (!pobd.TotalStowawaysOnBoardUponDeparture.HasValue) pobd.TotalStowawaysOnBoardUponDeparture = 0;
+
             return true;
         }
 
@@ -373,15 +379,15 @@ namespace ENI2.Excel
 
             haza.NoDPGOnBoardOnArrival = !reader.ReadBoolean("HAZA.DGOnBoard");
             haza.DPGManifestOnBoardOnArrival = reader.ReadBoolean("HAZA.DPGManifestOnBoardOnArrival");
-            haza.DPGContactFamilyName = reader.ReadText("HAZA.DPGContactFamilyName");            
+            haza.DPGContactFamilyName = reader.ReadText("HAZA.DPGContactFamilyName");
             haza.DPGContactPhone = reader.ReadText("HAZA.DPGContactPhone");            
             haza.MOUBaltic = reader.ReadBoolean("HAZA.MOUBaltic");
             string shipClass = reader.ReadText("HAZA.INFShipClass");
             if(!shipClass.IsNullOrEmpty())
-            {                
+            {
                 if (shipClass.Contains('1')) haza.INFShipClass = 0;
                 if (shipClass.Contains('2')) haza.INFShipClass = 1;
-                if (shipClass.Contains('3')) haza.INFShipClass = 2;                
+                if (shipClass.Contains('3')) haza.INFShipClass = 2;
             }
 
             #region IMDG
@@ -1140,7 +1146,7 @@ namespace ENI2.Excel
         #region WAS
 
         private static bool ScanWAS(Message wasMessage, ExcelReader reader, bool isOldVersion)
-        {            
+        {
             if (wasMessage.Elements.Count == 0)
             {
                 WAS newWAS = new WAS();
@@ -1198,7 +1204,7 @@ namespace ENI2.Excel
                 if (waste.WasteDescription.IsNullOrEmpty())
                 {
                     if ((reader.Mode == ExcelReader.CountryMode.DE) && waste.IsDashWasteCode)
-                    {                        
+                    {
                         waste.WasteDescription = "-";
                     }
                     else if (reader.Mode == ExcelReader.CountryMode.DK)