dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/nsw_7.1' of ssh://lager/mnt/ext/git/git_bsmd into feature/nsw_7.1

Browse Source
This commit is contained in:
Daniel Schick 2022-11-02 07:07:58 +01:00
commit 9e96d5b56c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ENI2/Excel/ExcelUtil.cs
View File

@ -2111,7 +2111,10 @@ namespace ENI2.Excel
if (!crew.CrewMemberIdentityDocumentExpiryDate.HasValue && isOldVersion)
crew.CrewMemberIdentityDocumentExpiryDate = new DateTime(2100, 12, 31);
crew.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142));
crew.Effects = reader.ReadCellAsText("2. PORT", string.Format("C{0}", i + 142));
if (crew.Effects.Length > 256)
crew.Effects = crew.Effects.Substring(0, 256);
Util.UIHelper.SetBusyState(); // dialog might reset busy state
}
@ -2543,13 +2546,13 @@ namespace ENI2.Excel
{
result = "XX";
}
else if(CREW.NationalityDict.ContainsKey(nationality.ToUpper()))
else if(CREW.NationalityDict.ContainsKey(nationality.ToUpper())) // is it already a key
{
result = nationality.ToUpper();
}
else if(CREW.NationalityDict.ContainsKey(nationality.ToUpper()))
else if(CREW.NationalityDict.ContainsValue(nationality.ToUpper()))
{
result = CREW.NationalityDict[nationality.ToUpper()];
result = CREW.NationalityDict.FirstOrDefault(x => x.Value.Substring(3).Equals(nationality, StringComparison.OrdinalIgnoreCase)).Key;
}
else if(_countryImportDict.ContainsKey(nationality))
{