From c1c236d825693ba9d9b3a69480a311040eef54bc Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 22 Nov 2023 09:59:26 +0100
Subject: [PATCH] fixed another dumb error in Dakosy import

---
 ENI2/ENI2.csproj         | 4 ++--
 ENI2/Excel/DakosyUtil.cs | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 34eef3a9..801d11fc 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
-    <ApplicationVersion>7.2.0.6</ApplicationVersion>
+    <ApplicationRevision>7</ApplicationRevision>
+    <ApplicationVersion>7.2.0.7</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI2/Excel/DakosyUtil.cs b/ENI2/Excel/DakosyUtil.cs
index d2f9ff71..e2b66b7b 100644
--- a/ENI2/Excel/DakosyUtil.cs
+++ b/ENI2/Excel/DakosyUtil.cs
@@ -1189,7 +1189,8 @@ namespace ENI2.Excel
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew departure", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew departure", string.Format("G{0}", i + 15));
                 crew.CrewMemberGender = ParseGender(gender);
-                crew.CrewMemberNationality = reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15));
+                crew.CrewMemberNationality = ExcelUtil.ReadNationality(reader.ReadCellAsText("crew departure", string.Format("H{0}", i + 15)), out canceled);
+                if (canceled) return false;
 
                 if (crew.NotificationSchengen ?? false)
                 {
@@ -1240,8 +1241,8 @@ namespace ENI2.Excel
                 crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime("crew arrival", string.Format("F{0}", i + 15));
                 string gender = reader.ReadCellAsText("crew arrival", string.Format("G{0}", i + 15));
                 crew.CrewMemberGender = ParseGender(gender);
-                crew.CrewMemberNationality = reader.ReadCellAsText("crew arrival", string.Format("H{0}", i + 15));
-                
+                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));