From 8e6d9aa0c0bbadcbc0994040a0ee02b02463ee71 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 12 Feb 2024 09:19:47 +0100 Subject: [PATCH] fixed CREWD Import for Dakosy sheets --- ENI2/Excel/DakosyUtil.cs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs index c2553232..e3738214 100644 --- a/ENI2/Excel/DakosyUtil.cs +++ b/ENI2/Excel/DakosyUtil.cs @@ -1182,7 +1182,7 @@ namespace ENI2.Excel crewMessage.Elements.Add(crew); } - crew.NotificationSchengen = reader.ReadCellAsBool("crew departure", "C10"); + crew.NotificationSchengen = true; crew.NotificationPAX = reader.ReadCellAsBool("crew departure", "C11"); crew.CrewMemberLastName = lastName; @@ -1195,17 +1195,14 @@ namespace ENI2.Excel crew.CrewMemberGender = ParseGender(gender); crew.CrewMemberNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15)), out canceled); if (canceled) return false; - - if (crew.NotificationSchengen ?? false) - { - string idDocType = reader.ReadCellAsText("crew departure", string.Format("I{0}", i + 15)); - crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType); - crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew departure", string.Format("J{0}", i + 15)); - crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew departure", string.Format("K{0}", i + 15)); - crew.CrewMemberIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("M{0}", i + 15)), out canceled); - if (canceled) return false; - crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15)); - } + + string idDocType = reader.ReadCellAsText("crew departure", string.Format("I{0}", i + 15)); + crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType); + crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew departure", string.Format("J{0}", i + 15)); + crew.CrewMemberVisaNumber = reader.ReadCellAsText("crew departure", string.Format("K{0}", i + 15)); + crew.CrewMemberIdentityDocumentIssuingState = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("M{0}", i + 15)), out canceled); + if (canceled) return false; + crew.CrewMemberIdentityDocumentExpiryDate = reader.ReadCellAsDateTime("crew departure", string.Format("N{0}", i + 15)); crew.CrewMemberDuty = reader.ReadCellAsText("crew departure", string.Format("L{0}", i + 15)); @@ -1234,7 +1231,7 @@ namespace ENI2.Excel crewMessage.Elements.Add(crew); } - crew.NotificationSchengen = reader.ReadCellAsBool("crew arrival", "C10"); + crew.NotificationSchengen = true; crew.NotificationPAX = reader.ReadCellAsBool("crew arrival", "C11") ?? false; crew.CrewMemberLastName = lastName; @@ -1247,6 +1244,7 @@ namespace ENI2.Excel crew.CrewMemberGender = ParseGender(gender); crew.CrewMemberNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew arrival", string.Format("H{0}", i + 15)), out canceled); if (canceled) return false; + string idDocType = reader.ReadCellAsText("crew arrival", string.Format("I{0}", i + 15)); crew.CrewMemberIdentityDocumentType = ParseDocumentType(idDocType); crew.CrewMemberIdentityDocumentId = reader.ReadCellAsText("crew arrival", string.Format("J{0}", i + 15));