From 21dddc9990a301b9773c1b6d28fd89e0c4b0b0ba Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 24 May 2023 09:56:57 +0200
Subject: [PATCH] added JE JERSEY and fixed country of birth import for PAS

---
 ENI2/Excel/ExcelUtil.cs |   6 +++++-
 misc/db.sqlite          | Bin 14426112 -> 14426112 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ENI2/Excel/ExcelUtil.cs b/ENI2/Excel/ExcelUtil.cs
index 6f8d88b0..61560d64 100644
--- a/ENI2/Excel/ExcelUtil.cs
+++ b/ENI2/Excel/ExcelUtil.cs
@@ -2104,6 +2104,8 @@ namespace ENI2.Excel
                     if (canceled) return true;
                     crew.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18));
                     crew.CrewMemberCountryOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18));
+                    if ((crew.CrewMemberCountryOfBirth != null) && (crew.CrewMemberCountryOfBirth.Length > 2)) crew.CrewMemberCountryOfBirth = null;
+
                     crew.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
                     crew.CrewMemberIdentityDocumentType = ReadDocumentType(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 18)), out canceled);
@@ -2214,6 +2216,7 @@ namespace ENI2.Excel
                     if (canceled) return true;
                     crewd.CrewMemberPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("H{0}", i + 18));
                     crewd.CrewMemberCountryOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("G{0}", i + 18));
+                    if ((crewd.CrewMemberCountryOfBirth != null) && (crewd.CrewMemberCountryOfBirth.Length > 2)) crewd.CrewMemberCountryOfBirth = null;
                     crewd.CrewMemberDateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("J{0}", i + 18));
 
 
@@ -2331,7 +2334,8 @@ namespace ENI2.Excel
                     pas.PassengerInTransit = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", i + 17));
 
                     pas.PassengerPlaceOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("J{0}", i + 17));
-                    pas.PassengerCountryOfBirth = ReadNationality(reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17)), out canceled);
+                    pas.PassengerCountryOfBirth = reader.ReadCellAsText(sheetTitle, string.Format("K{0}", i + 17));
+                    if ((pas.PassengerCountryOfBirth != null) && (pas.PassengerCountryOfBirth.Length > 2)) pas.PassengerCountryOfBirth = null;
 
                     if (canceled) return true;
                     DateTime? dateOfBirth = reader.ReadCellAsDateTime(sheetTitle, string.Format("L{0}", i + 17));
diff --git a/misc/db.sqlite b/misc/db.sqlite
index 581de331a28f4a7f5aaddf3b1e4159fc092c00ee..15570602a0e96724922429c1b456f93dc9928a33 100644
GIT binary patch
delta 767
zcmWmAd1DU*9Ds3aV`C<Z3L{r#p)t1-V}@3)Eyt)(54oA7NNjklqRdf?a$gfF)%rOq
z%Uz7f-J9?deEsoxUcggU`=CKtsLV>r+t@n4eqOzt;nn3xk~}8Kk|On`fuu^BG?Ye?
zE{!Ean#kkQR5IlWX(r9(NqI`1mKM@dT1l3)mNxQ?w3T+!UOGrec~+j2=cSWm%L~$3
zx=2@fQF5f4beCM|Aw8v+^p-x-SNchRc}ZTD0rH9rltGdwgJp>1%TOthVKQ7s$g5H)
zugU8&Qbx&W86#t*NQ&hR87Jdqf=rYWnIx0tO?gY+mMJn-rpY_<uEeY9GDF^znKDae
z%N&_2^JKm(kcCnzi{yP-EFZ`c`A|NRrLs&umgVw^tdNybCgrk9R?8Yu)=GtZDxb;c
zvQE~^7xJZSkV@Gon`E<Wk+0-ysgiGGt89~R<vZCfJ7lNqlHIaL_R2olF9+nHRLddx
zUJlC<IVwNMkMffolb_`m`BiG<w;B?=PA6w)bgW9PO^i;;s4DF~wlFc~fi2P=b#_XV
z^z!A&nJo(o3JZ#g3rZ?->k{F3I1x^UQ{ngUNBA?G4z=O0a3-7$=fe4LAzTcX!r$Sa
na5-EFb>V8b7XA&_!;SD?xEXGR+u=^Q8}5bsiQKyXuN6H6Q$tqb

delta 745
zcmWO2<zf~D7(ijhNa>L78lm9mlF^O82mt|s9lBdW9m1hIrAt6XN;f~GHX4L6K-!zw
zCGh@uZs5txEhv^5cGgTv+f}Pq(X>J>GYYLilBBRCOA#q5#iY2DkdpF=l#<d?M#@S#
zDK8bIqEwQ~@~Kpjs!~m=OAV<hwWPMxk-Ab(>PrJ@D2=4CG?5f(D$S(1w2;r_b7?89
z<O@la*3w4WN;_#U9i*dllFrgay2_W*P12;h^pKv?OL|Km=_~!DzYLIpGDrr?5cx`m
z$}kx&=`un_$|xBvU&|O7E92xF87~uLqI@fpWU@?=42i3$GEJt-44EmjWVXzaxiU}Y
z%K}*_i)67Zk)^UsmdkgtLRQKuSuNko5AvgA${P7e*2+3j*2@OjD4S%nY>}<9O}5Jp
z*(tkZx9pL<vQPHQ0r^=D${{%{N93p+ljCwiPRc1cEx*VaIV<PnSNTnTm-F(6T#$=$
zNiNG3`BVOqEXkI?vq_xDNlqz~dZ2i2VrZgAfhi>t!wSqQvLQ7u5w3=R!nJTc+z2<r
zt&kIP!|iY<+zt1_{qP_>43EO&@Nak$o`$^eEaZph;YD~E{tK_d>+mML4e!GH@F9_!
I_kVu+NB_Q2CIA2c